diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/misc/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/misc/autotype.texi | 4 | ||||
| -rw-r--r-- | doc/misc/message.texi | 5 | ||||
| -rw-r--r-- | doc/misc/semantic.texi | 2 |
4 files changed, 10 insertions, 6 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index d80a44b2db8..86ae8c99782 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,8 @@ +2014-05-01 Glenn Morris <rgm@gnu.org> + + * autotype.texi (Skeleton Language): + * message.texi (Header Commands): Replace `iff'. + 2014-04-22 Bastien Guerry <bzg@gnu.org> * org.texi (Installation): Be more clear on why installing Org diff --git a/doc/misc/autotype.texi b/doc/misc/autotype.texi index ae3fa0e5870..e01a6c2f5c5 100644 --- a/doc/misc/autotype.texi +++ b/doc/misc/autotype.texi @@ -241,10 +241,10 @@ put at these places. Point is left at first @code{_} where nothing is wrapped. Indent line according to major mode. When following element is @code{_}, and there is a interregion that will be wrapped here, indent that interregion. @item @code{&} -Logical and. Iff preceding element moved point, i.e., usually inserted +Logical and. If preceding element moved point, i.e., usually inserted something, do following element. @item @code{|} -Logical xor. Iff preceding element didn't move point, i.e., usually inserted +Logical xor. If preceding element didn't move point, i.e., usually inserted nothing, do following element. @item @code{-@var{number}} Delete preceding number characters. Depends on value of diff --git a/doc/misc/message.texi b/doc/misc/message.texi index 9be8ca05620..75452aa57cf 100644 --- a/doc/misc/message.texi +++ b/doc/misc/message.texi @@ -742,9 +742,8 @@ by the @code{message-cross-post-note-function} variable. @item C-c C-f t @kindex C-c C-f t @findex message-reduce-to-to-cc -Replace contents of @samp{To} header with contents of @samp{Cc} or -@samp{Bcc} header. (Iff @samp{Cc} header is not present, @samp{Bcc} -header will be used instead.) +Replace contents of @samp{To} header with contents of @samp{Cc} +header (or the @samp{Bcc} header, if there is no @samp{Cc} header). @item C-c C-f w @kindex C-c C-f w diff --git a/doc/misc/semantic.texi b/doc/misc/semantic.texi index f9ccd034fe6..b72fb3c88cf 100644 --- a/doc/misc/semantic.texi +++ b/doc/misc/semantic.texi @@ -611,7 +611,7 @@ Emacs Lisp. It is an LALR parser suitable for complex languages. @c LocalWords: deffn deffnx defun defvar destructor's dfn diff dir @c LocalWords: doc docstring EDE EIEIO elisp emacsman emph enum @c LocalWords: eq Exp EXPANDFULL expression fn foo func funcall -@c LocalWords: ia ids iff ifinfo imenu imenus init int isearch itemx java kbd +@c LocalWords: ia ids ifinfo imenu imenus init int isearch itemx java kbd @c LocalWords: keymap keywordtable lang languagemode lexer lexing Ludlam @c LocalWords: menubar metaparent metaparents min minibuffer Misc mode's @c LocalWords: multitable NAvigaTOR noindent nomedian nonterm noselect |