Minor doc fixes. Remove duplicate ChangeLog entries.

* doc/emacs/dired.texi (Operating on Files): Rewrite according to the fact
that `dired-do-chmod' doesn't use the `chmod' program anymore.

* lisp/faces.el (list-faces-display): Remove extra angle bracket
from `help-mode-map'.

* lisp/info.el (Info-history-toc-nodes): Doc fix.

* lisp/longlines.el (longlines-mode): Doc fix.

* src/editfns.c (Fformat_time_string): Doc fix, add tag `usage:'
to show the arg `TIME' instead of `TIMEVAL'.

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 8e5efc4f87d55530b21a86d6d44091aae0b304ad..6874ef75ef8ef42b99db663f7a2cd6d9ffd10fe4 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-07  Juri Linkov  <juri@jurta.org>
+
+       * dired.texi (Operating on Files): Rewrite according to the fact
+       that `dired-do-chmod' doesn't use the `chmod' program anymore.
+
 2011-07-30  Michael Albinus  <michael.albinus@gmx.de>
 
        * mini.texi (Minibuffer File): Insert a reference to Tramp for

diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi
index 501c4152e6ada1d305ae79afb2b4a315febb946a..80ccd1d10f919db00f966b71a022752f17a1ee92 100644 (file)
--- a/doc/emacs/dired.texi
+++ b/doc/emacs/dired.texi
@@ -645,8 +645,8 @@ link.
 @cindex changing file permissions (in Dired)
 @item M @var{modespec} @key{RET}
 Change the mode (also called ``permission bits'') of the specified files
-(@code{dired-do-chmod}).  This uses the @code{chmod} program, so
-@var{modespec} can be any argument that @code{chmod} can handle.
+(@code{dired-do-chmod}).  @var{modespec} can be in octal or symbolic
+notation like arguments handled by the @code{chmod} program.
 
 @findex dired-do-chgrp
 @kindex G @r{(Dired)}

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7c1fa3a656b7a345ab9762b3fffa82234e5b8ee5..52f51c918a05fd1b967beface5affa004da5adc6 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2011-08-07  Juri Linkov  <juri@jurta.org>
+
+       * faces.el (list-faces-display): Remove extra angle bracket
+       from `help-mode-map'.
+
+       * info.el (Info-history-toc-nodes): Doc fix.
+
+       * longlines.el (longlines-mode): Doc fix.
+
 2011-08-05  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * progmodes/js.el (js--regexp-literal): Accept regexps at the beginning
@@ -346,9 +355,6 @@
        (string-rectangle): Go to the point after the last operation
        (bug#7522).
 
-       * simple.el (current-kill): Clarify what
-       `interprogram-paste-function' does (bug#7500).
-
        * printing.el (pr-toggle-region): Clarify the documentation
        slightly (bug#7493).
 

diff --git a/lisp/ChangeLog.15 b/lisp/ChangeLog.15
index 190be56dd09028a5e9b02b65402541a8112460ce..2acf847cddc0fbf9a69dbb6d4da734c611a65dff 100644 (file)
--- a/lisp/ChangeLog.15
+++ b/lisp/ChangeLog.15
@@ -3573,7 +3573,7 @@
        * locate.el (locate-default-make-command-line): Don't consider
        drive letter and root directory part of
        `directory-listing-before-filename-regexp'.  (Bug#7308)
-       (locate-post-command-hook, locate-post-command-hook): New defcustoms.
+       (locate-post-command-hook, locate-mode-hook): New defcustoms.
 
 2010-11-27  Stefan Monnier  <monnier@iro.umontreal.ca>
 

diff --git a/lisp/faces.el b/lisp/faces.el
index 302f8af35acc6ff66dc2720caa61bfb0eca6d9c8..9a78ab69caae496e97513f9f2b114cc31058f865 100644 (file)
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1255,7 +1255,7 @@ arg, prompt for a regular expression."
        (insert
         (substitute-command-keys
          (concat
-          "\\<help-mode-map>>Use "
+          "\\<help-mode-map>Use "
           (if (display-mouse-p) "\\[help-follow-mouse] or ")
           "\\[help-follow] on a face name to customize it\n"
           "or on its sample text for a description of the face.\n\n")))

diff --git a/lisp/info.el b/lisp/info.el
index 447c86b3e9ec1a40f360418f261cf9ae5d7c2bee..191e75f97507e6466adb1b4484f4b1951ccde73f 100644 (file)
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -2128,7 +2128,7 @@ If SAME-FILE is non-nil, do not move to a different Info file."
               ))
 
 (defun Info-history-toc-nodes (filename)
-  "History-specific implementation of `Info-history-toc-nodes'."
+  "History-specific implementation of `Info-toc-nodes'."
   `(,filename
     ("Top" nil nil nil)))
 

diff --git a/lisp/longlines.el b/lisp/longlines.el
index e81a235a17b9ba4d2a3ada548604ba8b72bfe32b..f625d8fcac787f79f7c2b5c29a187329cd2f1cda 100644 (file)
--- a/lisp/longlines.el
+++ b/lisp/longlines.el
@@ -100,8 +100,8 @@ In Long Lines mode, long lines are wrapped if they extend beyond
 `fill-column'.  The soft newlines used for line wrapping will not
 show up when the text is yanked or saved to disk.
 
-With no argument, this command toggles Flyspell mode.
-With a prefix argument ARG, turn Flyspell minor mode on if ARG is positive,
+With no argument, this command toggles Long Lines mode.
+With a prefix argument ARG, turn Long Lines minor mode on if ARG is positive,
 otherwise turn it off.
 
 If the variable `longlines-auto-wrap' is non-nil, lines are automatically

diff --git a/src/ChangeLog b/src/ChangeLog
index 039c225c1f648a58771fb53432c85a18b25669e3..ef4efb0ad35e6aac8379f93203083ccb7d9f550f 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-07  Juri Linkov  <juri@jurta.org>
+
+       * editfns.c (Fformat_time_string): Doc fix, add tag `usage:'
+       to show the arg `TIME' instead of `TIMEVAL'.
+
 2011-08-06  Eli Zaretskii  <eliz@gnu.org>
 
        * xdisp.c (set_cursor_from_row): Fix cursor positioning when a

diff --git a/src/editfns.c b/src/editfns.c
index 577263c5aea1aa804d46b2e06f1ae181fcfe57a7..5eed386afb7c6fbd066ee8252a2b971e1c3df0dd 100644 (file)
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -1695,7 +1695,9 @@ The modifiers are `E' and `O'.  For certain characters X,
 %EX is a locale's alternative version of %X;
 %OX is like %X, but uses the locale's number symbols.
 
-For example, to produce full ISO 8601 format, use "%Y-%m-%dT%T%z".  */)
+For example, to produce full ISO 8601 format, use "%Y-%m-%dT%T%z".
+
+usage: (format-time-string FORMAT-STRING &optional TIME UNIVERSAL)  */)
   (Lisp_Object format_string, Lisp_Object timeval, Lisp_Object universal)
 {
   time_t value;