Merge from emacs-24; up to 2012-12-06T07:33:[email protected]

10 files changed, 26 insertions, 17 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index b837525fb4..4815ac2a48 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,12 @@
+2013-01-03  Glenn Morris  <[email protected]>
+
+	* processes.texi (System Processes):
+	* syntax.texi (Syntax Table Functions): Tweak some line breaks.
+
+	* searching.texi (Replacing Match): Fix xref.
+
+	* elisp.texi (DATE): Bump to Jan 2013.
+
 2013-01-02  Glenn Morris  <[email protected]>
 
 	* customize.texi (Common Keywords, Type Keywords):
diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi
index 354591c191..127b22086d 100644
--- a/doc/lispref/elisp.texi
+++ b/doc/lispref/elisp.texi
@@ -56,7 +56,7 @@
 @c (See comments for EDITION in emacs.texi)
 @set VERSION  3.1
 @include emacsver.texi
-@set DATE May 2012
+@set DATE January 2013
 
 @c in general, keep the following line commented out, unless doing a
 @c copy of this manual that will be published.  The manual should go
diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi
index a5a0ec62be..50710e2323 100644
--- a/doc/lispref/processes.texi
+++ b/doc/lispref/processes.texi
@@ -1804,12 +1804,12 @@ The number of threads in the process.
 
 @item start
 The time when the process was started, in the same
-@w{@code{(@var{high} @var{low} @var{microsec} @var{picosec})}} format used by
-@code{current-time} and by @code{file-attributes}.
+@code{(@var{high} @var{low} @var{microsec} @var{picosec})} format used by
+@code{file-attributes} and @code{current-time}.
 
 @item etime
-The time elapsed since the process started, in the @w{@code{(@var{high}
-@var{low} @var{microsec} @var{picosec})}} format.
+The time elapsed since the process started, in the format @code{(@var{high}
+@var{low} @var{microsec} @var{picosec})}.
 
 @item vsize
 The virtual memory size of the process, measured in kilobytes.
diff --git a/doc/lispref/searching.texi b/doc/lispref/searching.texi
index 1573cceaed..87d4051d6f 100644
--- a/doc/lispref/searching.texi
+++ b/doc/lispref/searching.texi
@@ -1325,7 +1325,7 @@ This stands for a single @samp{\} in the replacement text.
 
 @item @samp{\?}
 This stands for itself (for compatibility with @code{replace-regexp}
-and related commands; @pxref{Regexp Replacement,,, emacs, The GNU
+and related commands; @pxref{Regexp Replace,,, emacs, The GNU
 Emacs Manual}).
 @end table
 
diff --git a/doc/lispref/syntax.texi b/doc/lispref/syntax.texi
index a07f45c100..dfa121103b 100644
--- a/doc/lispref/syntax.texi
+++ b/doc/lispref/syntax.texi
@@ -478,17 +478,17 @@ it easier to see the character returned by @code{char-syntax}.)
 @end group
 
 @group
-;; Forward slash characters have punctuation syntax.  Note that this
-;; @code{char-syntax} call does not reveal that it is also part of
-;; comment-start and -end sequences.
+;; Forward slash characters have punctuation syntax.
+;; Note that this @code{char-syntax} call does not reveal
+;; that it is also part of comment-start and -end sequences.
 (string (char-syntax ?/))
      @result{} "."
 @end group
 
 @group
-;; Open parenthesis characters have open parenthesis syntax.  Note
-;; that this @code{char-syntax} call does not reveal that it has a
-;; matching character, @samp{)}.
+;; Open parenthesis characters have open parenthesis syntax.
+;; Note that this @code{char-syntax} call does not reveal that
+;; it has a matching character, @samp{)}.
 (string (char-syntax ?\())
      @result{} "("
 @end group
diff --git a/doc/man/ebrowse.1 b/doc/man/ebrowse.1
index 84f1ef1dd9..89506db98e 100644
--- a/doc/man/ebrowse.1
+++ b/doc/man/ebrowse.1
@@ -85,7 +85,7 @@ was written by Gerd Moellmann.
 Copyright
 .if t \(co
 .if n (C)
-2008-2012 Free Software Foundation, Inc.
+2008-2013 Free Software Foundation, Inc.
 .PP
 Permission is granted to make and distribute verbatim copies of this
 document provided the copyright notice and this permission notice are
diff --git a/doc/man/emacs.1 b/doc/man/emacs.1
index 46bda023b5..3d0c5107ad 100644
--- a/doc/man/emacs.1
+++ b/doc/man/emacs.1
@@ -642,7 +642,7 @@ For detailed credits and acknowledgments, see the GNU Emacs manual.
 Copyright
 .if t \(co
 .if n (C)
-1995, 1999-2012 Free Software Foundation, Inc.
+1995, 1999-2013 Free Software Foundation, Inc.
 .PP
 Permission is granted to make and distribute verbatim copies of this
 document provided the copyright notice and this permission notice are
diff --git a/doc/man/etags.1 b/doc/man/etags.1
index 3f22364a19..94fe2af1a8 100644
--- a/doc/man/etags.1
+++ b/doc/man/etags.1
@@ -268,7 +268,7 @@ Stallman.
 Copyright
 .if t \(co
 .if n (C)
-1992, 1999, 2001-2012 Free Software Foundation, Inc.
+1992, 1999, 2001-2013 Free Software Foundation, Inc.
 .PP
 Permission is granted to make and distribute verbatim copies of this
 document provided the copyright notice and this permission notice are
diff --git a/doc/man/grep-changelog.1 b/doc/man/grep-changelog.1
index 397e649334..ef4b290098 100644
--- a/doc/man/grep-changelog.1
+++ b/doc/man/grep-changelog.1
@@ -62,7 +62,7 @@ Display basic usage information.
 Copyright 
 .if t \(co
 .if n (C)
-2008-2012 Free Software Foundation, Inc.
+2008-2013 Free Software Foundation, Inc.
 .PP
 Permission is granted to make and distribute verbatim copies of this
 document provided the copyright notice and this permission notice are
diff --git a/doc/misc/wisent.texi b/doc/misc/wisent.texi
index bd12fe5ab8..d8557b84a4 100644
--- a/doc/misc/wisent.texi
+++ b/doc/misc/wisent.texi
@@ -23,7 +23,7 @@
 @c %**end of header
 
 @copying
-Copyright @copyright{} 1988--1993, 1995, 1998--2004, 2007, 2012
+Copyright @copyright{} 1988--1993, 1995, 1998--2004, 2007, 2012--2013
 Free Software Foundation, Inc.
 
 @c Since we are both GNU manuals, we do not need to ack each other here.