Merged from miles@gnu.org--gnu-2005 (patch 60-65, 246-265)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-246
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-247
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-248
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-249
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-250
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-251
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-252
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-253
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-254
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-255
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-256
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-257
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-258
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-259
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-260
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-261
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-262
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-263
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-264
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-265
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-60
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-61
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-62
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-63
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-64
   (mm-string-to-multibyte): Use Gnus trunk definition.

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-65
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-328

4 files changed, 28 insertions, 16 deletions

diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index 2d3bd39ccca..39bcba57c42 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,11 @@
+2005-04-17  Richard M. Stallman  <rms@gnu.org>
+
+        * buffers.texi (Indirect Buffers): Clarify.
+
+        * positions.texi (Positions): Clarify converting marker to integer.
+
+        * strings.texi (String Basics): Mention string-match; clarify.
+
 2005-04-08  Lute Kamstra  <lute@gnu.org>
 
         * modes.texi (Search-based Fontification): Fix cross references.
diff --git a/lispref/buffers.texi b/lispref/buffers.texi
index e0ef75ccae8..a0769be23dd 100644
--- a/lispref/buffers.texi
+++ b/lispref/buffers.texi
@@ -1067,11 +1067,11 @@ in the other.  This includes the text properties as well as the characters
 themselves.
 
   In all other respects, the indirect buffer and its base buffer are
-completely separate.  They have different names, different values of
-point, different narrowing, different markers and overlays (though
+completely separate.  They have different names, independent values of
+point, independent narrowing, independent markers and overlays (though
 inserting or deleting text in either buffer relocates the markers and
-overlays for both), different major modes, and different buffer-local
-variables.
+overlays for both), independent major modes, and independent
+buffer-local variable bindings.
 
   An indirect buffer cannot visit a file, but its base buffer can.  If
 you try to save the indirect buffer, that actually saves the base
diff --git a/lispref/positions.texi b/lispref/positions.texi
index 822238a6342..3c1e642e6b4 100644
--- a/lispref/positions.texi
+++ b/lispref/positions.texi
@@ -15,14 +15,17 @@ speak of the character before or after a given position.  However, we
 often speak of the character ``at'' a position, meaning the character
 after that position.
 
-  Positions are usually represented as integers starting from 1, but can
-also be represented as @dfn{markers}---special objects that relocate
-automatically when text is inserted or deleted so they stay with the
-surrounding characters.  Functions that expect an argument to be a
-position (an integer), but accept a marker as a substitute, normally
-ignore the marker buffer.  Of course, markers used this way usually
-point to a position in the buffer that the function operates on, but
-that is entirely the programmer's responsibility.  @xref{Markers}.
+  Positions are usually represented as integers starting from 1, but
+can also be represented as @dfn{markers}---special objects that
+relocate automatically when text is inserted or deleted so they stay
+with the surrounding characters.  Functions that expect an argument to
+be a position (an integer), but accept a marker as a substitute,
+normally ignore which buffer the marker points into; they convert the
+marker to an integer, and use that integer, exactly as if you had
+passed the integer as the argument, even if the marker points to the
+``wrong'' buffer.  A marker that points nowhere cannot convert to an
+integer; using it instead of an integer causes an error.
+@xref{Markers}.
 
   See also the ``field'' feature (@pxref{Fields}), which provides
 functions that are used by many cursor-motion commands.
diff --git a/lispref/strings.texi b/lispref/strings.texi
index 30802709311..bfe0f1f7e19 100644
--- a/lispref/strings.texi
+++ b/lispref/strings.texi
@@ -74,10 +74,11 @@ a key sequence, you must use a vector instead of a string.
 and other modifiers for keyboard input characters.
 
   Strings are useful for holding regular expressions.  You can also
-match regular expressions against strings (@pxref{Regexp Search}).  The
-functions @code{match-string} (@pxref{Simple Match Data}) and
-@code{replace-match} (@pxref{Replacing Match}) are useful for
-decomposing and modifying strings based on regular expression matching.
+match regular expressions against strings with @code{string-match}
+(@pxref{Regexp Search}).  The functions @code{match-string}
+(@pxref{Simple Match Data}) and @code{replace-match} (@pxref{Replacing
+Match}) are useful for decomposing and modifying strings after
+matching regular expressions against them.
 
   Like a buffer, a string can contain text properties for the characters
 in it, as well as the characters themselves.  @xref{Text Properties}.