upstream

22 files changed, 133 insertions, 107 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index a11dd9d9a4d..1691c979fb6 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,29 @@
+2012-03-02  Michael Albinus  <michael.albinus@gmx.de>
+
+        * dbus.texi (Signals): Known names will be mapped onto unique
+        names, when registering for signals.
+
+2012-02-29  Glenn Morris  <rgm@gnu.org>
+
+        * url.texi: Fix quote usage in body text.
+
+        * sem-user.texi, url.texi, woman.texi: Use "" quotes in menus.
+
+        * cl.texi: Use @code{} in menus when appropriate.
+
+2012-02-28  Glenn Morris  <rgm@gnu.org>
+
+        * calc.texi, cc-mode.texi, cl.texi, ebrowse.texi, ediff.texi:
+        * eshell.texi, gnus-faq.texi, gnus-news.texi, gnus.texi:
+        * idlwave.texi, info.texi, newsticker.texi, nxml-mode.texi:
+        * org.texi, sc.texi, vip.texi, viper.texi:
+        Standardize possessive apostrophe usage.
+
+2012-02-26  Chong Yidong  <cyd@gnu.org>
+
+        * ediff.texi (Quick Help Commands): Add a couple of index entries
+        (Bug#10834).
+
 2012-02-17  Glenn Morris  <rgm@gnu.org>
 
         * gnus.texi (Posting Styles):
diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index c42e8e6b9c0..48252ceb327 100644
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -9819,7 +9819,7 @@ stack but resets everything else to its default state.
 @kindex Z ?
 @pindex calc-help
 The @kbd{?} key (@code{calc-help}) displays a series of brief help messages.
-Some keys (such as @kbd{b} and @kbd{d}) are prefix keys, like Emacs'
+Some keys (such as @kbd{b} and @kbd{d}) are prefix keys, like Emacs's
 @key{ESC} and @kbd{C-x} prefixes.  You can type
 @kbd{?} after a prefix to see a list of commands beginning with that
 prefix.  (If the message includes @samp{[MORE]}, press @kbd{?} again
@@ -18912,7 +18912,7 @@ Computer Programming}, Volume II, contains a thorough description
 of the theory of random number generators and their measurement and
 characterization.
 
-If @code{RandSeed} has no stored value, Calc calls Emacs' built-in
+If @code{RandSeed} has no stored value, Calc calls Emacs's built-in
 @code{random} function to get a stream of random numbers, which it
 then treats in various ways to avoid problems inherent in the simple
 random number generators that many systems use to implement @code{random}.
@@ -35252,7 +35252,7 @@ character of the prefix can simply be typed twice.
 
 Calc is controlled by many variables, most of which can be reset
 from within Calc.  Some variables are less involved with actual
-calculation and can be set outside of Calc using Emacs's
+calculation and can be set outside of Calc using Emacs'ss
 customization facilities.  These variables are listed below.
 Typing @kbd{M-x customize-variable RET @var{variable-name} RET}
 will bring up a buffer in which the variable's value can be redefined.
diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi
index c33bdbde9e4..1a192123c3e 100644
--- a/doc/misc/cc-mode.texi
+++ b/doc/misc/cc-mode.texi
@@ -156,7 +156,7 @@ CC Mode
 @copying
 This manual is for CC Mode in Emacs.
 
-Copyright @copyright{} 1995-2012  Free Software Foundation, Inc.
+Copyright @copyright{} 1995-2012 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -6942,7 +6942,7 @@ circumstances, can locate the top-most opening brace much more quickly than
 styles where these braces are hung (e.g. most JDK-derived Java styles),
 this hack can improve performance of the core syntax parsing routines
 from 3 to 60 times.  However, for styles which @emph{do} conform to
-Emacs' recommended style of putting top-level braces in column zero,
+Emacs's recommended style of putting top-level braces in column zero,
 this hack can degrade performance by about as much.  Thus this variable
 is set to @code{nil} by default, since the Emacs-friendly styles should
 be more common (and encouraged!).  Note that this variable has no effect
@@ -7053,7 +7053,7 @@ Set the variable @code{c-basic-offset}.  @xref{Getting Started}.
 @kindex C-j
 @emph{Why doesn't the @kbd{RET} key indent the new line?}
 
-Emacs' convention is that @kbd{RET} just adds a newline, and that
+Emacs's convention is that @kbd{RET} just adds a newline, and that
 @kbd{C-j} adds a newline and indents it.  You can make @kbd{RET} do this
 too by adding this to your @code{c-initialization-hook}:
 
diff --git a/doc/misc/cl.texi b/doc/misc/cl.texi
index 594253e2c0a..d35c14acd1d 100644
--- a/doc/misc/cl.texi
+++ b/doc/misc/cl.texi
@@ -5,7 +5,7 @@
 @copying
 This file documents the GNU Emacs Common Lisp emulation package.
 
-Copyright @copyright{} 1993, 2001-2012  Free Software Foundation, Inc.
+Copyright @copyright{} 1993, 2001-2012 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -60,17 +60,17 @@ does assume a basic familiarity with Emacs Lisp.
 
 @menu
 * Overview::             Installation, usage, etc.
-* Program Structure::    Arglists, `eval-when', `defalias'
-* Predicates::           `typep' and `equalp'
-* Control Structure::    `setf', `do', `loop', etc.
-* Macros::               Destructuring, `define-compiler-macro'
-* Declarations::         `proclaim', `declare', etc.
-* Symbols::              Property lists, `gensym'
+* Program Structure::    Arglists, @code{eval-when}, @code{defalias}
+* Predicates::           @code{typep} and @code{equalp}
+* Control Structure::    @code{setf}, @code{do}, @code{loop}, etc.
+* Macros::               Destructuring, @code{define-compiler-macro}
+* Declarations::         @code{proclaim}, @code{declare}, etc.
+* Symbols::              Property lists, @code{gensym}
 * Numbers::              Predicates, functions, random numbers
 * Sequences::            Mapping, functions, searching, sorting
-* Lists::                `caddr', `sublis', `member*', `assoc*', etc.
-* Structures::           `defstruct'
-* Assertions::           `check-type', `assert', `ignore-errors'.
+* Lists::                @code{caddr}, @code{sublis}, @code{member*}, @code{assoc*}, etc.
+* Structures::           @code{defstruct}
+* Assertions::           @code{check-type}, @code{assert}, @code{ignore-errors}.
 
 * Efficiency Concerns::         Hints and techniques
 * Common Lisp Compatibility::   All known differences with Steele
@@ -128,7 +128,7 @@ features.
 
 @item
 Some features conflict with existing things in Emacs Lisp.  For
-example, Emacs' @code{assoc} function is incompatible with the
+example, Emacs's @code{assoc} function is incompatible with the
 Common Lisp @code{assoc}.  In such cases, this package usually
 adds the suffix @samp{*} to the function name of the Common
 Lisp version of the function (e.g., @code{assoc*}).
@@ -293,8 +293,8 @@ do with programs as a whole: advanced argument lists for functions,
 and the @code{eval-when} construct.
 
 @menu
-* Argument Lists::       `&key', `&aux', `defun*', `defmacro*'.
-* Time of Evaluation::   The `eval-when' construct.
+* Argument Lists::       @code{&key}, @code{&aux}, @code{defun*}, @code{defmacro*}.
+* Time of Evaluation::   The @code{eval-when} construct.
 @end menu
 
 @iftex
@@ -683,8 +683,8 @@ This section describes functions for testing whether various
 facts are true or false.
 
 @menu
-* Type Predicates::      `typep', `deftype', and `coerce'
-* Equality Predicates::  `equalp'
+* Type Predicates::      @code{typep}, @code{deftype}, and @code{coerce}
+* Equality Predicates::  @code{equalp}
 @end menu
 
 @node Type Predicates, Equality Predicates, Predicates, Predicates
@@ -858,14 +858,14 @@ various advanced control structures, including the powerful
 constructs.
 
 @menu
-* Assignment::             The `psetq' form
-* Generalized Variables::  `setf', `incf', `push', etc.
-* Variable Bindings::      `progv', `lexical-let', `flet', `macrolet'
-* Conditionals::           `case', `typecase'
-* Blocks and Exits::       `block', `return', `return-from'
-* Iteration::              `do', `dotimes', `dolist', `do-symbols'
-* Loop Facility::          The Common Lisp `loop' macro
-* Multiple Values::        `values', `multiple-value-bind', etc.
+* Assignment::             The @code{psetq} form
+* Generalized Variables::  @code{setf}, @code{incf}, @code{push}, etc.
+* Variable Bindings::      @code{progv}, @code{lexical-let}, @code{flet}, @code{macrolet}
+* Conditionals::           @code{case}, @code{typecase}
+* Blocks and Exits::       @code{block}, @code{return}, @code{return-from}
+* Iteration::              @code{do}, @code{dotimes}, @code{dolist}, @code{do-symbols}
+* Loop Facility::          The Common Lisp @code{loop} macro
+* Multiple Values::        @code{values}, @code{multiple-value-bind}, etc.
 @end menu
 
 @node Assignment, Generalized Variables, Control Structure, Control Structure
@@ -929,9 +929,9 @@ Just as certain forms like @code{a[i]} can be lvalues in C, there
 is a set of forms that can be generalized variables in Lisp.
 
 @menu
-* Basic Setf::         `setf' and place forms
-* Modify Macros::      `incf', `push', `rotatef', `letf', `callf', etc.
-* Customizing Setf::   `define-modify-macro', `defsetf', `define-setf-method'
+* Basic Setf::         @code{setf} and place forms
+* Modify Macros::      @code{incf}, @code{push}, @code{rotatef}, @code{letf}, @code{callf}, etc.
+* Customizing Setf::   @code{define-modify-macro}, @code{defsetf}, @code{define-setf-method}
 @end menu
 
 @node Basic Setf, Modify Macros, Generalized Variables, Generalized Variables
@@ -1540,10 +1540,10 @@ analogous to Lisp's built-in @code{let} form.
 are also related to variable bindings.
 
 @menu
-* Dynamic Bindings::     The `progv' form
-* Lexical Bindings::     `lexical-let' and lexical closures
-* Function Bindings::    `flet' and `labels'
-* Macro Bindings::       `macrolet' and `symbol-macrolet'
+* Dynamic Bindings::     The @code{progv} form
+* Lexical Bindings::     @code{lexical-let} and lexical closures
+* Function Bindings::    @code{flet} and @code{labels}
+* Macro Bindings::       @code{macrolet} and @code{symbol-macrolet}
 @end menu
 
 @node Dynamic Bindings, Lexical Bindings, Variable Bindings, Variable Bindings
@@ -2094,7 +2094,7 @@ of a list.  @var{list} should evaluate to a list; the body @var{forms}
 are executed with @var{var} bound to each element of the list in
 turn.  Finally, the @var{result} form (or @code{nil}) is evaluated
 with @var{var} bound to @code{nil} to produce the result returned by
-the loop.  Unlike with Emacs's built in @code{dolist}, the loop is
+the loop.  Unlike with Emacs'ss built in @code{dolist}, the loop is
 surrounded by an implicit @code{nil} block.
 @end defspec
 
@@ -2104,7 +2104,7 @@ of times.  The body is executed with @var{var} bound to the integers
 from zero (inclusive) to @var{count} (exclusive), in turn.  Then
 the @code{result} form is evaluated with @var{var} bound to the total
 number of iterations that were done (i.e., @code{(max 0 @var{count})})
-to get the return value for the loop form.  Unlike with Emacs's built in
+to get the return value for the loop form.  Unlike with Emacs'ss built in
 @code{dolist}, the loop is surrounded by an implicit @code{nil} block.
 @end defspec
 
@@ -2140,12 +2140,12 @@ construct called the ``Loop Facility'' or ``@code{loop} macro,''
 with an easy-to-use but very powerful and expressive syntax.
 
 @menu
-* Loop Basics::           `loop' macro, basic clause structure
-* Loop Examples::         Working examples of `loop' macro
-* For Clauses::           Clauses introduced by `for' or `as'
-* Iteration Clauses::     `repeat', `while', `thereis', etc.
-* Accumulation Clauses::  `collect', `sum', `maximize', etc.
-* Other Clauses::         `with', `if', `initially', `finally'
+* Loop Basics::           @code{loop} macro, basic clause structure
+* Loop Examples::         Working examples of @code{loop} macro
+* For Clauses::           Clauses introduced by @code{for} or @code{as}
+* Iteration Clauses::     @code{repeat}, @code{while}, @code{thereis}, etc.
+* Accumulation Clauses::  @code{collect}, @code{sum}, @code{maximize}, etc.
+* Other Clauses::         @code{with}, @code{if}, @code{initially}, @code{finally}
 @end menu
 
 @node Loop Basics, Loop Examples, Loop Facility, Loop Facility
@@ -2226,7 +2226,7 @@ returned by @code{buffer-list}.  For each buffer @code{buf},
 it calls @code{buffer-file-name} and collects the results into
 a list, which is then returned from the @code{loop} construct.
 The result is a list of the file names of all the buffers in
-Emacs' memory.  The words @code{for}, @code{in}, and @code{collect}
+Emacs's memory.  The words @code{for}, @code{in}, and @code{collect}
 are reserved words in the @code{loop} language.
 
 @example
@@ -3184,8 +3184,8 @@ This package defines several symbol-related features that were
 missing from Emacs Lisp.
 
 @menu
-* Property Lists::       `get*', `remprop', `getf', `remf'
-* Creating Symbols::     `gensym', `gentemp'
+* Property Lists::       @code{get*}, @code{remprop}, @code{getf}, @code{remf}
+* Creating Symbols::     @code{gensym}, @code{gentemp}
 @end menu
 
 @node Property Lists, Creating Symbols, Symbols, Symbols
@@ -3330,10 +3330,10 @@ This section defines a few simple Common Lisp operations on numbers
 which were left out of Emacs Lisp.
 
 @menu
-* Predicates on Numbers::       `plusp', `oddp', `floatp-safe', etc.
-* Numerical Functions::         `abs', `floor*', etc.
-* Random Numbers::              `random*', `make-random-state'
-* Implementation Parameters::   `most-positive-float'
+* Predicates on Numbers::       @code{plusp}, @code{oddp}, @code{floatp-safe}, etc.
+* Numerical Functions::         @code{abs}, @code{floor*}, etc.
+* Random Numbers::              @code{random*}, @code{make-random-state}
+* Implementation Parameters::   @code{most-positive-float}
 @end menu
 
 @iftex
@@ -3630,10 +3630,10 @@ Emacs Lisp includes a few of these, notably @code{elt} and
 
 @menu
 * Sequence Basics::          Arguments shared by all sequence functions
-* Mapping over Sequences::   `mapcar*', `mapcan', `map', `every', etc.
-* Sequence Functions::       `subseq', `remove*', `substitute', etc.
-* Searching Sequences::      `find', `position', `count', `search', etc.
-* Sorting Sequences::        `sort*', `stable-sort', `merge'
+* Mapping over Sequences::   @code{mapcar*}, @code{mapcan}, @code{map}, @code{every}, etc.
+* Sequence Functions::       @code{subseq}, @code{remove*}, @code{substitute}, etc.
+* Searching Sequences::      @code{find}, @code{position}, @code{count}, @code{search}, etc.
+* Sorting Sequences::        @code{sort*}, @code{stable-sort}, @code{merge}
 @end menu
 
 @node Sequence Basics, Mapping over Sequences, Sequences, Sequences
@@ -3870,7 +3870,7 @@ with @var{sequence}.
 As an extension to Common Lisp, @var{start} and/or @var{end}
 may be negative, in which case they represent a distance back
 from the end of the sequence.  This is for compatibility with
-Emacs' @code{substring} function.  Note that @code{subseq} is
+Emacs's @code{substring} function.  Note that @code{subseq} is
 the @emph{only} sequence function that allows negative
 @var{start} and @var{end}.
 
@@ -4059,7 +4059,7 @@ is less than (not equal to) its second argument.  For example,
 for sorting numbers and strings, respectively; @code{>} would sort
 numbers into decreasing rather than increasing order.
 
-This function differs from Emacs' built-in @code{sort} in that it
+This function differs from Emacs's built-in @code{sort} in that it
 can operate on any type of sequence, not just lists.  Also, it
 accepts a @code{:key} argument which is used to preprocess data
 fed to the @var{predicate} function.  For example,
@@ -4113,10 +4113,10 @@ a merged sequence which is (stably) sorted according to
 The functions described here operate on lists.
 
 @menu
-* List Functions::                `caddr', `first', `list*', etc.
-* Substitution of Expressions::   `subst', `sublis', etc.
-* Lists as Sets::                 `member*', `adjoin', `union', etc.
-* Association Lists::             `assoc*', `rassoc*', `acons', `pairlis'
+* List Functions::                @code{caddr}, @code{first}, @code{list*}, etc.
+* Substitution of Expressions::   @code{subst}, @code{sublis}, etc.
+* Lists as Sets::                 @code{member*}, @code{adjoin}, @code{union}, etc.
+* Association Lists::             @code{assoc*}, @code{rassoc*}, @code{acons}, @code{pairlis}
 @end menu
 
 @node List Functions, Substitution of Expressions, Lists, Lists
@@ -5186,7 +5186,7 @@ variables no collision can occur.)
 
 @xref{Lexical Bindings}, for a description of the @code{lexical-let}
 form which establishes a Common Lisp-style lexical binding, and some
-examples of how it differs from Emacs' regular @code{let}.
+examples of how it differs from Emacs's regular @code{let}.
 
 @item
 Reader macros.  Common Lisp includes a second type of macro that
diff --git a/doc/misc/dbus.texi b/doc/misc/dbus.texi
index 71f60af530b..204afe7056e 100644
--- a/doc/misc/dbus.texi
+++ b/doc/misc/dbus.texi
@@ -1606,9 +1606,10 @@ D-Bus @var{bus}.
 
 @var{service} is the D-Bus service name used by the sending D-Bus
 object.  It can be either a known name or the unique name of the D-Bus
-object sending the signal.  In case of a unique name, signals won't be
-received any longer once the object owning this unique name has
-disappeared, and a new queued object has replaced it.
+object sending the signal.  A known name will be mapped onto the
+unique name of the object, owning @var{service} at registration time.
+When the corresponding D-Bus object disappears, signals won't be
+received any longer.
 
 When @var{service} is @code{nil}, related signals from all D-Bus
 objects shall be accepted.
diff --git a/doc/misc/ebrowse.texi b/doc/misc/ebrowse.texi
index cf716f4e031..6db27a38808 100644
--- a/doc/misc/ebrowse.texi
+++ b/doc/misc/ebrowse.texi
@@ -10,7 +10,7 @@
 @copying
 This file documents Ebrowse, a C++ class browser for GNU Emacs.
 
-Copyright @copyright{} 2000-2012  Free Software Foundation, Inc.
+Copyright @copyright{} 2000-2012 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -149,7 +149,7 @@ importantly you can find or view member declarations and definitions
 with a keystroke.  @xref{Member Buffers}.
 
 These two buffer types and the commands they provide support the
-navigational use of the browser.  The second form resembles Emacs' Tags
+navigational use of the browser.  The second form resembles Emacs's Tags
 package for C and other procedural languages.  Ebrowse's commands of
 this type are not confined to special buffers; they are most often used
 while you are editing your source code.
diff --git a/doc/misc/ediff.texi b/doc/misc/ediff.texi
index 1e9ecf07a14..01349e31468 100644
--- a/doc/misc/ediff.texi
+++ b/doc/misc/ediff.texi
@@ -433,6 +433,8 @@ command (see @kbd{ga}, @kbd{gb}, and @kbd{gc}).
 
 @node Quick Help Commands,Other Session Commands,,Session Commands
 @section Quick Help Commands
+@cindex command help
+@cindex important commands
 
 @table @kbd
 @item ?
@@ -1731,7 +1733,7 @@ faces, you can modify them when Ediff is being loaded using
 @end smallexample
 
 @strong{Please note:} to set Ediff's faces, use only @code{copy-face}
-or @code{set/make-face-@dots{}} as shown above. Emacs' low-level
+or @code{set/make-face-@dots{}} as shown above. Emacs's low-level
 face-manipulation functions should be avoided.
 
 @node Narrowing, Refinement of Difference Regions, Highlighting Difference Regions, Customization
diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi
index 99fbf1a4fcf..d322ca7c3e1 100644
--- a/doc/misc/eshell.texi
+++ b/doc/misc/eshell.texi
@@ -94,7 +94,7 @@ handling the sort of tasks accomplished by those tools.
 @cindex Eshell, what it is
 
 Eshell is a @dfn{command shell} written in Emacs Lisp.  Everything it
-does, it uses Emacs' facilities to do.  This means that Eshell is as
+does, it uses Emacs's facilities to do.  This means that Eshell is as
 portable as Emacs itself.  It also means that cooperation with Lisp code
 is natural and seamless.
 
diff --git a/doc/misc/gnus-faq.texi b/doc/misc/gnus-faq.texi
index ae6373e9a6e..9d075a8efac 100644
--- a/doc/misc/gnus-faq.texi
+++ b/doc/misc/gnus-faq.texi
@@ -161,7 +161,7 @@ Where and how to get Gnus?
 @subsubheading Answer
 
 Gnus is released independent from releases of Emacs and XEmacs.
-Therefore, the version bundled with Emacs or the version in XEmacs'
+Therefore, the version bundled with Emacs or the version in XEmacs's
 package system might not be up to date (e.g. Gnus 5.9 bundled with Emacs
 21 is outdated).
 You can get the latest released version of Gnus from
diff --git a/doc/misc/gnus-news.texi b/doc/misc/gnus-news.texi
index 5421e64625a..19bbe01667c 100644
--- a/doc/misc/gnus-news.texi
+++ b/doc/misc/gnus-news.texi
@@ -44,7 +44,7 @@ for more information about nntp marks.  Note that downgrading isn't
 safe in general.
 
 @item Incompatibility when switching from Emacs 23 to Emacs 22 
-In Emacs 23, Gnus uses Emacs' new internal coding system @code{utf-8-emacs}
+In Emacs 23, Gnus uses Emacs's new internal coding system @code{utf-8-emacs}
 for saving articles drafts and @file{~/.newsrc.eld}.  These files may not
 be read correctly in Emacs 22 and below.  If you want to use Gnus across
 different Emacs versions, you may set @code{mm-auto-save-coding-system}
@@ -333,7 +333,7 @@ in the group buffer, see the variable @code{gnus-group-update-tool-bar}.
 Its default value depends on your Emacs version.
 @c FIXME: Document this in the manual
 
-@item You can change the location of XEmacs' toolbars in Gnus buffers.
+@item You can change the location of XEmacs's toolbars in Gnus buffers.
 See @code{gnus-use-toolbar} and @code{message-use-toolbar}.
 
 @end itemize
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index ae2c5dbd092..c3b62f3b791 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -16696,7 +16696,7 @@ was used for mail landing on the system, but Babyl had its own internal
 format to which mail was converted, primarily involving creating a
 spool-file-like entity with a scheme for inserting Babyl-specific
 headers and status bits above the top of each message in the file.
-Rmail was Emacs' first mail reader, it was written by Richard Stallman,
+Rmail was Emacs's first mail reader, it was written by Richard Stallman,
 and Stallman came out of that TOPS/Babyl environment, so he wrote Rmail
 to understand the mail files folks already had in existence.  Gnus (and
 VM, for that matter) continue to support this format because it's
@@ -21040,7 +21040,7 @@ and `gnus-score-decay-scale'."
                            (* (abs score)
                               gnus-score-decay-scale)))))))
     (if (and (featurep 'xemacs)
-             ;; XEmacs' floor can handle only the floating point
+             ;; XEmacs's floor can handle only the floating point
              ;; number below the half of the maximum integer.
              (> (abs n) (lsh -1 -2)))
         (string-to-number
diff --git a/doc/misc/idlwave.texi b/doc/misc/idlwave.texi
index 5423ff2e74f..736c6ce7f91 100644
--- a/doc/misc/idlwave.texi
+++ b/doc/misc/idlwave.texi
@@ -4193,7 +4193,7 @@ installed.  Many Emacsen come with an older bundled copy of IDLWAVE
 (e.g. v4.7 for Emacs 21.x), which is likely what's being used instead.
 You need to make sure your Emacs @emph{load-path} contains the directory
 where IDLWAVE is installed (@file{/usr/local/share/emacs/site-lisp}, by
-default), @emph{before} Emacs' default search directories.  You can
+default), @emph{before} Emacs's default search directories.  You can
 accomplish this by putting the following in your @file{.emacs}:
 
 @lisp
diff --git a/doc/misc/info.texi b/doc/misc/info.texi
index 3316e9883d8..ed00e8da028 100644
--- a/doc/misc/info.texi
+++ b/doc/misc/info.texi
@@ -14,8 +14,7 @@
 This file describes how to use Info, the on-line, menu-driven GNU
 documentation system.
 
-Copyright @copyright{} 1989, 1992, 1996-2012
-Free Software Foundation, Inc.
+Copyright @copyright{} 1989, 1992, 1996-2012 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -1108,7 +1107,7 @@ In the stand-alone reader, @kbd{0} goes through the last menu item;
 this is so you need not count how many entries are there.
 
   If your display supports multiple fonts, colors or underlining, and
-you are using Emacs' Info mode to read Info files, the third, sixth
+you are using Emacs's Info mode to read Info files, the third, sixth
 and ninth menu items have a @samp{*} that stands out, either in color
 or in some other attribute, such as underline; this makes it easy to
 see at a glance which number to use for an item.
diff --git a/doc/misc/newsticker.texi b/doc/misc/newsticker.texi
index 9b61e8f6f3a..919ca21cc3e 100644
--- a/doc/misc/newsticker.texi
+++ b/doc/misc/newsticker.texi
@@ -13,8 +13,7 @@
 This manual is for Newsticker (version @value{VERSION}, @value{UPDATED}).
 
 @noindent
-Copyright @copyright{} 2004-2012
-Free Software Foundation, Inc.
+Copyright @copyright{} 2004-2012 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -128,7 +127,7 @@ requires an XML-parser (@file{xml.el}) which is part of GNU Emacs.  If
 you are using XEmacs you want to get the @file{net-utils} package
 which contains @file{xml.el} for XEmacs.
 
-Newsticker retrieves headlines either via Emacs' built-in retrieval
+Newsticker retrieves headlines either via Emacs's built-in retrieval
 functions, by an arbitrary external program that retrieves files via
 http and prints them to stdout (like
 @uref{http://www.gnu.org/software/wget/wget.html, wget}, or -- on a
@@ -215,7 +214,7 @@ retrieved.
 @item
 @vindex newsticker-retrieval-method
 @code{newsticker-retrieval-method} defines how headlines are
-retrieved. This is either done using Emacs' built-in download
+retrieved.  This is either done using Emacs's built-in download
 capabilities or using an external tool.
 @item
 @vindex newsticker-retrieval-interval
diff --git a/doc/misc/nxml-mode.texi b/doc/misc/nxml-mode.texi
index 5141ed0e93d..73af1ace245 100644
--- a/doc/misc/nxml-mode.texi
+++ b/doc/misc/nxml-mode.texi
@@ -8,8 +8,7 @@
 This manual documents nxml-mode, an Emacs major mode for editing
 XML with RELAX NG support.
 
-Copyright @copyright{} 2007-2012
-Free Software Foundation, Inc.
+Copyright @copyright{} 2007-2012 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -355,7 +354,7 @@ Otherwise, it is a paragraph boundary.
 @chapter Outlining
 
 nXML mode allows you to display all or part of a buffer as an
-outline, in a similar way to Emacs' outline mode.  An outline in nXML
+outline, in a similar way to Emacs's outline mode.  An outline in nXML
 mode is based on recognizing two kinds of element: sections and
 headings.  There is one heading for every section and one section for
 every heading.  A section contains its heading as or within its first
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index 8da6cd96525..2a41d6b9301 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -265,7 +265,7 @@
 @copying
 This manual is for Org version @value{VERSION}.
 
-Copyright @copyright{} 2004-2012  Free Software Foundation, Inc.
+Copyright @copyright{} 2004-2012 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -6162,7 +6162,7 @@ applying it to another one.
 By customizing the variable @code{org-clock-idle-time} to some integer, such
 as 10 or 15, Emacs can alert you when you get back to your computer after
 being idle for that many minutes@footnote{On computers using Mac OS X,
-idleness is based on actual user idleness, not just Emacs' idle time.  For
+idleness is based on actual user idleness, not just Emacs's idle time.  For
 X11, you can install a utility program @file{x11idle.c}, available in the
 UTILITIES directory of the Org git distribution, to get the same general
 treatment of idleness.  On other systems, idle time refers to Emacs idle time
diff --git a/doc/misc/sc.texi b/doc/misc/sc.texi
index 6874828d427..b921882af67 100644
--- a/doc/misc/sc.texi
+++ b/doc/misc/sc.texi
@@ -204,7 +204,7 @@ When the original message is cited by @code{sc-cite-original}, it will
 (optionally) be filled by Supercite.  However, if you manually edit the
 cited text and want to re-fill it, you must use an add-on package such
 as @cite{filladapt} or @cite{gin-mode}.  These packages can recognize
-Supercited text and will fill them appropriately.  Emacs' built-in
+Supercited text and will fill them appropriately.  Emacs's built-in
 filling routines, e.g@. @code{fill-paragraph}, do not recognize cited
 text and will not re-fill them properly because it cannot guess the
 @code{fill-prefix} being used.
@@ -786,7 +786,7 @@ pertaining to the MUAs you are using.
 One final note.  After Supercite is loaded into your Emacs session, it
 runs the hook @code{sc-load-hook}.  You can put any customizations into
 this hook since it is only run once.  This will not work, however, if
-your Emacs maintainer has put Supercite into your dumped Emacs' image.
+your Emacs maintainer has put Supercite into your dumped Emacs image.
 In that case, you can use the @code{sc-pre-hook} variable, but this will
 get executed every time @code{sc-cite-original} is called.  @xref{Reply
 Buffer Initialization}.@refill
@@ -1008,7 +1008,7 @@ fill each cited paragraph in the reply buffer.
 
 I usually run with both these variables containing their default values.
 When Supercite's automatic filling breaks on a particular message, I
-will use Emacs' undo feature to undo back before the citation was
+will use Emacs's undo feature to undo back before the citation was
 applied to the original message.  Then I'll toggle the variables and
 manually cite those paragraphs that I don't want to fill or collapse
 whitespace on.  @xref{Variable Toggling Shortcuts}.@refill
@@ -1688,7 +1688,7 @@ Toggles the variable @code{sc-fixup-whitespace-p}.
 
 @findex set-variable
 The following commands let you set the value of multi-value variables,
-in the same way that Emacs' @code{set-variable} does:
+in the same way that Emacs's @code{set-variable} does:
 
 @table @kbd
 @item C-c C-p C-t a
@@ -1777,7 +1777,7 @@ old information is lost.@refill
 @findex open-line
 @kindex C-c C-p o
 @item @code{sc-open-line} (@kbd{C-c C-p o})
-Similar to Emacs' standard @code{open-line} commands, but inserts the
+Similar to Emacs's standard @code{open-line} commands, but inserts the
 citation string in front of the new line.  As with @code{open-line},
 an optional numeric argument inserts that many new lines.@refill
 @end table
diff --git a/doc/misc/sem-user.texi b/doc/misc/sem-user.texi
index e223f98d46a..9f4dc72fea3 100644
--- a/doc/misc/sem-user.texi
+++ b/doc/misc/sem-user.texi
@@ -1,6 +1,6 @@
 @c This file is included by semantic.texi
 
-@c Copyright (C) 1999-2005, 2007, 2009-2012  Free Software Foundation, Inc.
+@c Copyright (C) 1999-2005, 2007, 2009-2012 Free Software Foundation, Inc.
 
 @c Permission is granted to copy, distribute and/or modify this
 @c document under the terms of the GNU Free Documentation License,
@@ -31,7 +31,7 @@ File,,,emacs,Emacs manual}.
 * Analyzer::            Semantic tools for analyzing code.
 * Speedbar::            Using @semantic{} with the Speedbar.
 * SymRef::              Interface to symbol reference tools.
-* MRU Bookmarks::       Managing tag ``bookmarks''.
+* MRU Bookmarks::       Managing tag "bookmarks".
 * Sticky Func Mode::    Showing declarations in the header line.
 * Highlight Func Mode:: Highlight the current function declaration.
 * Tag Decoration Mode:: Minor mode to decorate tags.
diff --git a/doc/misc/url.texi b/doc/misc/url.texi
index 771430251b6..680f1921479 100644
--- a/doc/misc/url.texi
+++ b/doc/misc/url.texi
@@ -96,7 +96,7 @@ where @samp{@r{[}} and @samp{@r{]}} delimit optional parts.
 but you should beware of the security risks of sending cleartext
 passwords.  @var{hostname} may be a domain name or a dotted decimal
 address.  If the @samp{:@var{port}} is omitted then the library will
-use the `well known' port for that service when accessing URLs.  With
+use the ``well known'' port for that service when accessing URLs.  With
 the possible exception of @code{telnet}, it is rare for ports to be
 specified, and it is possible using a non-standard port may have
 undesired consequences if a different service is listening on that
@@ -145,7 +145,7 @@ is the host name associated with it, or @code{nil};
 @item port
 is the port number associated with it, or @code{nil};
 @item file
-is the `file' part of it, or @code{nil}.  This doesn't necessarily
+is the ``file'' part of it, or @code{nil}.  This doesn't necessarily
 actually refer to a file;
 @item target
 is the target part, or @code{nil};
@@ -228,7 +228,7 @@ controls the number of concurrent processes, and the option
 @menu
 * http/https::                  Hypertext Transfer Protocol.
 * file/ftp::                    Local files and FTP archives.
-* info::                        Emacs `Info' pages.
+* info::                        Emacs "Info" pages.
 * mailto::                      Sending email.
 * news/nntp/snews::             Usenet news.
 * rlogin/telnet/tn3270::        Remote host connectivity.
@@ -472,7 +472,7 @@ The form of a mailto URL is
 @var{header} is @samp{body}, then @var{contents} is put in the body
 otherwise a @var{header} header field is created with @var{contents}
 as its contents.  Note that the URL library does not consider any
-headers `dangerous' so you should check them before sending the
+headers ``dangerous'' so you should check them before sending the
 message.
 
 @c Fixme: update
@@ -1009,7 +1009,7 @@ This the @samp{nslookup} program.  It is @code{"nslookup"} by default.
 In some circumstances it is desirable to suppress making network
 connections.  A typical case is when rendering HTML in a mail user
 agent, when external URLs should not be activated, particularly to
-avoid `bugs' which `call home' by fetch single-pixel images and the
+avoid ``bugs'' which ``call home'' by fetch single-pixel images and the
 like.  To arrange this, bind the following variable for the duration
 of such processing.
 
@@ -1062,7 +1062,7 @@ automatically via @code{url-do-setup} when it is configured to be on.
 Note that the size of the history list is currently not limited.
 
 @vindex url-history-hash-table
-The history `list' is actually a hash table,
+The history ``list'' is actually a hash table,
 @code{url-history-hash-table}.  It contains access times keyed by URL
 strings.  The times are in the format returned by @code{current-time}.
 
diff --git a/doc/misc/vip.texi b/doc/misc/vip.texi
index 4b4bbfe5091..0d9bb286330 100644
--- a/doc/misc/vip.texi
+++ b/doc/misc/vip.texi
@@ -1705,7 +1705,7 @@ expressions}.  For example, a typical forward search would be invoked by
 @var{pat} you must preceded it by @samp{\}.  VIP strips off these @kbd{\}'s
 before @kbd{/} and the resulting @var{pat} becomes the actual search
 pattern.  Emacs provides a different and richer class or regular
-expressions than Vi/Ex, and VIP uses Emacs' regular expressions.  See GNU
+expressions than Vi/Ex, and VIP uses Emacs's regular expressions.  See GNU
 Emacs Manual for details of regular expressions.
 
 Several Ex commands can be entered in a line by separating them by a pipe
diff --git a/doc/misc/viper.texi b/doc/misc/viper.texi
index a660cfb6b9d..86455524b1f 100644
--- a/doc/misc/viper.texi
+++ b/doc/misc/viper.texi
@@ -687,7 +687,7 @@ Insert state.  For instance, Emacs has a @dfn{yank} command, @kbd{C-y},
 which is similar to Vi's @kbd{p}.  However, unlike @kbd{p}, @kbd{C-y} can be
 used in Insert state of Viper.  Emacs also has a kill ring where it keeps
 pieces of text you deleted while editing buffers.  The command @kbd{M-y} is
-used to delete the text previously put back by Emacs' @kbd{C-y} or by Vi's
+used to delete the text previously put back by Emacs's @kbd{C-y} or by Vi's
 @kbd{p} command and reinsert text that was placed on the kill-ring earlier.
 
 This works both in Vi and Insert states.
@@ -1289,7 +1289,7 @@ the following example:
 The above discussion of the meaning of Viper's words concerns only Viper's
 movement commands.  In regular expressions, words remain the same as in
 Emacs.  That is, the expressions @code{\w}, @code{\>}, @code{\<}, etc., use
-Emacs' idea of what is a word, and they don't look into the value of
+Emacs's idea of what is a word, and they don't look into the value of
 variable @code{viper-syntax-preference}.  This is because Viper doesn't change
 syntax tables in fear of upsetting the various major modes that set these
 tables.
@@ -2504,7 +2504,7 @@ major modes.
 @item viper-minibuffer-emacs-face  'viper-minibuffer-emacs-face
 These faces control the appearance of the minibuffer text in the
 corresponding Viper states.  You can change the appearance of these faces
-through Emacs' customization widget, which is accessible through the
+through Emacs's customization widget, which is accessible through the
 menubar.
 
 Viper is located in this widget under the @emph{Emulations} customization
@@ -3205,7 +3205,7 @@ in the appropriate major mode hooks.
 
 The above discussion concerns only the movement commands.  In regular
 expressions, words remain the same as in Emacs.  That is, the expressions
-@code{\w}, @code{\>}, @code{\<}, etc., use Emacs' idea of what is a word,
+@code{\w}, @code{\>}, @code{\<}, etc., use Emacs's idea of what is a word,
 and they don't look into the value of variable
 @code{viper-syntax-preference}.  This is because Viper avoids changing
 syntax tables in order to not thwart the various major modes that set these
diff --git a/doc/misc/woman.texi b/doc/misc/woman.texi
index 1ad741d3d30..b8b15a13c76 100644
--- a/doc/misc/woman.texi
+++ b/doc/misc/woman.texi
@@ -432,7 +432,7 @@ slow.  @xref{Cache, , The WoMan Topic Cache}, for further details.
 
 @menu
 * Cache::               The WoMan Topic Cache
-* Word at point::       Using the ``Word at Point'' as a Topic Suggestion
+* Word at point::       Using the "Word at Point" as a Topic Suggestion
 @end menu
 
 @node Cache, Word at point, Topic, Topic
@@ -472,7 +472,7 @@ time it is run in a new Emacs session.
 
 @node Word at point,  , Cache, Topic
 @comment  node-name,  next,  previous,  up
-@subsection Using the ``Word at Point'' as a Topic Suggestion
+@subsection Using the "Word at Point" as a Topic Suggestion
 @cindex word at point
 @cindex point, word at