summaryrefslogtreecommitdiff
path: root/doc/emacs/emacs.texi
diff options
context:
space:
mode:
Diffstat (limited to 'doc/emacs/emacs.texi')
-rw-r--r--doc/emacs/emacs.texi5
1 files changed, 2 insertions, 3 deletions
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index caec373938d..21f645e1570 100644
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -2,6 +2,7 @@
@setfilename ../../info/emacs.info
@settitle GNU Emacs Manual
+@include docstyle.texi
@c The edition number appears in more than one place in this file
@c I don't really know what it means...
@@ -44,8 +45,6 @@ developing GNU and promoting software freedom.''
@end quotation
@end copying
-@documentencoding UTF-8
-
@dircategory Emacs
@direntry
* Emacs: (emacs). The extensible self-documenting text editor.
@@ -832,7 +831,7 @@ VC Directory Mode
Version Control Branches
* Switching Branches:: How to get to another existing branch.
-* VC Pull:: Updating the contents of a branch.
+* Pulling / Pushing:: Receiving/sending changes from/to elsewhere.
* Merging:: Transferring changes between branches.
* Creating Branches:: How to start a new branch.