; Merge from origin/emacs-25

[gnu-emacs] / doc / emacs / abbrevs.texi

diff --git a/doc/emacs/abbrevs.texi b/doc/emacs/abbrevs.texi
index 4d46a5d8f574d5499a20a3f9631eb959d288b242..e0441a1984d2669c9c860cac1f01d9dc0d638161 100644 (file)
--- a/doc/emacs/abbrevs.texi
+++ b/doc/emacs/abbrevs.texi
@@ -1,5 +1,5 @@
 @c This is part of the Emacs manual.
-@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2014 Free Software
+@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2016 Free Software
 @c Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Abbrevs
@@ -20,7 +20,7 @@ to expand the letters in the buffer before point by looking for other
 words in the buffer that start with those letters.  @xref{Dynamic
 Abbrevs}.
 
-  ``Hippie'' expansion generalizes abbreviation expansion.
+  A third kind, @dfn{hippie expansion}, generalizes abbreviation expansion.
 @xref{Hippie Expand, , Hippie Expansion, autotype, Features for
 Automatic Typing}.
 
@@ -250,10 +250,10 @@ keeps track of this to help you see which abbrevs you actually use, so
 that you can eliminate those that you don't use often.  The string at
 the end of the line is the expansion.
 
-  Some abbrevs are marked with @samp{(sys)}.  These ``system'' abbrevs
+  Some abbrevs are marked with @samp{(sys)}.  These @dfn{system abbrevs}
 (@pxref{Abbrevs,,, elisp, The Emacs Lisp Reference Manual}) are
 pre-defined by various modes, and are not saved to your abbrev file.
-To disable a ``system'' abbrev, define an abbrev of the same name that
+To disable a system abbrev, define an abbrev of the same name that
 expands to itself, and save it to your abbrev file.
 
 @findex edit-abbrevs
@@ -407,7 +407,7 @@ you are expanding.
 in this search; if it is @code{nil}, the word and the expansion must
 match in case.  If the value is @code{case-fold-search} (the default),
 then the variable @code{case-fold-search} controls whether to ignore
-case while searching for expansions (@pxref{Search Case}).
+case while searching for expansions (@pxref{Lax Search}).
 
 @vindex dabbrev-case-replace
   Normally, dynamic abbrev expansion preserves the case pattern
@@ -421,7 +421,7 @@ the dynamic abbrev's case pattern is preserved in most cases; if it is
 @code{nil}, the expansion is always copied verbatim.  If the value is
 @code{case-replace} (the default), then the variable
 @code{case-replace} controls whether to copy the expansion verbatim
-(@pxref{Replacement and Case}).
+(@pxref{Replacement and Lax Matches}).
 
   However, if the expansion contains a complex mixed case pattern, and
 the dynamic abbrev matches this pattern as far as it goes, then the