Fix problems with indexing in User manual

* doc/emacs/basic.texi (Continuation Lines, Inserting Text)
(Moving Point):
* doc/emacs/help.texi (Help Echo, Package Keywords, Help Mode):
* doc/emacs/trouble.texi (Quitting):
* doc/emacs/mark.texi (Setting Mark, Disabled Transient Mark):
* doc/emacs/custom.texi (Modifier Keys, Init Examples)
(Creating Custom Themes):
* doc/emacs/programs.texi (Program Modes, Expressions, Hideshow)
(Basic Indent, Info Lookup, Symbol Completion):
* doc/emacs/screen.texi (Echo Area):
* doc/emacs/xresources.texi (Table of Resources, GTK Names in Emacs):
* doc/emacs/display.texi (Line Truncation, Cursor Display):
* doc/emacs/files.texi (File Names, Backup, File Archives):
* doc/emacs/dired.texi (Operating on Files, Dired Enter):
* doc/emacs/commands.texi (User Input):
* doc/emacs/mule.texi (International, Unibyte Mode)
(International Chars):
* doc/emacs/vc1-xtra.texi (RCS and SCCS, Version Headers)
(CVS Options):
* doc/emacs/modes.texi (Major Modes, Minor Modes):
* doc/emacs/indent.texi (Just Spaces):
* doc/emacs/frames.texi (Mouse Avoidance, Mode Line Mouse)
(Frame Commands):
* doc/emacs/cmdargs.texi (Initial Options):
* doc/emacs/abbrevs.texi (Dabbrev Customization):
* doc/emacs/mini.texi (Completion Example, Completion Commands):
* doc/emacs/calendar.texi (Writing Calendar Files, Calendar Unit Motion)
(From Other Calendar):
* doc/emacs/regs.texi (Text Registers, Bookmarks):
* doc/emacs/buffers.texi (Several Buffers, Select Buffer):
* doc/emacs/maintaining.texi (Xref Commands):
* doc/emacs/windows.texi (Pop Up Window):
* doc/emacs/text.texi (Text, Org Mode):
* doc/emacs/killing.texi (Other Kill Commands):
* doc/emacs/misc.texi (Document View, Gnus Group Buffer)
(Gnus Summary Buffer, Shell Mode):
* doc/emacs/cal-xtra.texi (Sexp Diary Entries): Remove or reword
redundant identical index entries.
* doc/emacs/custom.texi (Mouse Buttons)
* doc/emacs/files.texi (Reverting): Fix hyphenation.
* doc/emacs/emacs.texi (Top): Improve wording of Index menu items.
* doc/emacs/files.texi (File Conveniences):
* doc/emacs/programs.texi (MixedCase Words): Make entries that
belong to Concept Index be indexed with @cindex.  (Bug#29888)

1 files changed, 3 insertions, 3 deletions

diff --git a/doc/emacs/vc1-xtra.texi b/doc/emacs/vc1-xtra.texi
index 00498399c79..1609a953ca0 100644
--- a/doc/emacs/vc1-xtra.texi
+++ b/doc/emacs/vc1-xtra.texi
@@ -236,7 +236,9 @@ relevant information into the version header.
 an exception, when using RCS, Emacs uses the version header, if there
 is one, to determine the file version, since it is often more reliable
 than the RCS master file.  To inhibit using the version header this
-way, change the variable @code{vc-consult-headers} to @code{nil}.
+way, change the variable @code{vc-consult-headers} to @code{nil}.  VC
+then always uses the file permissions (if it is supposed to trust
+them), or else checks the master file.
 
 @findex vc-insert-headers
 @vindex vc-@var{backend}-header
@@ -340,7 +342,6 @@ the master file can only tell you @emph{if} there's any lock on the
 file, but not whether your work file really contains that locked
 version.
 
-@vindex vc-consult-headers
   You can tell VC not to use version headers to determine the file
 status by setting @code{vc-consult-headers} to @code{nil}.  VC then
 always uses the file permissions (if it is supposed to trust them), or
@@ -359,7 +360,6 @@ operations in the variable @code{vc-cvs-global-switches}.  These
 switches are inserted immediately after the @code{cvs} command, before
 the name of the operation to invoke.
 
-@vindex vc-stay-local
 @vindex vc-cvs-stay-local
 @cindex remote repositories (CVS)
   When using a CVS repository on a remote machine, VC can try keeping