X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/426179e12c57fd83ed85f665f0cce34c223f85d2..d2a2c17f0f3735238953df26f42b4d18cb04bf4d:/man/ChangeLog?ds=sidebyside

diff --git a/man/ChangeLog b/man/ChangeLog
index 626d882f81..f011991349 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,50 @@
+2005-08-07  Michael Albinus  <michael.albinus@gmx.de>
+
+	Sync with Tramp 2.0.50.
+
+	* tramp.texi: Use @option{} consequently for method names.
+	(Inline methods, External transfer methods): Remove references to
+	Cygwin.
+	(Issues with Cygwin ssh): Explain trouble with Cygwin's ssh
+	implementation.
+
+2005-08-06  Eli Zaretskii  <eliz@gnu.org>
+
+	* mule.texi (Coding Systems): Rephrase the paragraph about
+	codepages: no need for "M-x codepage-setup" anymore, except on
+	MS-DOS.
+
+	* msdog.texi (MS-DOS and MULE): Clarify that this section is for
+	the MS-DOS port only.
+
+2005-07-30  Eli Zaretskii  <eliz@gnu.org>
+
+	* makefile.w32-in (info): Don't run multi-install-info.bat.
+	($(infodir)/dir): New target, produced by running
+	multi-install-info.bat.
+
+2005-07-27  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* gnus.texi (Startup Files): Fix name of gnus-site-init-file.
+	Mention that gnus-init-file is not read when Emacs is invoked with
+	--no-init-file or -q.
+
+2005-07-22  Eli Zaretskii  <eliz@gnu.org>
+
+	* files.texi (Quoted File Names): Add index entry.
+
+2005-07-19  Carsten Dominik  <dominik@science.uva.nl>
+
+	* org.texi: Version 3.14
+
+2005-07-04  Carsten Dominik  <dominik@science.uva.nl>
+
+	* org.texi: Version 3.13
+
+2005-07-19  Juri Linkov  <juri@jurta.org>
+
+	* files.texi (Comparing Files): Mention resync for `compare-windows'.
+
 2005-07-18  Juri Linkov  <juri@jurta.org>
 
 	* calc.texi (Time Zones, Logical Operations):
@@ -85,6 +132,7 @@
 	* mh-e.texi (Copying):
 	* trouble.texi (Checklist): Update FSF's address.
 
+>>>>>>> 1.631
 2005-07-03  Richard M. Stallman  <rms@gnu.org>
 
 	* flymake.texi (Example -- Configuring a tool called directly):