# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 961686024 0
# Node ID f1c1c620a0933b17a2258199758f35abd927b92b
# Parent  f157067ee950c30c7ea2b046b6b91642c2231794
*** empty log message ***

diff -r f157067ee950 -r f1c1c620a093 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Jun 22 14:58:38 2000 +0000
+++ b/lisp/ChangeLog	Thu Jun 22 15:00:24 2000 +0000
@@ -1,3 +1,12 @@
+2000-06-22  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* files.el (make-backup-file-name-1): On DOS/Windows, run the
+	backup file name through convert-standard-filename.
+
+	* dos-fns.el (convert-standard-filename): Convert leading
+	directories as well.  When long file names are supported, convert
+	characters that are invalid in Windows file names.
+
 2000-06-22  Vinicius Jose Latorre  <vinicius@cpqd.com.br>
 
 	* ps-print.el: Fix bug: if ^L is the very first buffer character,
diff -r f157067ee950 -r f1c1c620a093 man/ChangeLog
--- a/man/ChangeLog	Thu Jun 22 14:58:38 2000 +0000
+++ b/man/ChangeLog	Thu Jun 22 15:00:24 2000 +0000
@@ -1,3 +1,12 @@
+2000-06-22  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* programs.texi (Documentation): Describe how man pages with
+	identical names by different sections are handled by M-x man and
+	M-x woman.
+
+	* msdog.texi (Text and Binary): Separate description of EOL
+	conversions from the issues related to binary files.
+
 2000-06-21  Kenichi Handa  <handa@etl.go.jp>
 
 	* mule.texi (set-buffer-process-coding-system): Documentation