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".

5 files changed, 9 insertions, 5 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 7226698934e..c45ec824919 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2013-05-15  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* makefile.w32-in (DOC): Use just "DOC".
+
+	* Makefile.in (bootstrap-clean): DOC-* doesn't exist any more.
+
 	* process.c: Export default filters and sentinels to Elisp.
 	(Qinternal_default_process_sentinel, Qinternal_default_process_filter):
 	New constants.
diff --git a/src/Makefile.in b/src/Makefile.in
index ad81a8d6592..80d23b2d58b 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -537,7 +537,7 @@ clean: mostlyclean
 ## It should remove all files generated during a compilation/bootstrap,
 ## but not things like config.status or TAGS.
 bootstrap-clean: clean
-	rm -f epaths.h config.h config.stamp stamp-h1 stamp-oldxmenu ../etc/DOC-*
+	rm -f epaths.h config.h config.stamp stamp-h1 stamp-oldxmenu
 	if test -f ./.gdbinit; then \
 	  mv ./.gdbinit ./.gdbinit.save; \
 	  if test -f "$(srcdir)/.gdbinit"; then rm -f ./.gdbinit.save; \
diff --git a/src/doc.c b/src/doc.c
index 770cb1eb646..e45481944f0 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -58,7 +58,7 @@ read_bytecode_char (bool unreadflag)
 }
 
 /* Extract a doc string from a file.  FILEPOS says where to get it.
-   If it is an integer, use that position in the standard DOC-... file.
+   If it is an integer, use that position in the standard DOC file.
    If it is (FILE . INTEGER), use FILE as the file name
    and INTEGER as the position in that file.
    But if INTEGER is negative, make it positive.
@@ -608,7 +608,7 @@ the same file name is found in the `doc-directory'.  */)
         while (*beg && c_isspace (*beg)) ++beg;
 
         for (end = beg; *end && ! c_isspace (*end); ++end)
-          if (*end == '/') beg = end+1;  /* skip directory part  */
+          if (*end == '/') beg = end + 1;  /* Skip directory part.  */
 
         len = end - beg;
         if (len > 4 && end[-4] == '.' && end[-3] == 'o')
diff --git a/src/lread.c b/src/lread.c
index 15821662fc8..3ca644bb45b 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -3557,7 +3557,7 @@ read_list (bool flag, Lisp_Object readcharfun)
 	{
 	  if (NILP (Vdoc_file_name))
 	    /* We have not yet called Snarf-documentation, so assume
-	       this file is described in the DOC-MM.NN file
+	       this file is described in the DOC file
 	       and Snarf-documentation will fill in the right value later.
 	       For now, replace the whole list with 0.  */
 	    doc_reference = 1;
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index 3484d6c70c8..272b053ed12 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -41,7 +41,7 @@ TRES		= $(BLD)/emacs.res
 TLASTLIB	= $(BLD)/lastfile.$(A)
 GNULIB		= ../lib/$(BLD)/libgnu.$(A)
 
-DOC		= $(OBJDIR)/etc/DOC-X
+DOC		= $(OBJDIR)/etc/DOC
 
 FULL_LINK_FLAGS = $(LINK_FLAGS) $(TEMACS_EXTRA_LINK)