Merge from trunk

16 files changed, 223 insertions, 68 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 487663109bd..8285a313191 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,12 @@
+2010-07-31  Eli Zaretskii  <eliz@gnu.org>
+
+        * files.texi (Visiting): Add more index entries for
+        large-file-warning-threshold.
+
+2010-07-29  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * frames.texi (Tool Bars): Add doc for tool-bar-position.
+
 2010-06-23  Glenn Morris  <rgm@gnu.org>
 
         * abbrevs.texi, basic.texi, buffers.texi, building.texi, calendar.texi:
@@ -606,7 +615,7 @@
 
 2009-06-23  Miles Bader  <miles@gnu.org>
 
-        * display.texi (Scrolling): Document `recenter-redisplay'
+        * display.texi (Scrolling): Document `recenter-redisplay'.
         (Temporary Face Changes): Document `text-scale-set'.
 
 2009-06-21  Chong Yidong  <cyd@stupidchicken.com>
@@ -5704,7 +5713,7 @@
 2005-03-05  Juri Linkov  <juri@jurta.org>
 
         * cmdargs.texi (Emacs Invocation): Add cindex
-        "invocation (command line arguments)"
+        "invocation (command line arguments)".
         (Misc X): Add -nbc, --no-blinking-cursor.
 
 2005-03-04  Ulf Jasper  <ulf.jasper@web.de>
diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi
index 4701c1a7a89..73c10ac834f 100644
--- a/doc/emacs/files.texi
+++ b/doc/emacs/files.texi
@@ -202,6 +202,8 @@ since you visited or saved it last.  If the file has changed, Emacs offers
 to reread it.
 
 @vindex large-file-warning-threshold
+@cindex file, warning when size is large
+@cindex size of file, warning when visiting
 @cindex maximum buffer size exceeded, error message
   If you try to visit a file larger than
 @code{large-file-warning-threshold} (the default is 10000000, which is
diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi
index fbc21f17884..fb7413e8593 100644
--- a/doc/emacs/frames.texi
+++ b/doc/emacs/frames.texi
@@ -1270,6 +1270,12 @@ Customize @code{tool-bar-style} to select style.  The default style is
 the same as for the desktop in the Gnome case.  If no default is found,
 the tool bar uses just images.
 
+@cindex Tool Bar position
+  You can also control the placement of the tool bar for the GTK+ tool bar
+with the frame parameter @code{tool-bar-position}.
+For a detailed description of frame parameters and customization,
+see @ref{Frame Parameters,,, elisp, The Emacs Lisp Reference Manual}.
+
 @node Dialog Boxes
 @section Using Dialog Boxes
 @cindex dialog boxes
diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index 093a7018ca3..1ab06891961 100644
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -212,7 +212,7 @@
         (Simple Extension): Replace longer expression with
         `emacs-major-version'.  Remove comment about `number-to-string'
         function.
-        (Miscellaneous): Add filename option, `-H', to `grep' example
+        (Miscellaneous): Add filename option, `-H', to `grep' example.
         (debug, debug-on-entry): Replace `GNU Emacs 22' with `a recent
         GNU Emacs'.
         (edebug): More properly state where to place point for 'M-x
@@ -234,7 +234,7 @@
         (sentence-end): Specify `in English' for glyphs that end a sentence.
         Note that in GNU Emacs 22, the name refers to both a variable and a
         function.
-        (fwd-sentence while loops): Write a function as one, not as a form
+        (fwd-sentence while loops): Write a function as one, not as a form.
         (fwd-para let): Add `which' to sentence with `parstart' and `parsep'.
         (etags): Move sentences involving `find-tag' and sources.  State
         location of Emacs `src' directory.
@@ -356,7 +356,7 @@
 2003-11-16  Kevin Ryde  <user42@zip.com.au>
 
         * emacs-lisp-intro.texi: [CVS commitment by <bob@rattlesnake.com>]
-        Corrections to cross references,
+        Corrections to cross references.
         (Interactive Options): elisp "interactive" -> "Using Interactive".
         (defvar and asterisk): Remove emacs "Edit Options" reference,
         edit-options is no longer described in the emacs manual.
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 20e8150599b..fe64ca9d835 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,33 @@
+2010-08-08  Christoph  <cschol2112@googlemail.com>
+
+        * control.texi (Handling Errors) <error-message-string>: Fix arg name.
+
+2010-08-08  Juanma Barranquero  <lekktu@gmail.com>
+
+        * modes.texi (Defining Minor Modes): Use C-backspace, not C-delete.
+        Suggested by Štěpán Němec <stepnem@gmail.com>.
+
+2010-08-08  Juanma Barranquero  <lekktu@gmail.com>
+
+        * minibuf.texi (High-Level Completion): Document args of
+        `read-buffer-function' (bug#5625).
+
+2010-07-29  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * frames.texi (Layout Parameters): Add doc for tool-bar-position.
+
+2010-07-29  Michael Albinus  <michael.albinus@gmx.de>
+
+        * processes.texi (Process Information): Explain process property
+        `remote-tty'.
+
+2010-07-27  Juanma Barranquero  <lekktu@gmail.com>
+
+        * modes.texi (Defining Minor Modes): Use C-delete in examples,
+        instead of "\C-\^?" (bug#6334).
+
+        * text.texi (Special Properties): Fix typo.
+
 2010-07-09  Eli Zaretskii  <eliz@gnu.org>
 
         * internals.texi (Writing Emacs Primitives): Adapt to ANSI C
@@ -6015,7 +6045,7 @@
 2005-02-05  Eli Zaretskii  <eliz@gnu.org>
 
         * frames.texi (Color Names): Add pointer to the X docs about RGB
-        color specifications.  Improve indexing
+        color specifications.  Improve indexing.
         (Text Terminal Colors): Replace the description of RGB values by
         an xref to "Color Names".
 
@@ -7778,7 +7808,7 @@
         * minibuf.texi (Reading File Names): read-file-name has new
         arg PREDICATE.  New function read-directory-name.
 
-        * macros.texi (Defining Macros): Give definition of `declare'
+        * macros.texi (Defining Macros): Give definition of `declare'.
         (Indenting Macros): New node.
 
         * frames.texi (Parameter Access): Add modify-all-frames-parameters.
@@ -7882,7 +7912,7 @@
         * numbers.texi (Integer Basics): Add most-positive-fixnum,
         most-negative-fixnum.
 
-        * compile.texi (Byte Compilation): Explain no-byte-compile
+        * compile.texi (Byte Compilation): Explain no-byte-compile.
         (Compiler Errors): New node.
 
         * os.texi (User Identification): user-uid, user-real-uid
diff --git a/doc/lispref/control.texi b/doc/lispref/control.texi
index 1c4447e9eb5..16564677f32 100644
--- a/doc/lispref/control.texi
+++ b/doc/lispref/control.texi
@@ -1039,7 +1039,7 @@ to @code{condition-case} whose error condition you want to re-throw.
 @xref{Definition of signal}.
 @end defspec
 
-@defun error-message-string error-description
+@defun error-message-string error-descriptor
 This function returns the error message string for a given error
 descriptor.  It is useful if you want to handle an error by printing the
 usual error message for that error.  @xref{Definition of signal}.
diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi
index 7dfe3242c5d..a54a65b0743 100644
--- a/doc/lispref/frames.texi
+++ b/doc/lispref/frames.texi
@@ -677,6 +677,11 @@ The number of lines to use for the tool bar.  A value of @code{nil}
 means don't display a tool bar.  (GTK and Nextstep allow at most one
 tool bar line; they treat larger values as 1.)
 
+@item tool-bar-position
+The position of the tool bar.  Currently only for the GTK tool bar.
+Value can be one of @code{top}, @code{bottom} @code{left}, @code{right}.
+The default is  @code{top}.
+
 @item line-spacing
 Additional space to leave below each text line, in pixels (a positive
 integer).  @xref{Line Height}, for more information.
diff --git a/doc/lispref/minibuf.texi b/doc/lispref/minibuf.texi
index 3588704b054..9bc6be432ae 100644
--- a/doc/lispref/minibuf.texi
+++ b/doc/lispref/minibuf.texi
@@ -1222,10 +1222,11 @@ Buffer name (default foo): @point{}
 @end defun
 
 @defopt read-buffer-function
-This variable specifies how to read buffer names.  For example, if you
-set this variable to @code{iswitchb-read-buffer}, all Emacs commands
-that call @code{read-buffer} to read a buffer name will actually use the
-@code{iswitchb} package to read it.
+This variable specifies how to read buffer names.  The function is
+called with the arguments passed to @code{read-buffer}.  For example,
+if you set this variable to @code{iswitchb-read-buffer}, all Emacs
+commands that call @code{read-buffer} to read a buffer name will
+actually use the @code{iswitchb} package to read it.
 @end defopt
 
 @defopt read-buffer-completion-ignore-case
diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index 858226ecdfc..3953da59b93 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -1494,7 +1494,7 @@ See the command \\[hungry-electric-delete]."
  ;; The indicator for the mode line.
  " Hungry"
  ;; The minor mode bindings.
- '(("\C-\^?" . hungry-electric-delete))
+ '(([C-backspace] . hungry-electric-delete))
  :group 'hunger)
 @end smallexample
 
@@ -1526,8 +1526,8 @@ See the command \\[hungry-electric-delete]."
  :lighter " Hungry"
  ;; The minor mode bindings.
  :keymap
- '(("\C-\^?" . hungry-electric-delete)
-   ("\C-\M-\^?"
+ '(([C-backspace] . hungry-electric-delete)
+   ([C-M-backspace]
     . (lambda ()
         (interactive)
         (hungry-electric-delete t))))
diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi
index 1a4a766c81c..747d865b0e1 100644
--- a/doc/lispref/processes.texi
+++ b/doc/lispref/processes.texi
@@ -868,7 +868,9 @@ terminated, the value is 0.
 This function returns the terminal name that @var{process} is using for
 its communication with Emacs---or @code{nil} if it is using pipes
 instead of a terminal (see @code{process-connection-type} in
-@ref{Asynchronous Processes}).
+@ref{Asynchronous Processes}).  If @var{process} represents a program
+running on a remote host, the terminal name used by that program on
+the remote host is provided as process property @code{remote-tty}.
 @end defun
 
 @defun process-coding-system process
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index f52d1db5c9c..a7c4a3e62f4 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -3035,7 +3035,7 @@ The @code{font-lock-face} property is equivalent to the @code{face}
 property when Font Lock mode is enabled.  When Font Lock mode is disabled,
 @code{font-lock-face} has no effect.
 
-The @code{font-lock-mode} property is useful for special modes that
+The @code{font-lock-face} property is useful for special modes that
 implement their own highlighting.  @xref{Precalculated Fontification}.
 
 @item mouse-face
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 44d1e00be0d..67de15fd2f8 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,40 @@
+2010-08-09  Jay Belanger  <jay.p.belanger@gmail.com>
+
+        * calc.texi (Customizing Calc): Rearrange description of new
+        variables to match the presentation of other variables.
+
+2010-08-08  Juanma Barranquero  <lekktu@gmail.com>
+
+        * org.texi (Footnotes, Tables in HTML export): Fix typos.
+
+2010-08-08  Jay Belanger  <jay.p.belanger@gmail.com>
+
+        * calc.texi (Making Selections, Selecting Subformulas)
+        (Customizing Calc): Mention how to use faces to emphasize selected
+        sub-formulas.
+
+2010-08-05  Michael Albinus  <michael.albinus@gmx.de>
+
+        * tramp.texi (External packages): File attributes cache flushing
+        for asynchronous processes.
+
+2010-08-01  Alan Mackenzie  <acm@muc.de>
+
+        Enhance the manual for the latest Java Mode.
+
+        * cc-mode.texi (Syntactic Symbols): New symbols annotation-top-cont and
+        annotation-var-cont.
+        (Java Symbols): Page renamed from Anonymous Class Symbol.  Document the
+        two new symbols.
+
+2010-07-28  Michael Albinus  <michael.albinus@gmx.de>
+
+        * tramp.texi (Traces and Profiles): Describe verbose level 9.
+
+2010-07-27  Chong Yidong  <cyd@stupidchicken.com>
+
+        * nxml-mode.texi (Limitations): Remove obsolete discussion (Bug#6708).
+
 2010-07-19  Juanma Barranquero  <lekktu@gmail.com>
 
         * org.texi: Fix typo in previous change (2010-07-19T09:47:27Z!carsten.dominik@gmail.com).
@@ -4777,7 +4814,7 @@
 
         * org.texi (FAQ): Document `org-table-tab-jumps-over-hlines'.
         (Agenda): Document commands `org-cycle-agenda-files' and
-        `org-agenda-file-to-front'
+        `org-agenda-file-to-front'.
         (Built-in table editor): Document `org-table-sort-lines'.
         (HTML formatting): Export of hand-formatted lists.
 
@@ -6366,7 +6403,7 @@
 
 2000-12-14  Dave Love  <fx@gnu.org>
 
-        * Makefile.in (mostlyclean): Remove gnustmp.*
+        * Makefile.in (mostlyclean): Remove gnustmp.*.
         (gnus.dvi): Change rule to remove @latex stuff.
 
 2000-10-19  Eric M. Ludlam  <zappo@ultranet.com>
diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index ab81cf1bca2..f0b79e95dc8 100644
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -21513,7 +21513,11 @@ to
 
 @noindent
 Every character not part of the sub-formula @samp{b} has been changed
-to a dot.  The @samp{*} next to the line number is to remind you that
+to a dot. (If the customizable variable
+@code{calc-highlight-selections-with-faces} is non-nil, then the characters
+not part of the sub-formula are de-emphasized by using a less
+noticeable face instead of using dots. @pxref{Displaying Selections}.)
+The @samp{*} next to the line number is to remind you that
 the formula has a portion of it selected.  (In this case, it's very
 obvious, but it might not always be.  If Embedded mode is enabled,
 the word @samp{Sel} also appears in the mode line because the stack
@@ -21726,6 +21730,9 @@ of the hierarchy simply by pointing to it with the cursor.
 @noindent
 @kindex j d
 @pindex calc-show-selections
+@vindex calc-highlight-selections-with-faces
+@vindex calc-selected-face
+@vindex calc-nonselected-face
 The @kbd{j d} (@code{calc-show-selections}) command controls how
 selected sub-formulas are displayed.  One of the alternatives is
 illustrated in the above examples; if we press @kbd{j d} we switch
@@ -21740,6 +21747,13 @@ by @samp{#} signs:
         . . . .                   2 x + 1
 @end group
 @end smallexample
+If the customizable variable
+@code{calc-highlight-selections-with-faces} is non-nil, then the
+non-selected portion of the formula will be de-emphasized by using a
+less noticeable face (@code{calc-nonselected-face}) instead of dots
+and the selected sub-formula will be highlighted by using a more
+noticeable face (@code{calc-selected-face}) instead of @samp{#}
+signs. (@pxref{Customizing Calc}.)
 
 @node Operating on Selections, Rearranging with Selections, Displaying Selections, Selecting Subformulas
 @subsection Operating on Selections
@@ -34911,7 +34925,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's
 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.
@@ -35197,6 +35211,23 @@ should also be added to @code{calc-embedded-announce-formula-alist}
 and @code{calc-embedded-open-close-plain-alist}.
 @end defvar
 
+@defvar calc-highlight-selections-with-faces
+@defvarx calc-selected-face
+@defvarx calc-nonselected-face
+See @ref{Displaying Selections}.@*
+The variable @code{calc-highlight-selections-with-faces} 
+determines how selected sub-formulas are distinguished.
+If @code{calc-highlight-selections-with-faces} is nil, then 
+a selected sub-formula is distinguished either by changing every
+character not part of the sub-formula with a dot or by changing every
+character in the sub-formula with a @samp{#} sign.  
+If @code{calc-highlight-selections-with-faces} is t,
+then a selected sub-formula is distinguished either by displaying the
+non-selected portion of the formula with @code{calc-nonselected-face} 
+or by displaying the selected sub-formula with
+@code{calc-nonselected-face}.
+@end defvar
+
 @defvar calc-multiplication-has-precedence
 The variable @code{calc-multiplication-has-precedence} determines
 whether multiplication has precedence over division in algebraic
diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi
index c1d8db80dae..73ee0e107d3 100644
--- a/doc/misc/cc-mode.texi
+++ b/doc/misc/cc-mode.texi
@@ -312,19 +312,19 @@ Indentation Engine Basics
 
 Syntactic Symbols
 
-* Function Symbols::
-* Class Symbols::
-* Conditional Construct Symbols::
-* Switch Statement Symbols::
-* Brace List Symbols::
-* External Scope Symbols::
-* Paren List Symbols::
-* Literal Symbols::
-* Multiline Macro Symbols::
-* Objective-C Method Symbols::
-* Anonymous Class Symbol::
-* Statement Block Symbols::
-* K&R Symbols::
+* Function Symbols::            
+* Class Symbols::               
+* Conditional Construct Symbols::  
+* Switch Statement Symbols::    
+* Brace List Symbols::          
+* External Scope Symbols::      
+* Paren List Symbols::          
+* Literal Symbols::             
+* Multiline Macro Symbols::     
+* Objective-C Method Symbols::  
+* Java Symbols::
+* Statement Block Symbols::     
+* K&R Symbols::                 
 
 Customizing Indentation
 
@@ -3971,6 +3971,9 @@ The first line in a ``topmost'' definition.  @ref{Function Symbols}.
 Topmost definition continuation lines.  This is only used in the parts
 that aren't covered by other symbols such as @code{func-decl-cont} and
 @code{knr-argdecl}.  @ref{Function Symbols}.
+@item annotation-top-cont
+Topmost definition continuation lines where all previous items are
+annotations.  @ref{Java Symbols}.
 @item member-init-intro
 First line in a member initialization list.  @ref{Class Symbols}.
 @item member-init-cont
@@ -3999,6 +4002,9 @@ with an open brace.  @ref{Brace List Symbols}.
 A statement.  @ref{Function Symbols}.
 @item statement-cont
 A continuation of a statement.  @ref{Function Symbols}.
+@item annotation-var-cont
+A continuation of a statement where all previous items are
+annotations.  @ref{Java Symbols}.
 @item statement-block-intro
 The first line in a new statement block.  @ref{Conditional Construct
 Symbols}.
@@ -4112,23 +4118,23 @@ Symbols}.
 @item inexpr-class
 A class definition inside an expression.  This is used for anonymous
 classes in Java.  It's also used for anonymous array initializers in
-Java.  @ref{Anonymous Class Symbol}.
+Java.  @ref{Java Symbols}.
 @end table
 
 @menu
-* Function Symbols::
-* Class Symbols::
-* Conditional Construct Symbols::
-* Switch Statement Symbols::
-* Brace List Symbols::
-* External Scope Symbols::
-* Paren List Symbols::
-* Literal Symbols::
-* Multiline Macro Symbols::
-* Objective-C Method Symbols::
-* Anonymous Class Symbol::
-* Statement Block Symbols::
-* K&R Symbols::
+* Function Symbols::            
+* Class Symbols::               
+* Conditional Construct Symbols::  
+* Switch Statement Symbols::    
+* Brace List Symbols::          
+* External Scope Symbols::      
+* Paren List Symbols::          
+* Literal Symbols::             
+* Multiline Macro Symbols::     
+* Objective-C Method Symbols::  
+* Java Symbols::
+* Statement Block Symbols::     
+* K&R Symbols::                 
 @end menu
 
 @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -4233,7 +4239,7 @@ Hitting @kbd{C-c C-s} on line 5 shows the following analysis:
 
 @noindent
 The primary syntactic symbol for this line is @code{access-label} as
-this a label keyword that specifies access protection in C++.  However,
+this is a label keyword that specifies access protection in C++.  However,
 because this line is also a top-level construct inside a class
 definition, the analysis actually shows two syntactic symbols.  The
 other syntactic symbol assigned to this line is @code{inclass}.
@@ -4740,7 +4746,7 @@ macros.}.
 @xref{Custom Macros}, for more info about the treatment of macros.
 
 @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-@node    Objective-C Method Symbols, Anonymous Class Symbol, Multiline Macro Symbols, Syntactic Symbols
+@node    Objective-C Method Symbols, Java Symbols, Multiline Macro Symbols, Syntactic Symbols
 @comment node-name, next, previous, up
 @subsection Objective-C Method Symbols
 @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -4767,34 +4773,45 @@ assigned @code{objc-method-args-cont} syntax.  Lines 5 and 6 are both
 assigned @code{objc-method-call-cont} syntax.
 
 @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-@node    Anonymous Class Symbol, Statement Block Symbols, Objective-C Method Symbols, Syntactic Symbols
+@node    Java Symbols, Statement Block Symbols, Objective-C Method Symbols, Syntactic Symbols
 @comment node-name, next, previous, up
-@subsection Anonymous Class Symbol (Java)
+@subsection Java Symbols
 @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 Java has a concept of anonymous classes which can look something like
 this:
 
 @example
- 1: public void watch(Observable o) @{
- 2:     o.addObserver(new Observer() @{
- 3:             public void update(Observable o, Object arg) @{
- 4:                 history.addElement(arg);
- 5:             @}
- 6:         @});
- 7: @}
+ 1:  @@Test
+ 2:  public void watch(Observable o) @{
+ 3:      @@NonNull
+ 4:      Observer obs = new Observer() @{
+ 5:          public void update(Observable o, Object arg) @{
+ 6:              history.addElement(arg);
+ 7:          @}
+ 8:      @};
+ 9:      o.addObserver(obs);
+ 10: @}
 @end example
 
 @ssindex inexpr-class
 The brace following the @code{new} operator opens the anonymous class.
-Lines 3 and 6 are assigned the @code{inexpr-class} syntax, besides the
+Lines 5 and 8 are assigned the @code{inexpr-class} syntax, besides the
 @code{inclass} symbol used in normal classes.  Thus, the class will be
 indented just like a normal class, with the added indentation given to
 @code{inexpr-class}.  An @code{inexpr-class} syntactic element doesn't
 have an anchor position.
 
+@ssindex annotation-top-cont
+@ssindex annotation-var-cont
+Line 2 is assigned the @code{annotation-top-cont} syntax, due to it being a
+continuation of a topmost introduction with an annotation symbol preceding
+the current line.  Similarly, line 4 is assigned the @code{annotation-var-cont}
+syntax due to it being a continuation of a variable declaration where preceding
+the declaration is an annotation.
+
 @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-@node    Statement Block Symbols, K&R Symbols, Anonymous Class Symbol, Syntactic Symbols
+@node    Statement Block Symbols, K&R Symbols, Java Symbols, Syntactic Symbols
 @comment node-name, next, previous, up
 @subsection Statement Block Symbols
 @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
diff --git a/doc/misc/nxml-mode.texi b/doc/misc/nxml-mode.texi
index 593bf92d00a..423bdc85a24 100644
--- a/doc/misc/nxml-mode.texi
+++ b/doc/misc/nxml-mode.texi
@@ -851,11 +851,6 @@ elements. Other usage of DTDs is ignored.
 @item
 The restrictions on RELAX NG schemas in section 7 of the RELAX NG
 specification are not enforced.
-@item
-Unicode support has problems. This stems mostly from the fact that
-the XML (and RELAX NG) character model is based squarely on Unicode,
-whereas the Emacs character model is not.  Emacs 22 is slated to have
-full Unicode support, which should improve the situation here.
 @end itemize
 
 @bye
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index e2d777c5cc2..b9c83be457e 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -3471,7 +3471,7 @@ it has seen so far.
 
 This is a performance degradation, because the lost file attributes
 must be recomputed, when needed again.  In cases the caller of
-@code{process-file} knows that there are file attribute changes, it
+@code{process-file} knows that there are no file attribute changes, it
 shall let-bind the variable @code{process-file-side-effects} to
 @code{nil}.  @value{tramp} wouldn't flush the file attributes cache then.
 
@@ -3479,6 +3479,25 @@ shall let-bind the variable @code{process-file-side-effects} to
 (let (process-file-side-effects)
   ...)
 @end lisp
+
+For asynchronous processes, @value{tramp} flushes the file attributes
+cache via a process sentinel.  If the caller of
+@code{start-file-process} knows that there are no file attribute
+changes, it shall set the process sentinel to @code{nil}.  In case the
+caller defines an own process sentinel, @value{tramp}'s process
+sentinel is overwritten.  The caller can still flush the file
+attributes cache in its process sentinel with this code:
+
+@lisp
+(unless (memq (process-status proc) '(run open))
+  (dired-uncache remote-directory))
+@end lisp
+
+@code{remote-directory} shall be the root directory, where file
+attribute changes can happen during the process lifetime.
+@value{tramp} traverses all subdirectories, starting at this
+directory.  Often, it is sufficient to use @code{default-directory} of
+the process buffer as root directory.
 @end ifset
 
 
@@ -3501,6 +3520,7 @@ The verbosity levels are
 @*@indent @w{ 6}  sent and received strings
 @*@indent @w{ 7}  file caching
 @*@indent @w{ 8}  connection properties
+@*@indent @w{ 9}  test commands
 @*@indent @w{10}  traces (huge)
 
 When @code{tramp-verbose} is greater than or equal to 4, the messages