merge trunk

doc/lispref/ChangeLog

+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

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)))