summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorMiles Bader <miles@gnu.org>2007-04-29 01:04:39 +0000
committerMiles Bader <miles@gnu.org>2007-04-29 01:04:39 +0000
commit570d87805efd12f17bb1322a5e07d82d7884dfdb (patch)
tree40c3cdfa546a2922f8ebfdc7ab6cd90a36842b9e /man
parent52ce07055e7f304daa5913ea74a762047a56899a (diff)
parentfc26a03e7b8ce1fa6ac665042fedbc74e2ca43df (diff)
downloademacs-570d87805efd12f17bb1322a5e07d82d7884dfdb.tar.gz
Merge from emacs--rel--22
Patches applied: * emacs--rel--22 (patch 3) - Update from CVS 2007-04-28 Stefan Monnier <monnier@iro.umontreal.ca> * lisp/vc-hooks.el (vc-ignore-dir-regexp): Add /.../ for the DFS filesystem. 2007-04-28 Eli Zaretskii <eliz@gnu.org> * lisp/makefile.w32-in ($(lisp)/mh-e/mh-loaddefs.el): Use ./mh-e instead of $(lisp)/mh-e. Revision: emacs@sv.gnu.org/emacs--devo--0--patch-719
Diffstat (limited to 'man')
-rw-r--r--man/ChangeLog8
-rw-r--r--man/anti.texi2
2 files changed, 9 insertions, 1 deletions
diff --git a/man/ChangeLog b/man/ChangeLog
index 95de88b0e8f..21b481ad111 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,11 @@
+2007-04-28 Glenn Morris <rgm@gnu.org>
+
+ * ack.texi (Acknowledgments):
+ * anti.texi (Antinews):
+ * faq.texi (New in Emacs 22):
+ * programs.texi (Program Modes): Restore mention of python.el pending
+ consideration of legal status.
+
2007-04-28 Richard Stallman <rms@gnu.org>
* files.texi (File Names): Fixes to ~ description on MS systems.
diff --git a/man/anti.texi b/man/anti.texi
index beb0e9da027..ebff1c7677f 100644
--- a/man/anti.texi
+++ b/man/anti.texi
@@ -278,7 +278,7 @@ tries to demonstrate this in the GUD buffer.
@item
The Calc, CUA, Ibuffer, Ido, Password, Printing, Reveal,
Ruler-mode, SES, Table, Tramp, and URL packages have been removed.
-The Benchmark, Cfengine, Conf, Dns, Flymake, Pythno, Thumbs, and
+The Benchmark, Cfengine, Conf, Dns, Flymake, Python, Thumbs, and
Wdired modes have also been removed.
@item