summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2013-05-15 16:12:53 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2013-05-15 16:12:53 -0400
commit6e911150d00fa20c60b91d51aafd2cfd81e1c349 (patch)
treefe6c39330104f48b37851d5cb773e1a96b683ba5 /etc
parent1aa8d50570ea4ad6e57d1b2476b5338357a5ac74 (diff)
downloademacs-6e911150d00fa20c60b91d51aafd2cfd81e1c349.tar.gz
Use just DOC instead of DOC-nn.mm.
* lisp/loadup.el: Just use unversioned DOC. * Makefile.in (install-doc): DOC file is not version specific any more. * .bzrignore: Don't ignore DOC-* any more. * admin/quick-install-emacs: Don't prune DOC-* files a any more. * doc/lispref/loading.texi (Autoload): * doc/lispref/help.texi (Documentation Basics, Accessing Documentation) (Accessing Documentation, Accessing Documentation): DOC-* is now DOC. * etc/.gitignore: Don't ignore DOC-* any more. * lib-src/makefile.w32-in ($(DOC)): Use DOC rather than DOC-X. * msdos/sed1x.inp: Don't rewrite DOC any more. * nt/makefile.w32-in (clean, top-distclean): DOC-X doesn't exist any more. * src/Makefile.in (bootstrap-clean): DOC-* doesn't exist any more. * src/makefile.w32-in (DOC): Use just "DOC".
Diffstat (limited to 'etc')
-rw-r--r--etc/.gitignore1
-rw-r--r--etc/ChangeLog4
-rw-r--r--etc/PROBLEMS2
3 files changed, 5 insertions, 2 deletions
diff --git a/etc/.gitignore b/etc/.gitignore
index 618d09438f8..8e12acbee0c 100644
--- a/etc/.gitignore
+++ b/etc/.gitignore
@@ -1,3 +1,2 @@
DOC
-DOC-*
icons/
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 46564aeebcd..f4f17ac29cf 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2013-05-15 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * .gitignore: Don't ignore DOC-* any more.
+
2013-05-07 Paul Eggert <eggert@cs.ucla.edu>
Use Gnulib ACL implementation, for benefit of Solaris etc. (Bug#14295)
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index 0cfc0ad0c14..7556c23daee 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -551,7 +551,7 @@ with CEDET 1.0pre4) or later.
*** Self-documentation messages are garbled.
-This means that the file `etc/DOC-...' doesn't properly correspond
+This means that the file `etc/DOC' doesn't properly correspond
with the Emacs executable. Redumping Emacs and then installing the
corresponding pair of files should fix the problem.