Merge from origin/emacs-24

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

diff --git a/doc/misc/forms.texi b/doc/misc/forms.texi
index 43ffab26c9b2d30f264d22510c507ea3c25c08fd..433009c871937b2810ca918f867d6d00a2b77f44 100644 (file)
--- a/doc/misc/forms.texi
+++ b/doc/misc/forms.texi
@@ -3,7 +3,7 @@
 @c Written by Johan Vromans, and edited by Richard Stallman
 
 @comment %**start of header (This is for running Texinfo on a region.)
-@setfilename ../../info/forms
+@setfilename ../../info/forms.info
 @settitle Forms Mode User's Manual
 @syncodeindex vr cp
 @syncodeindex fn cp
@@ -14,17 +14,18 @@
 @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.
 
-Copyright @copyright{} 1989, 1997, 2001--2013 Free Software Foundation, Inc.
+Copyright @copyright{} 1989, 1997, 2001--2015 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
-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''.
 
@@ -117,7 +118,7 @@ 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: }).
+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