1 files changed, 13 insertions, 13 deletions
diff --git a/INSTALL.CVS b/INSTALL.CVS
index 37b12b7d2ff..c2b1df622fd 100644
--- a/INSTALL.CVS
+++ b/INSTALL.CVS
@@ -18,9 +18,7 @@ The bootstrap process makes sure all necessary files are rebuilt
 before it builds the final Emacs binary.
 If 'make bootstrap' fails, it may be necessary to do 'make maintainer-clean'
-followed by configure before trying it again.  (Occasionally the loaddefs.el
+followed by configure before trying it again.
-file gets into a bad state due to changes in the Lisp libraries; this procedure
-forces it to be regenerated.)
 Normally, it is not necessary to use "make bootstrap" after every CVS
 update.  Unless there are problems, we suggest using the following
@@ -37,20 +35,22 @@ once:
 (If you want to install the Emacs binary, type "make install" instead
 of "make" in the last command.)
-Occasionally the file "lisp/loaddefs.el" (and similar *-loaddefs.el
+Occasionally the file "lisp/loaddefs.el" (and similar automatically
-files in some subdirectories of lisp/, e.g. mh-e/ and calendar/) will
+generated files, such as esh-groups.el, and *-loaddefs.el in some
-need to be updated to reflect new autoloaded functions.  If you see
+subdirectories of lisp/, e.g. mh-e/ and calendar/) will need to be
-errors (rather than warnings) about undefined lisp functions during
+updated to reflect new autoloaded functions.  If you see errors (rather
-compilation, that may be the reason.  Another symptom may be an error
+than warnings) about undefined lisp functions during compilation, that
-saying that "loaddefs.el" could not be found; this is due to a change
+may be the reason.  Another symptom may be an error saying that
-in the way loaddefs.el was handled in CVS, and should only happen
+"loaddefs.el" could not be found; this is due to a change in the way
-once, for users that are updating old CVS trees.  Finally, sometimes
+loaddefs.el was handled in CVS, and should only happen once, for users
-there can be build failures related to *loaddefs.el.  In that case,
+that are updating old CVS trees.  Finally, sometimes there can be build
-delete them before following the instructions below to update them.
+failures related to *loaddefs.el (e.g. "required feature `esh-groups'
+was not provided").  In that case, follow the instructions below.
 To update loaddefs.el (and similar files), do:
  $ cd lisp
+  $ make autogen-clean
  $ make autoloads EMACS=../src/emacs
 If either of the above partial procedures fails, try "make bootstrap".

diff --git a/INSTALL.CVS b/INSTALL.CVS index 37b12b7d2ff..c2b1df622fd 100644 --- a/INSTALL.CVS +++ b/INSTALL.CVS
@@ -18,9 +18,7 @@ The bootstrap process makes sure all necessary files are rebuilt
18	before it builds the final Emacs binary.	18	before it builds the final Emacs binary.
19		19
20	If 'make bootstrap' fails, it may be necessary to do 'make maintainer-clean'	20	If 'make bootstrap' fails, it may be necessary to do 'make maintainer-clean'
21	followed by configure before trying it again. (Occasionally the loaddefs.el	21	followed by configure before trying it again.
22	file gets into a bad state due to changes in the Lisp libraries; this procedure
23	forces it to be regenerated.)
24		22
25	Normally, it is not necessary to use "make bootstrap" after every CVS	23	Normally, it is not necessary to use "make bootstrap" after every CVS
26	update. Unless there are problems, we suggest using the following	24	update. Unless there are problems, we suggest using the following
@@ -37,20 +35,22 @@ once:
37	(If you want to install the Emacs binary, type "make install" instead	35	(If you want to install the Emacs binary, type "make install" instead
38	of "make" in the last command.)	36	of "make" in the last command.)
39		37
40	Occasionally the file "lisp/loaddefs.el" (and similar *-loaddefs.el	38	Occasionally the file "lisp/loaddefs.el" (and similar automatically
41	files in some subdirectories of lisp/, e.g. mh-e/ and calendar/) will	39	generated files, such as esh-groups.el, and *-loaddefs.el in some
42	need to be updated to reflect new autoloaded functions. If you see	40	subdirectories of lisp/, e.g. mh-e/ and calendar/) will need to be
43	errors (rather than warnings) about undefined lisp functions during	41	updated to reflect new autoloaded functions. If you see errors (rather
44	compilation, that may be the reason. Another symptom may be an error	42	than warnings) about undefined lisp functions during compilation, that
45	saying that "loaddefs.el" could not be found; this is due to a change	43	may be the reason. Another symptom may be an error saying that
46	in the way loaddefs.el was handled in CVS, and should only happen	44	"loaddefs.el" could not be found; this is due to a change in the way
47	once, for users that are updating old CVS trees. Finally, sometimes	45	loaddefs.el was handled in CVS, and should only happen once, for users
48	there can be build failures related to *loaddefs.el. In that case,	46	that are updating old CVS trees. Finally, sometimes there can be build
49	delete them before following the instructions below to update them.	47	failures related to *loaddefs.el (e.g. "required feature `esh-groups'
		48	was not provided"). In that case, follow the instructions below.
50		49
51	To update loaddefs.el (and similar files), do:	50	To update loaddefs.el (and similar files), do:
52		51
53	$ cd lisp	52	$ cd lisp
		53	$ make autogen-clean
54	$ make autoloads EMACS=../src/emacs	54	$ make autoloads EMACS=../src/emacs
55		55
56	If either of the above partial procedures fails, try "make bootstrap".	56	If either of the above partial procedures fails, try "make bootstrap".