; Merge from origin/emacs-25

[gnu-emacs] / doc / emacs / vc-xtra.texi

diff --git a/doc/emacs/vc-xtra.texi b/doc/emacs/vc-xtra.texi
index f1977d2adb62c2ca11ac8f45dd94938c5e0f6c01..abd29fd6579b0d24ccdadec5e751470925093934 100644 (file)
--- a/doc/emacs/vc-xtra.texi
+++ b/doc/emacs/vc-xtra.texi
@@ -1,5 +1,5 @@
 @c This is part of the Emacs manual.
-@c Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+@c Copyright (C) 2004-2016 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @c
 @c This file is included in emacs-xtra.texi when producing the printed
@@ -8,15 +8,13 @@
 @node Advanced VC Usage
 @section Advanced VC Usage
 
-  Commonly used features of Emacs' version control (VC) support are
+  Commonly used features of Emacs's version control (VC) support are
 described in the main Emacs manual (@pxref{Version Control,,,emacs,
 the Emacs Manual}).  This chapter describes more advanced VC usage.
 
 @menu
-* VC Directory Mode::       Listing files managed by version control.
-* VC Directory Commands:: Commands to use in a VC Dired buffer.
 * Remote Repositories::     Efficient access to remote VCS servers.
-* Revision Tags::           Symbolic names for revisions
+* Revision Tags::           Symbolic names for revisions.
 * Miscellaneous VC::        Various other commands and features of VC.
 * Customizing VC::          Variables that change VC's behavior.
 @end menu
@@ -24,9 +22,4 @@ the Emacs Manual}).  This chapter describes more advanced VC usage.
 
 @iftex
 @include vc1-xtra.texi
-@include vc2-xtra.texi
 @end iftex
-
-@ignore
-   arch-tag: 11a18d0e-1baf-49da-8e38-f61195ae4dc3
-@end ignore