diff options
author | Juri Linkov <juri@jurta.org> | 2009-07-19 16:57:12 +0000 |
---|---|---|
committer | Juri Linkov <juri@jurta.org> | 2009-07-19 16:57:12 +0000 |
commit | 8d9b5eba48fd9961e6d5ca1529daf42b8e9b0a1c (patch) | |
tree | 3ab2f218ab68c67c6d2f61cb7116d9cf70e01e08 /doc | |
parent | 2ee20f24e8b7ed14bdb77c8b6f2ee12638f90a9d (diff) | |
download | emacs-8d9b5eba48fd9961e6d5ca1529daf42b8e9b0a1c.tar.gz |
(Specifying File Variables, Safe File Variables):
"variables/value pairs" -> "variable/value pairs".
Diffstat (limited to 'doc')
-rw-r--r-- | doc/emacs/ChangeLog | 5 | ||||
-rw-r--r-- | doc/emacs/custom.texi | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index b182057ffe8..ae65a9641a6 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,8 @@ +2009-07-19 Juri Linkov <juri@jurta.org> + + * custom.texi (Specifying File Variables, Safe File Variables): + "variables/value pairs" -> "variable/value pairs". + 2009-07-15 Glenn Morris <rgm@gnu.org> * misc.texi (Gnus): Remove widow. diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi index f0a63855f2d..9295d97b1cb 100644 --- a/doc/emacs/custom.texi +++ b/doc/emacs/custom.texi @@ -1082,7 +1082,7 @@ first line: @end example @noindent -You can specify any number of variables/value pairs in this way, each +You can specify any number of variable/value pairs in this way, each pair with a colon and semicolon as shown above. @code{mode: @var{modename};} specifies the major mode; this should come first in the line. The @var{value}s are not evaluated; they are used literally. @@ -1214,7 +1214,7 @@ effect, or @kbd{n} to ignore it. When Emacs is run in batch mode (@pxref{Initial Options}), it can't really ask you, so it assumes the answer @kbd{n}. - Emacs normally recognizes certain variables/value pairs as safe. + Emacs normally recognizes certain variable/value pairs as safe. For instance, it is safe to give @code{comment-column} or @code{fill-column} any integer value. If a file specifies only known-safe variable/value pairs, Emacs does not ask for confirmation |