--- a/man/ChangeLog	Sat Jul 15 21:51:26 2006 +0000
+++ b/man/ChangeLog	Sun Jul 16 10:51:48 2006 +0000
@@ -1,3 +1,16 @@
+2006-07-16  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* xemacs/custom.texi (File Variables):
+	Make it clearer that file variables are buffer-local. 
+	* xemacs/custom.texi (Faces):
+	"must be encoding" -> "must be encoded". 
+	
+2006-07-16  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* lispref/variables.texi (Creating Buffer-Local):
+	Mention that buffer-local variables are created when file local
+	variables are set. 
+	
 2006-07-08  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* internals/internals.texi (Internal String Encoding):

--- a/man/lispref/variables.texi	Sat Jul 15 21:51:26 2006 +0000
+++ b/man/lispref/variables.texi	Sun Jul 16 10:51:48 2006 +0000
@@ -1045,6 +1045,12 @@
 @node Creating Buffer-Local
 @subsection Creating and Deleting Buffer-Local Bindings
 
+  Besides the functions mentioned here, buffer-local variables are also
+created when file-local variables are set.  @xref{Auto Major Mode}
+.  There is no way (outside of `eval' lines, which are normally disabled)
+to set the global value of a variable from the file local variable 
+specifications.  
+
 @deffn Command make-local-variable variable
 This function creates a buffer-local binding in the current buffer for
 @var{variable} (a symbol).  Other buffers are not affected.  The value

--- a/man/xemacs/custom.texi	Sat Jul 15 21:51:26 2006 +0000
+++ b/man/xemacs/custom.texi	Sun Jul 16 10:51:48 2006 +0000
@@ -774,10 +774,10 @@
 @cindex local variables in files
 
   A file can contain a @dfn{local variables list}, which specifies the
-values to use for certain Emacs variables when that file is edited.
-Visiting the file checks for a local variables list and makes each variable
-in the list local to the buffer in which the file is visited, with the
-value specified in the file.
+buffer-local values to use for certain Emacs variables when that file is
+edited.  Visiting the file checks for a local variables list and makes
+each variable in the list local to the buffer in which the file is
+visited, with the value specified in the file.
 
   A local variables list goes near the end of the file, in the last page.
 (It is often best to put it on a page by itself.)  The local variables list
@@ -2184,7 +2184,7 @@
 specified, too.  Here's our example font in XLFD syntax:
 @code{"-*-courier-bold-r-*-*-*-140-*-*-*-*-iso8859-*"}.
 The XLFD syntax is also used for GTK+ version 1.  XLFD names must be
-encoding in ISO-8859-1.
+encoded in ISO-8859-1.
 
 @item Xft
 The Xft syntax is defined by the @file{fontconfig} library