; 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 fe6ab3bf539409fc445c561df237021e55f93830..abd29fd6579b0d24ccdadec5e751470925093934 100644 (file)
--- a/doc/emacs/vc-xtra.texi
+++ b/doc/emacs/vc-xtra.texi
@@ -1,6 +1,5 @@
 @c This is part of the Emacs manual.
-@c Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009
-@c   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
@@ -9,7 +8,7 @@
 @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.
 
@@ -24,7 +23,3 @@ the Emacs Manual}).  This chapter describes more advanced VC usage.
 @iftex
 @include vc1-xtra.texi
 @end iftex
-
-@ignore
-   arch-tag: 11a18d0e-1baf-49da-8e38-f61195ae4dc3
-@end ignore