merge trunk

2 files changed, 5 insertions, 1 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 53b8ac25522..b58ce8cd464 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-25  Eli Zaretskii  <eliz@gnu.org>
+
+        * processes.texi (Filter Functions): Fix last change.
+
 2010-08-24  Markus Triska  <triska@gmx.at>
 
         * processes.texi (Filter Functions): Use `buffer-live-p' instead
diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi
index 265c76471f0..89f97f99de3 100644
--- a/doc/lispref/processes.texi
+++ b/doc/lispref/processes.texi
@@ -1286,7 +1286,7 @@ of point.  Here is how to do these things:
 @end group
 @group
         (save-excursion
-          ;;  <at> r{Insert the text, advancing the process marker.}
+          ;;  @r{Insert the text, advancing the process marker.}
           (goto-char (process-mark proc))
           (insert string)
           (set-marker (process-mark proc) (point)))