*** empty log message ***

2 files changed, 10 insertions, 5 deletions

diff --git a/man/emacs-mime.texi b/man/emacs-mime.texi
index d5dc75eb4d4..dcc577b224a 100644
--- a/man/emacs-mime.texi
+++ b/man/emacs-mime.texi
@@ -589,10 +589,11 @@ non-nil, decode bytes into characters with that coding-system.
 @deffn Command quoted-printable-encode-region @var{from} @var{to} &optional @var{fold} @var{class}
 QP-encode all the region.  If @var{fold} is non-@var{nil}, fold lines
 at 76 characters, as required by the RFC.  If @var{class} is
-non-@code{nil}, translate the characters matched by that class, which
-should be in the form expected by @var{skip-chars-forward} and should
-probably not contain literal eight-bit characters.  Specifying
-@var{class} makes sense to do extra encoding in header fields.
+non-@code{nil}, translate the characters not matched by that regexp
+class, which should be in the form expected by
+@var{skip-chars-forward} and should probably not contain literal
+eight-bit characters.  Specifying @var{class} makes sense to do extra
+encoding in header fields.
 
 If variable @var{mm-use-ultra-safe-encoding} is defined and
 non-@code{nil}, fold lines unconditionally and encode @samp{From } and
diff --git a/man/files.texi b/man/files.texi
index fc134885ca0..dfd16624c05 100644
--- a/man/files.texi
+++ b/man/files.texi
@@ -768,6 +768,7 @@ not be asked until you change the file and save it again.
 @findex time-stamp
 @cindex time stamps
 @cindex modification dates
+@cindex locale, date format
 
 You can arrange to have time stamp text in a file updated
 automatically to reflect the modification time when you save the
@@ -783,10 +784,13 @@ Time-stamp: ""
 @noindent
 and customize the value of the hook @code{write-file-hooks} to add
 @code{time-stamp}.  Such a template is updated with the current time
-and date when the file is written.
+and date when the file is written.  You can also use the command
+@kbd{M-x time-stamp} to update the time stamp manually.
 
 You can customize the form of the template and the time string used
 along with other parameters in the Custom group @code{time-stamp}.
+Note that non-numeric fields in the time stamp are printed according
+to your locale setting.
 
 @node Reverting
 @section Reverting a Buffer