; "time stamp" also can be spelled "timestamp"

* lisp/time-stamp.el (time-stamp):
* doc/emacs/files.texi (Time Stamps): Be findable as "timestamps".

(cherry picked from commit ab3cb717a08ef8a9939e38652f25a5ef312c76ce)

diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi
index e87ce6ea0c0d68b17f01604c5e7b5f2ff0d0962d..9cd87d89a7a200e692ad57350d170ade1a79a338 100644 (file)
--- a/doc/emacs/files.texi
+++ b/doc/emacs/files.texi
@@ -994,6 +994,7 @@ File Shadowing is not available on MS Windows.
 @node Time Stamps
 @subsection Updating Time Stamps Automatically
 @cindex time stamps
+@cindex timestamps
 @cindex modification dates
 @cindex last modified time
 

diff --git a/lisp/time-stamp.el b/lisp/time-stamp.el
index fb3c6cb81da46454698898f3e24de06f65fbad30..2aa5ba74dc3d770b1bc9c7f6e64be7f1edd4995f 100644 (file)
--- a/lisp/time-stamp.el
+++ b/lisp/time-stamp.el
@@ -307,7 +307,7 @@ See also `time-stamp-count' and `time-stamp-inserts-lines'.")
 
 ;;;###autoload
 (defun time-stamp ()
-  "Update any time stamp string(s) in the buffer.
+  "Update any time stamp strings (timestamps) in the buffer.
 Look for a time stamp template and update it with the current date,
 time, and/or other info.
 
@@ -830,7 +830,7 @@ if they didn't read the documentation)."
             (standard-form
              (concat
               "Conversions that are changing are ambiguous and should be replaced by\n"
-              "stable conversions that makes your intention clear.\n")))
+              "stable conversions that make your intention clear.\n")))
            "\n"
            "The following obsolescent `time-stamp-format' conversion(s) were found:\n\n")))))
       (insert old-form " -- use " new-form)