Merge from emacs-24

3 files changed, 26 insertions, 26 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index ba712a1fb57..e19b0cf6485 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -307,8 +307,8 @@
 
 2014-03-13  Paul Eggert  <eggert@cs.ucla.edu>
 
-	* mule.texi (International, Language Environments): Update
-	the list of language environments to what Emacs currently
+	* mule.texi (International, Language Environments):
+	Update the list of language environments to what Emacs currently
 	supports.  Add the full list to the index.  Suggest C-h L for
 	details rather than trying to give very brief details here.
 
@@ -600,8 +600,8 @@
 
 	* indent.texi (Tab Stops): Mention recent changes about `tab-stop-list'.
 
-	* frames.texi (Scroll Bars): Document
-	`scroll-bar-adjust-thumb-portion'.
+	* frames.texi (Scroll Bars):
+	Document `scroll-bar-adjust-thumb-portion'.
 
 2013-12-21  Chong Yidong  <cyd@gnu.org>
 
@@ -627,8 +627,8 @@
 
 	* entering.texi: Document `initial-buffer-choice' changes.
 
-	* misc.texi (emacsclient Options): Document
-	`initial-buffer-choice' changes.
+	* misc.texi (emacsclient Options):
+	Document `initial-buffer-choice' changes.
 
 	* help.texi: Document that `?' now also shows subcommands of
 	prefix keys.
@@ -1111,8 +1111,8 @@
 
 	* misc.texi (Terminal emulator): Document Term mode faces.
 
-	* mini.texi (Basic Minibuffer): New node.  Document
-	minibuffer-electric-default-mode.
+	* mini.texi (Basic Minibuffer): New node.
+	Document minibuffer-electric-default-mode.
 
 	* display.texi (Visual Line Mode): Fix index entry.
 
@@ -3172,7 +3172,7 @@
 
 	* Makefile.in (MAKEINFO): Now controlled by `configure'.
 	(MAKEINFO_OPTS): New variable.  Use it where appropriate.
-	(ENVADD): Updated.
+	(ENVADD): Update.
 
 2011-01-18  Glenn Morris  <rgm@gnu.org>
 
@@ -9067,7 +9067,7 @@
 
 	* text.texi (Format Faces): Replace old M-g key prefix with M-o.
 
-	* emacs.texi (Acknowledgments): Updated.
+	* emacs.texi (Acknowledgments): Update.
 
 	* anti.texi: Total rewrite.
 
diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index c76d9534b26..37f8ac9da0e 100644
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -575,8 +575,8 @@
 2006-11-05  Robert J. Chassell  <bob@rattlesnake.com>
 
 	* emacs-lisp-intro.texi: Yet more minor changes:
-	(defcustom): Said that `:options' is usually for a hook.  Remove
-	extraneous space in parenthetical remark concerning
+	(defcustom): Said that `:options' is usually for a hook.
+	Remove extraneous space in parenthetical remark concerning
 	`text-mode-hook-identify'.  At end, mention other defines, too.
 	(Beginning a .emacs File): Reverse words about comments so they
 	parallel numbers of listed semi-colons.
@@ -598,12 +598,12 @@
 	Center images for TeX output.
 	(kill-new function): Remove indentation for sentence talking about
 	momentarily skipping code.
-	(cons & search-fwd Review): Document @code{funcall}.  Document
-	@code{re-search-forward} with existing @code{search-forward}.
+	(cons & search-fwd Review): Document @code{funcall}.
+	Document @code{re-search-forward} with existing @code{search-forward}.
 	Reference chapter on regular expression searches.
 	(Recursion with list): Specify a more recent version as being Emacs.
-	(Recursion with list, Every, recursive-graph-body-print): Change
-	`if ... progn' expression to `when'.
+	(Recursion with list, Every, recursive-graph-body-print):
+	Change `if ... progn' expression to `when'.
 	(Recursive triangle function): For printing in small book, ensure
 	section name is not last on bottom of preceding page.
 	(Keep): Remove extraneous space in function definition example.
@@ -612,11 +612,11 @@
 	function.
 	(fwd-sentence while loops): Write a function as one, not as a form.
 	(fwd-para let): Add `which' to sentence with `parstart' and `parsep'.
-	(etags): Move sentences involving `find-tag' and sources.  State
-	location of Emacs `src' directory.
+	(etags): Move sentences involving `find-tag' and sources.
+	State location of Emacs `src' directory.
 	(Design count-words-region): Better explain two backslashes in a row.
-	(Find a File): Fix grammar; add a `to' and write `to visit'.  Change
-	`named' to `selected'.
+	(Find a File): Fix grammar; add a `to' and write `to visit'.
+	Change `named' to `selected'.
 	(lengths-list-file): Remove extraneous parenthesis from reference.
 	(lengths-list-many-files): Explain `expand-file-name' better.
 	(Files List): Rephrase sentence regarding Lisp sources directory.
@@ -644,8 +644,8 @@
 	seen' the @code{eq} function.
 	(kill-append function): Reformat `kill-append' function definition so
 	it prints well.
-	(kill-new function): Indent the sentence beginning `notice'.  Replace
-	`the same as' with `similar to'.  Repair typo.  Remove obsolete
+	(kill-new function): Indent the sentence beginning `notice'.
+	Replace `the same as' with `similar to'.  Repair typo.  Remove obsolete
 	references to `yank' and `yank-pop.  End section with a note that `we
 	will digress into C.'
 
@@ -669,8 +669,8 @@
 	is 3.00.  Did not update ISBN number.
 
 	* emacs-lisp-intro.texi: Remove version reference for X colors.
-	Document `='.  Remove mention that :eval was new in 21.  Updated
-	instance's edition-number to 3.01.
+	Document `='.  Remove mention that :eval was new in 21.
+	Updated instance's edition-number to 3.01.
 
 2006-10-30  Robert J. Chassell  <bob@rattlesnake.com>
 
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 804e52dc27c..a8fccd391d8 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -57,8 +57,8 @@
 2014-09-24  Ulf Jasper  <ulf.jasper@web.de>
 
 	* newsticker.texi: Reworked.  Document new treeview group
-	commands.  Remove VERSION, UPDATED, use EMACSVER instead.  Use
-	term 'feed reader'.
+	commands.  Remove VERSION, UPDATED, use EMACSVER instead.
+	Use term 'feed reader'.
 
 2014-09-04  Paul Eggert  <eggert@cs.ucla.edu>