Merge from emacs-24; up to 2014-06-02T11:35:40Z!michael.albinus@gmx.de

[gnu-emacs] / doc / misc / forms.texi

diff --git a/doc/misc/forms.texi b/doc/misc/forms.texi
index 11c3782dd7eb1e3d4a89f563c1a6c8890cfb2040..8ea470d2da8f018ec3eba69ed45dc263dd2702ec 100644 (file)
--- a/doc/misc/forms.texi
+++ b/doc/misc/forms.texi
@@ -14,23 +14,23 @@
 @end iftex
 @c      @smallbook
 @comment %**end of header (This is for running Texinfo on a region.)
 @end iftex
 @c      @smallbook
 @comment %**end of header (This is for running Texinfo on a region.)

+@documentencoding UTF-8

 
 @copying
 This file documents Forms mode, a form-editing major mode for GNU Emacs.
 
 
 @copying
 This file documents Forms mode, a form-editing major mode for GNU Emacs.
 

-Copyright @copyright{} 1989, 1997, 2001-2012 Free Software Foundation, Inc.
+Copyright @copyright{} 1989, 1997, 2001--2014 Free Software Foundation, Inc.

 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
 any later version published by the Free Software Foundation; with no
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
 any later version published by the Free Software Foundation; with no

-Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual,''

 and with the Back-Cover Texts as in (a) below.  A copy of the license
 is included in the section entitled ``GNU Free Documentation License''.
 
 (a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
 and with the Back-Cover Texts as in (a) below.  A copy of the license
 is included in the section entitled ``GNU Free Documentation License''.
 
 (a) The FSF's Back-Cover Text is: ``You have the freedom to copy and

-modify this GNU manual.  Buying copies from the FSF supports it in
-developing GNU and promoting software freedom.''
+modify this GNU manual.''

 @end quotation
 @end copying
 
 @end quotation
 @end copying
 


@@ -74,7 +74,7 @@ job: a control file and a data file.  The data file holds the
 actual data to be presented.  The control file describes
 how to present it.
 
 actual data to be presented.  The control file describes
 how to present it.
 

-@insertcopying 
+@insertcopying

 
 @menu
 * Forms Example::               An example: editing the password data base.
 
 @menu
 * Forms Example::               An example: editing the password data base.


@@ -88,8 +88,8 @@ how to present it.
 * Miscellaneous::               Forms mode messages and other remarks.
 * Error Messages::              List of error messages forms mode can produce.
 * Long Example::                A more complex control file example.
 * Miscellaneous::               Forms mode messages and other remarks.
 * Error Messages::              List of error messages forms mode can produce.
 * Long Example::                A more complex control file example.

-* GNU Free Documentation License:: The license for this documentation.

 * Credits::                     Thanks everyone.
 * Credits::                     Thanks everyone.

+* GNU Free Documentation License:: The license for this documentation.

 * Index::                       Index to this manual.
 @end menu
 @end ifnottex
 * Index::                       Index to this manual.
 @end menu
 @end ifnottex


@@ -117,8 +117,8 @@ are all there, but instead of being colon-separated on one single line,
 they make up a forms.
 
 The contents of the forms consist of the contents of the fields of the
 they make up a forms.
 
 The contents of the forms consist of the contents of the fields of the

-record (e.g. @samp{root}, @samp{0}, @samp{1}, @samp{Super User})
-interspersed with normal text (e.g @samp{User : }, @samp{Uid: }).
+record (e.g., @samp{root}, @samp{0}, @samp{1}, @samp{Super User})
+interspersed with normal text (e.g., @samp{User : }, @samp{Uid: }).

 
 If you modify the contents of the fields, Forms mode will analyze your
 changes and update the file appropriately.  You cannot modify the
 
 If you modify the contents of the fields, Forms mode will analyze your
 changes and update the file appropriately.  You cannot modify the


@@ -467,7 +467,7 @@ appears that way when displayed in Forms mode.  If the value is
 @code{nil}, multi-line text fields are prohibited.  The pseudo newline
 must not be a character contained in @code{forms-field-sep}.
 
 @code{nil}, multi-line text fields are prohibited.  The pseudo newline
 must not be a character contained in @code{forms-field-sep}.
 

-The default value is @code{"\^k"}, the character Control-K.  Example:
+The default value is @code{"\^k"}, the character Control-K@.  Example:

 
 @example
 (setq forms-multi-line "\^k")
 
 @example
 (setq forms-multi-line "\^k")


@@ -739,7 +739,7 @@ so you'd better think twice before using this.
 
 The default format for the data file, using @code{"\t"} to separate
 fields and @code{"\^k"} to separate lines within a field, matches the
 
 The default format for the data file, using @code{"\t"} to separate
 fields and @code{"\^k"} to separate lines within a field, matches the

-file format of some popular database programs, e.g. FileMaker.  So
+file format of some popular database programs, e.g., FileMaker.  So

 @code{forms-mode} can decrease the need to use proprietary software.
 
 @node Error Messages
 @code{forms-mode} can decrease the need to use proprietary software.
 
 @node Error Messages