summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/emacs/Makefile.in1
-rw-r--r--doc/emacs/docstyle.texi4
-rw-r--r--doc/emacs/emacs-xtra.texi3
-rw-r--r--doc/emacs/emacs.texi3
-rw-r--r--doc/lispintro/Makefile.in4
-rw-r--r--doc/lispintro/emacs-lisp-intro.texi2
-rw-r--r--doc/lispref/Makefile.in3
-rw-r--r--doc/lispref/back.texi2
-rw-r--r--doc/lispref/book-spine.texi2
-rw-r--r--doc/lispref/elisp.texi3
-rw-r--r--doc/lispref/lay-flat.texi2
-rw-r--r--doc/misc/Makefile.in18
-rw-r--r--doc/misc/ada-mode.texi2
-rw-r--r--doc/misc/auth.texi2
-rw-r--r--doc/misc/autotype.texi2
-rw-r--r--doc/misc/bovine.texi2
-rw-r--r--doc/misc/calc.texi2
-rw-r--r--doc/misc/cc-mode.texi2
-rw-r--r--doc/misc/cl.texi2
-rw-r--r--doc/misc/dbus.texi2
-rw-r--r--doc/misc/dired-x.texi2
-rw-r--r--doc/misc/ebrowse.texi2
-rw-r--r--doc/misc/ede.texi2
-rw-r--r--doc/misc/ediff.texi2
-rw-r--r--doc/misc/edt.texi2
-rw-r--r--doc/misc/efaq-w32.texi4
-rw-r--r--doc/misc/efaq.texi2
-rw-r--r--doc/misc/eieio.texi2
-rw-r--r--doc/misc/emacs-gnutls.texi2
-rw-r--r--doc/misc/emacs-mime.texi2
-rw-r--r--doc/misc/epa.texi2
-rw-r--r--doc/misc/erc.texi2
-rw-r--r--doc/misc/ert.texi2
-rw-r--r--doc/misc/eshell.texi2
-rw-r--r--doc/misc/eudc.texi2
-rw-r--r--doc/misc/eww.texi2
-rw-r--r--doc/misc/flymake.texi2
-rw-r--r--doc/misc/forms.texi2
-rw-r--r--doc/misc/gnus-coding.texi2
-rw-r--r--doc/misc/gnus-faq.texi2
-rw-r--r--doc/misc/gnus.texi3
-rw-r--r--doc/misc/htmlfontify.texi2
-rw-r--r--doc/misc/idlwave.texi2
-rw-r--r--doc/misc/ido.texi2
-rw-r--r--doc/misc/info.texi2
-rw-r--r--doc/misc/mairix-el.texi3
-rw-r--r--doc/misc/message.texi2
-rw-r--r--doc/misc/mh-e.texi2
-rw-r--r--doc/misc/newsticker.texi2
-rw-r--r--doc/misc/nxml-mode.texi2
-rw-r--r--doc/misc/octave-mode.texi2
-rw-r--r--doc/misc/org.texi2
-rw-r--r--doc/misc/pcl-cvs.texi2
-rw-r--r--doc/misc/pgg.texi3
-rw-r--r--doc/misc/rcirc.texi2
-rw-r--r--doc/misc/reftex.texi2
-rw-r--r--doc/misc/remember.texi2
-rw-r--r--doc/misc/sasl.texi3
-rw-r--r--doc/misc/sc.texi2
-rw-r--r--doc/misc/semantic.texi2
-rw-r--r--doc/misc/ses.texi2
-rw-r--r--doc/misc/sieve.texi2
-rw-r--r--doc/misc/smtpmail.texi2
-rw-r--r--doc/misc/speedbar.texi2
-rw-r--r--doc/misc/srecode.texi2
-rw-r--r--doc/misc/todo-mode.texi2
-rw-r--r--doc/misc/tramp.texi2
-rw-r--r--doc/misc/url.texi3
-rw-r--r--doc/misc/vhdl-mode.texi2
-rw-r--r--doc/misc/vip.texi3
-rw-r--r--doc/misc/viper.texi3
-rw-r--r--doc/misc/widget.texi2
-rw-r--r--doc/misc/wisent.texi2
-rw-r--r--doc/misc/woman.texi2
74 files changed, 88 insertions, 92 deletions
diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in
index 9932348ba67..7630780be6c 100644
--- a/doc/emacs/Makefile.in
+++ b/doc/emacs/Makefile.in
@@ -94,6 +94,7 @@ EMACS_XTRA= \
$(srcdir)/arevert-xtra.texi \
$(srcdir)/cal-xtra.texi \
$(srcdir)/dired-xtra.texi \
+ ${srcdir}/docstyle.texi \
$(srcdir)/picture-xtra.texi \
$(srcdir)/emerge-xtra.texi \
$(srcdir)/vc-xtra.texi \
diff --git a/doc/emacs/docstyle.texi b/doc/emacs/docstyle.texi
new file mode 100644
index 00000000000..f13b3ca88f4
--- /dev/null
+++ b/doc/emacs/docstyle.texi
@@ -0,0 +1,4 @@
+@c Emacs documentation style settings
+@documentencoding UTF-8
+@codequotebacktick on
+@codequoteundirected on
diff --git a/doc/emacs/emacs-xtra.texi b/doc/emacs/emacs-xtra.texi
index fcedf7308a8..3490c08d275 100644
--- a/doc/emacs/emacs-xtra.texi
+++ b/doc/emacs/emacs-xtra.texi
@@ -2,6 +2,7 @@
@comment %**start of header
@setfilename ../../info/emacs-xtra.info
@settitle Specialized Emacs Features
+@include docstyle.texi
@c Merge all functions, variables, and keys into the concept index.
@syncodeindex fn cp
@syncodeindex vr cp
@@ -26,8 +27,6 @@ modify this GNU manual.''
@end quotation
@end copying
-@documentencoding UTF-8
-
@dircategory Emacs
@direntry
* Emacs-Xtra: (emacs-xtra). Specialized Emacs features.
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index caec373938d..30c35a05125 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.
diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in
index ba63ee80197..d1a696ce2c2 100644
--- a/doc/lispintro/Makefile.in
+++ b/doc/lispintro/Makefile.in
@@ -24,7 +24,7 @@ srcdir = @srcdir@
buildinfodir = $(srcdir)/../../info
# Directory with the (customized) texinfo.tex file.
texinfodir = $(srcdir)/../misc
-# Directory with emacsver.texi.
+# Directory with docstyle.texi and emacsver.texi.
emacsdir = $(srcdir)/../emacs
prefix = @prefix@
@@ -73,7 +73,7 @@ PDF_TARGETS = emacs-lisp-intro.pdf
PS_TARGETS = emacs-lisp-intro.ps
srcs = ${srcdir}/emacs-lisp-intro.texi ${srcdir}/doclicense.texi \
- ${emacsdir}/emacsver.texi
+ ${emacsdir}/docstyle.texi ${emacsdir}/emacsver.texi
## Disable implicit rules.
%.texi: ;
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index 46dc41a5a65..83d6022c0a6 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -4,7 +4,7 @@
@c setfilename emacs-lisp-intro.info
@c sethtmlfilename emacs-lisp-intro.html
@settitle Programming in Emacs Lisp
-@documentencoding UTF-8
+@include docstyle.texi
@syncodeindex vr cp
@syncodeindex fn cp
@finalout
diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in
index 4c62c703462..94759173dd6 100644
--- a/doc/lispref/Makefile.in
+++ b/doc/lispref/Makefile.in
@@ -28,7 +28,7 @@ srcdir = @srcdir@
buildinfodir = $(srcdir)/../../info
# Directory with the (customized) texinfo.tex file.
texinfodir = $(srcdir)/../misc
-# Directory with emacsver.texi.
+# Directory with docstyle.tex and emacsver.texi.
emacsdir = $(srcdir)/../emacs
prefix = @prefix@
@@ -80,6 +80,7 @@ PS_TARGETS = elisp.ps
srcs = \
$(srcdir)/elisp.texi \
+ $(emacsdir)/docstyle.texi \
$(emacsdir)/emacsver.texi \
$(srcdir)/abbrevs.texi \
$(srcdir)/anti.texi \
diff --git a/doc/lispref/back.texi b/doc/lispref/back.texi
index 5edfb671773..3433277ca0f 100644
--- a/doc/lispref/back.texi
+++ b/doc/lispref/back.texi
@@ -6,7 +6,7 @@
@c %**start of header
@setfilename back-cover
@settitle GNU Emacs Lisp Reference Manual
-@documentencoding UTF-8
+@include docstyle.texi
@c %**end of header
.
@sp 7
diff --git a/doc/lispref/book-spine.texi b/doc/lispref/book-spine.texi
index f58fb77dcc1..8c6381f3d81 100644
--- a/doc/lispref/book-spine.texi
+++ b/doc/lispref/book-spine.texi
@@ -2,7 +2,7 @@
@c %**start of header
@setfilename book-spine
@settitle book-spine
-@documentencoding UTF-8
+@include docstyle.texi
@c %**end of header
@include emacsver.texi
diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi
index bf1fc4db173..a32c69c1c2f 100644
--- a/doc/lispref/elisp.texi
+++ b/doc/lispref/elisp.texi
@@ -18,6 +18,7 @@
@ifclear volflag
@settitle GNU Emacs Lisp Reference Manual
@end ifclear
+@include docstyle.texi
@c %**end of header
@@ -115,8 +116,6 @@ developing GNU and promoting software freedom.''
@end quotation
@end copying
-@documentencoding UTF-8
-
@dircategory Emacs lisp
@direntry
* Elisp: (elisp). The Emacs Lisp Reference Manual.
diff --git a/doc/lispref/lay-flat.texi b/doc/lispref/lay-flat.texi
index 81755b6227f..947beeca23c 100644
--- a/doc/lispref/lay-flat.texi
+++ b/doc/lispref/lay-flat.texi
@@ -6,8 +6,8 @@
@comment %**start of header
@setfilename inner-covers.info
@settitle Inner Covers
+@include docstyle.texi
@smallbook
-@documentencoding UTF-8
@comment %**end of header
@headings off
diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index 1f21f829380..aa35002e85e 100644
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -29,7 +29,7 @@ srcdir=@srcdir@
## In a tarfile of Emacs, the Info files should be up to date.
buildinfodir = $(srcdir)/../../info
-## Directory with emacsver.texi.
+## Directory with docstyle.texi and emacsver.texi.
emacsdir = $(srcdir)/../emacs
prefix = @prefix@
@@ -108,6 +108,7 @@ ENVADD = $(AM_V_GEN)TEXINPUTS="$(srcdir):$(emacsdir):$(TEXINPUTS)" \
MAKEINFO="$(MAKEINFO) $(MAKEINFO_OPTS)"
gfdl = ${srcdir}/doclicense.texi
+style = ${emacsdir}/docstyle.texi
.PHONY: info dvi html pdf ps echo-info $(INFO_TARGETS)
## Prevent implicit rule triggering for foo.info.
@@ -140,7 +141,7 @@ ${buildinfodir}:
EXTRA_OPTS =
-${buildinfodir}/%.info: ${srcdir}/%.texi ${gfdl} | ${buildinfodir}
+${buildinfodir}/%.info: ${srcdir}/%.texi ${gfdl} ${style} | ${buildinfodir}
$(AM_V_GEN)$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) $(EXTRA_OPTS) \
-o $@ $<
@@ -155,13 +156,13 @@ info.info: $(buildinfodir)/info.info
$(foreach ifile,$(filter-out info.info,$(INFO_TARGETS)),$(eval $(call info_template,$(ifile))))
-%.dvi: ${srcdir}/%.texi ${gfdl}
+%.dvi: ${srcdir}/%.texi ${gfdl} ${style}
$(ENVADD) $(TEXI2DVI) $<
-%.pdf: ${srcdir}/%.texi ${gfdl}
+%.pdf: ${srcdir}/%.texi ${gfdl} ${style}
$(ENVADD) $(TEXI2PDF) $<
-%.html: ${srcdir}/%.texi ${gfdl}
+%.html: ${srcdir}/%.texi ${gfdl} ${style}
$(AM_V_GEN)$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) $(EXTRA_OPTS) \
-o $@ $<
@@ -184,12 +185,13 @@ $(buildinfodir)/semantic.info semantic.dvi semantic.pdf semantic.html: ${srcdir}
## Please can we just rename cc-mode.texi to ccmode.texi...
-${buildinfodir}/ccmode.info: ${srcdir}/cc-mode.texi ${gfdl} | ${buildinfodir}
+${buildinfodir}/ccmode.info: \
+ ${srcdir}/cc-mode.texi ${gfdl} ${style} | ${buildinfodir}
$(AM_V_GEN)$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $<
## efaq, efaq_w32 do not depend on gfdl.
## Maybe we can use .SECONDEXPANSION for this.
-${buildinfodir}/efaq%.info: ${srcdir}/efaq%.texi | ${buildinfodir}
+${buildinfodir}/efaq%.info: ${srcdir}/efaq%.texi ${style} | ${buildinfodir}
$(AM_V_GEN)$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $<
efaq%.dvi: ${srcdir}/efaq%.texi
@@ -203,7 +205,7 @@ efaq%.html: ${srcdir}/efaq%.texi
${buildinfodir}/emacs-mime.info emacs-mime.html: EXTRA_OPTS = --enable-encoding
-gnus_deps = ${srcdir}/gnus.texi ${srcdir}/gnus-faq.texi ${gfdl}
+gnus_deps = ${srcdir}/gnus.texi ${srcdir}/gnus-faq.texi ${gfdl} ${style}
gnus.dvi: $(gnus_deps)
sed -e '/@iflatex/,/@end iflatex/d' $< > gnustmpdvi.texi
$(ENVADD) $(TEXI2DVI) gnustmpdvi.texi
diff --git a/doc/misc/ada-mode.texi b/doc/misc/ada-mode.texi
index 539e2b23fcb..e84ef6eb512 100644
--- a/doc/misc/ada-mode.texi
+++ b/doc/misc/ada-mode.texi
@@ -1,7 +1,7 @@
\input texinfo @c -*-texinfo-*-
@setfilename ../../info/ada-mode.info
@settitle Ada Mode
-@documentencoding UTF-8
+@include docstyle.texi
@copying
Copyright @copyright{} 1999--2015 Free Software Foundation, Inc.
diff --git a/doc/misc/auth.texi b/doc/misc/auth.texi
index 177f7ccada0..082dc1dacdf 100644
--- a/doc/misc/auth.texi
+++ b/doc/misc/auth.texi
@@ -6,7 +6,7 @@
@setfilename ../../info/auth.info
@settitle Emacs auth-source Library @value{VERSION}
-@documentencoding UTF-8
+@include docstyle.texi
@copying
This file describes the Emacs auth-source library.
diff --git a/doc/misc/autotype.texi b/doc/misc/autotype.texi
index 51880d8afe9..acc98ed2a1b 100644
--- a/doc/misc/autotype.texi
+++ b/doc/misc/autotype.texi
@@ -5,7 +5,7 @@
@c @node Autotypist, Picture, Abbrevs, Top
@c @chapter Features for Automatic Typing
@settitle Features for Automatic Typing
-@documentencoding UTF-8
+@include docstyle.texi
@c @cindex text
@c @cindex selfinserting text
@c @cindex autotypist
diff --git a/doc/misc/bovine.texi b/doc/misc/bovine.texi
index cd2e7365f25..ec11aa896ff 100644
--- a/doc/misc/bovine.texi
+++ b/doc/misc/bovine.texi
@@ -4,7 +4,7 @@
@set TITLE Bovine parser development
@set AUTHOR Eric M. Ludlam, David Ponce, and Richard Y. Kim
@settitle @value{TITLE}
-@documentencoding UTF-8
+@include docstyle.texi
@c *************************************************************************
@c @ Header
diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index 84eb274bb49..f6f7cd26ed1 100644
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -4,7 +4,7 @@
@setfilename ../../info/calc.info
@c [title]
@settitle GNU Emacs Calc Manual
-@documentencoding UTF-8
+@include docstyle.texi
@setchapternewpage odd
@comment %**end of header (This is for running Texinfo on a region.)
diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi
index b86df189bd8..5ad29cd79ad 100644
--- a/doc/misc/cc-mode.texi
+++ b/doc/misc/cc-mode.texi
@@ -83,7 +83,7 @@ the second with them pointing to the XEmacs manuals.
@setfilename ../../info/ccmode.info
@settitle CC Mode Manual
-@documentencoding UTF-8
+@include docstyle.texi
@footnotestyle end
@c The following four macros generate the filenames and titles of the
diff --git a/doc/misc/cl.texi b/doc/misc/cl.texi
index 00e47b9f742..d7b3f4a0a68 100644
--- a/doc/misc/cl.texi
+++ b/doc/misc/cl.texi
@@ -1,7 +1,7 @@
\input texinfo @c -*-texinfo-*-
@setfilename ../../info/cl.info
@settitle Common Lisp Extensions
-@documentencoding UTF-8
+@include docstyle.texi
@include emacsver.texi
@copying
diff --git a/doc/misc/dbus.texi b/doc/misc/dbus.texi
index da18236bcf5..5dd8bf21c13 100644
--- a/doc/misc/dbus.texi
+++ b/doc/misc/dbus.texi
@@ -2,7 +2,7 @@
@setfilename ../../info/dbus.info
@c %**start of header
@settitle Using of D-Bus
-@documentencoding UTF-8
+@include docstyle.texi
@c @setchapternewpage odd
@c %**end of header
diff --git a/doc/misc/dired-x.texi b/doc/misc/dired-x.texi
index 90fb5119511..e6370f3d80b 100644
--- a/doc/misc/dired-x.texi
+++ b/doc/misc/dired-x.texi
@@ -9,7 +9,7 @@
@comment %**start of header (This is for running Texinfo on a region.)
@setfilename ../../info/dired-x.info
@settitle Dired Extra User's Manual
-@documentencoding UTF-8
+@include docstyle.texi
@include emacsver.texi
diff --git a/doc/misc/ebrowse.texi b/doc/misc/ebrowse.texi
index 1b240079b70..74183a4d6a8 100644
--- a/doc/misc/ebrowse.texi
+++ b/doc/misc/ebrowse.texi
@@ -3,7 +3,7 @@
@comment %**start of header
@setfilename ../../info/ebrowse.info
@settitle A Class Browser for C++
-@documentencoding UTF-8
+@include docstyle.texi
@setchapternewpage odd
@syncodeindex fn cp
@comment %**end of header
diff --git a/doc/misc/ede.texi b/doc/misc/ede.texi
index dfe22b7b054..7a824acfed5 100644
--- a/doc/misc/ede.texi
+++ b/doc/misc/ede.texi
@@ -1,7 +1,7 @@
\input texinfo
@setfilename ../../info/ede.info
@settitle Emacs Development Environment
-@documentencoding UTF-8
+@include docstyle.texi
@copying
This file describes EDE, the Emacs Development Environment.
diff --git a/doc/misc/ediff.texi b/doc/misc/ediff.texi
index de54f288146..bac06f89134 100644
--- a/doc/misc/ediff.texi
+++ b/doc/misc/ediff.texi
@@ -10,7 +10,7 @@
@setfilename ../../info/ediff.info
@settitle Ediff User's Manual
-@documentencoding UTF-8
+@include docstyle.texi
@synindex vr cp
@synindex fn cp
@synindex pg cp
diff --git a/doc/misc/edt.texi b/doc/misc/edt.texi
index c72aca27ef9..91f36e6c538 100644
--- a/doc/misc/edt.texi
+++ b/doc/misc/edt.texi
@@ -1,7 +1,7 @@
\input texinfo
@setfilename ../../info/edt.info
@settitle EDT Emulation for Emacs
-@documentencoding UTF-8
+@include docstyle.texi
@copying
This file documents the EDT emulation package for Emacs.
diff --git a/doc/misc/efaq-w32.texi b/doc/misc/efaq-w32.texi
index 566a6d75886..f8a188dba6b 100644
--- a/doc/misc/efaq-w32.texi
+++ b/doc/misc/efaq-w32.texi
@@ -1,6 +1,7 @@
\input texinfo @c -*-coding:utf-8 -*-
@setfilename ../../info/efaq-w32.info
@settitle GNU Emacs FAQ For MS Windows
+@include docstyle.texi
@setchapternewpage odd
@syncodeindex pg cp
@syncodeindex ky cp
@@ -13,9 +14,6 @@ Answers to Frequently asked Questions about using Emacs on Microsoft Windows.
@include emacsver.texi
-@documentencoding utf-8
-@documentlanguage en
-
@copying
Copyright @copyright{} 2008, 2010-2015 Free Software Foundation, Inc.
diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi
index 9fc8cfcd33c..3e9109d0924 100644
--- a/doc/misc/efaq.texi
+++ b/doc/misc/efaq.texi
@@ -2,7 +2,7 @@
@c %**start of header
@setfilename ../../info/efaq.info
@settitle GNU Emacs FAQ
-@documentencoding UTF-8
+@include docstyle.texi
@c %**end of header
@include emacsver.texi
diff --git a/doc/misc/eieio.texi b/doc/misc/eieio.texi
index 5d1a8cf0702..fb4e1470016 100644
--- a/doc/misc/eieio.texi
+++ b/doc/misc/eieio.texi
@@ -3,7 +3,7 @@
@set TITLE Enhanced Implementation of Emacs Interpreted Objects
@set AUTHOR Eric M. Ludlam
@settitle @value{TITLE}
-@documentencoding UTF-8
+@include docstyle.texi
@c *************************************************************************
@c @ Header
diff --git a/doc/misc/emacs-gnutls.texi b/doc/misc/emacs-gnutls.texi
index 25bb9d05f3e..4f6ef010ef3 100644
--- a/doc/misc/emacs-gnutls.texi
+++ b/doc/misc/emacs-gnutls.texi
@@ -4,7 +4,7 @@
@setfilename ../../info/emacs-gnutls.info
@settitle Emacs GnuTLS Integration @value{VERSION}
-@documentencoding UTF-8
+@include docstyle.texi
@copying
This file describes the Emacs GnuTLS integration.
diff --git a/doc/misc/emacs-mime.texi b/doc/misc/emacs-mime.texi
index 0147db34fff..3b3df0fa879 100644
--- a/doc/misc/emacs-mime.texi
+++ b/doc/misc/emacs-mime.texi
@@ -4,6 +4,7 @@
@setfilename ../../info/emacs-mime.info
@settitle Emacs MIME Manual
+@include docstyle.texi
@synindex fn cp
@synindex vr cp
@synindex pg cp
@@ -27,7 +28,6 @@ modify this GNU manual.''
@end copying
@c Node ``Interface Functions'' uses non-ASCII characters
-@documentencoding UTF-8
@dircategory Emacs lisp libraries
@direntry
diff --git a/doc/misc/epa.texi b/doc/misc/epa.texi
index 8de8604634a..6830ba7d220 100644
--- a/doc/misc/epa.texi
+++ b/doc/misc/epa.texi
@@ -2,7 +2,7 @@
@c %**start of header
@setfilename ../../info/epa.info
@settitle EasyPG Assistant User's Manual
-@documentencoding UTF-8
+@include docstyle.texi
@c %**end of header
@set VERSION 1.0.0
diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi
index 9cdfe7702e5..9e570da3d1d 100644
--- a/doc/misc/erc.texi
+++ b/doc/misc/erc.texi
@@ -2,9 +2,9 @@
@c %**start of header
@setfilename ../../info/erc.info
@settitle ERC Manual
+@include docstyle.texi
@syncodeindex fn cp
@include emacsver.texi
-@documentencoding UTF-8
@c %**end of header
@copying
diff --git a/doc/misc/ert.texi b/doc/misc/ert.texi
index 710ebbba454..3192e4bdc0a 100644
--- a/doc/misc/ert.texi
+++ b/doc/misc/ert.texi
@@ -2,7 +2,7 @@
@c %**start of header
@setfilename ../../info/ert.info
@settitle Emacs Lisp Regression Testing
-@documentencoding UTF-8
+@include docstyle.texi
@c %**end of header
@dircategory Emacs misc features
diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi
index b2fbd7ac267..60a1af0678d 100644
--- a/doc/misc/eshell.texi
+++ b/doc/misc/eshell.texi
@@ -2,9 +2,9 @@
@c %**start of header
@setfilename ../../info/eshell.info
@settitle Eshell: The Emacs Shell
+@include docstyle.texi
@defindex cm
@synindex vr fn
-@documentencoding UTF-8
@c %**end of header
@copying
diff --git a/doc/misc/eudc.texi b/doc/misc/eudc.texi
index 064f5705777..33c9a0eb3a9 100644
--- a/doc/misc/eudc.texi
+++ b/doc/misc/eudc.texi
@@ -2,8 +2,8 @@
@c %**start of header
@setfilename ../../info/eudc.info
@settitle Emacs Unified Directory Client (EUDC) Manual
+@include docstyle.texi
@afourpaper
-@documentencoding UTF-8
@syncodeindex fn cp
@syncodeindex vr cp
@c %**end of header
diff --git a/doc/misc/eww.texi b/doc/misc/eww.texi
index c7f84b5d4f0..f1347b7b3bb 100644
--- a/doc/misc/eww.texi
+++ b/doc/misc/eww.texi
@@ -2,7 +2,7 @@
@c %**start of header
@setfilename ../../info/eww.info
@settitle Emacs Web Wowser
-@documentencoding UTF-8
+@include docstyle.texi
@c %**end of header
@copying
diff --git a/doc/misc/flymake.texi b/doc/misc/flymake.texi
index 31fa1ab26a9..6c924cf9547 100644
--- a/doc/misc/flymake.texi
+++ b/doc/misc/flymake.texi
@@ -4,8 +4,8 @@
@set VERSION 0.3
@set UPDATED April 2004
@settitle GNU Flymake @value{VERSION}
+@include docstyle.texi
@syncodeindex pg cp
-@documentencoding UTF-8
@comment %**end of header
@copying
diff --git a/doc/misc/forms.texi b/doc/misc/forms.texi
index ab284bd99bc..487cebd6cc2 100644
--- a/doc/misc/forms.texi
+++ b/doc/misc/forms.texi
@@ -5,6 +5,7 @@
@comment %**start of header (This is for running Texinfo on a region.)
@setfilename ../../info/forms.info
@settitle Forms Mode User's Manual
+@include docstyle.texi
@syncodeindex vr cp
@syncodeindex fn cp
@syncodeindex ky cp
@@ -14,7 +15,6 @@
@end iftex
@c @smallbook
@comment %**end of header (This is for running Texinfo on a region.)
-@documentencoding UTF-8
@copying
This file documents Forms mode, a form-editing major mode for GNU Emacs.
diff --git a/doc/misc/gnus-coding.texi b/doc/misc/gnus-coding.texi
index bbead6b085b..a3be0edb965 100644
--- a/doc/misc/gnus-coding.texi
+++ b/doc/misc/gnus-coding.texi
@@ -2,7 +2,7 @@
@setfilename gnus-coding.info
@settitle Gnus Coding Style and Maintenance Guide
-@documentencoding UTF-8
+@include docstyle.texi
@syncodeindex fn cp
@syncodeindex vr cp
@syncodeindex pg cp
diff --git a/doc/misc/gnus-faq.texi b/doc/misc/gnus-faq.texi
index 8126827ffbd..76d1a5275e5 100644
--- a/doc/misc/gnus-faq.texi
+++ b/doc/misc/gnus-faq.texi
@@ -5,7 +5,7 @@
@c
@c @setfilename gnus-faq.info
@c @settitle Frequently Asked Questions
-@c @documentencoding UTF-8
+@c @include docstyle.texi
@c %**end of header
@c
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 97e56e19cc0..ef3691e616a 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -4,12 +4,11 @@
@setfilename ../../info/gnus.info
@settitle Gnus Manual
+@include docstyle.texi
@syncodeindex fn cp
@syncodeindex vr cp
@syncodeindex pg cp
-@documentencoding UTF-8
-
@copying
Copyright @copyright{} 1995--2015 Free Software Foundation, Inc.
diff --git a/doc/misc/htmlfontify.texi b/doc/misc/htmlfontify.texi
index 8140b43e783..b14f2d3b8fd 100644
--- a/doc/misc/htmlfontify.texi
+++ b/doc/misc/htmlfontify.texi
@@ -2,8 +2,8 @@
@comment %**start of header
@setfilename ../../info/htmlfontify.info
@settitle Htmlfontify User Manual
+@include docstyle.texi
@exampleindent 2
-@documentencoding UTF-8
@comment %**end of header
@copying
diff --git a/doc/misc/idlwave.texi b/doc/misc/idlwave.texi
index ca449e44d0f..7fe8f51d986 100644
--- a/doc/misc/idlwave.texi
+++ b/doc/misc/idlwave.texi
@@ -2,6 +2,7 @@
@c %**start of header
@setfilename ../../info/idlwave.info
@settitle IDLWAVE User Manual
+@include docstyle.texi
@synindex ky cp
@syncodeindex vr cp
@syncodeindex fn cp
@@ -12,7 +13,6 @@
@set DATE April, 2007
@set AUTHOR J.D. Smith & Carsten Dominik
@set MAINTAINER J.D. Smith
-@documentencoding UTF-8
@c %**end of header
@finalout
diff --git a/doc/misc/ido.texi b/doc/misc/ido.texi
index a80620f681f..afc323888c3 100644
--- a/doc/misc/ido.texi
+++ b/doc/misc/ido.texi
@@ -1,7 +1,7 @@
\input texinfo @c -*-texinfo-*-
@setfilename ../../info/ido.info
@settitle Interactive Do
-@documentencoding UTF-8
+@include docstyle.texi
@include emacsver.texi
@copying
diff --git a/doc/misc/info.texi b/doc/misc/info.texi
index 7337b467156..1439d30ccee 100644
--- a/doc/misc/info.texi
+++ b/doc/misc/info.texi
@@ -5,10 +5,10 @@
@comment %**start of header
@setfilename info.info
@settitle Info
+@include docstyle.texi
@syncodeindex fn cp
@syncodeindex vr cp
@syncodeindex ky cp
-@documentencoding UTF-8
@comment %**end of header
@copying
diff --git a/doc/misc/mairix-el.texi b/doc/misc/mairix-el.texi
index 16f490270fd..ef253a0138c 100644
--- a/doc/misc/mairix-el.texi
+++ b/doc/misc/mairix-el.texi
@@ -2,8 +2,7 @@
@setfilename ../../info/mairix-el.info
@settitle Emacs Interface for Mairix
-
-@documentencoding UTF-8
+@include docstyle.texi
@copying
Copyright @copyright{} 2008--2015 Free Software Foundation, Inc.
diff --git a/doc/misc/message.texi b/doc/misc/message.texi
index 884d8299921..d63f7e6a8f6 100644
--- a/doc/misc/message.texi
+++ b/doc/misc/message.texi
@@ -4,7 +4,7 @@
@setfilename ../../info/message.info
@settitle Message Manual
-@documentencoding UTF-8
+@include docstyle.texi
@synindex fn cp
@synindex vr cp
@synindex pg cp
diff --git a/doc/misc/mh-e.texi b/doc/misc/mh-e.texi
index fc2303c60e1..8406a80b3d7 100644
--- a/doc/misc/mh-e.texi
+++ b/doc/misc/mh-e.texi
@@ -5,7 +5,7 @@
@c %**start of header
@setfilename ../../info/mh-e.info
@settitle The MH-E Manual
-@documentencoding UTF-8
+@include docstyle.texi
@c %**end of header
@c Version of the software and manual.
diff --git a/doc/misc/newsticker.texi b/doc/misc/newsticker.texi
index dfabb9290dd..9f7b6df1ab5 100644
--- a/doc/misc/newsticker.texi
+++ b/doc/misc/newsticker.texi
@@ -4,10 +4,10 @@
@include emacsver.texi
@set VERSION @value{EMACSVER}
@settitle Newsticker @value{VERSION}
+@include docstyle.texi
@syncodeindex vr cp
@syncodeindex fn cp
@syncodeindex pg cp
-@documentencoding UTF-8
@comment %**end of header
@copying
diff --git a/doc/misc/nxml-mode.texi b/doc/misc/nxml-mode.texi
index d213355b877..e87e6a05619 100644
--- a/doc/misc/nxml-mode.texi
+++ b/doc/misc/nxml-mode.texi
@@ -2,7 +2,7 @@
@c %**start of header
@setfilename ../../info/nxml-mode.info
@settitle nXML Mode
-@documentencoding UTF-8
+@include docstyle.texi
@c %**end of header
@copying
diff --git a/doc/misc/octave-mode.texi b/doc/misc/octave-mode.texi
index 3199ec4d146..34499c2d58c 100644
--- a/doc/misc/octave-mode.texi
+++ b/doc/misc/octave-mode.texi
@@ -2,7 +2,7 @@
@c %**start of header
@setfilename ../../info/octave-mode.info
@settitle Octave Mode
-@documentencoding UTF-8
+@include docstyle.texi
@c %**end of header
@copying
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index a013632b4da..c0ad90714ca 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -2,6 +2,7 @@
@c %**start of header
@setfilename ../../info/org.info
@settitle The Org Manual
+@include docstyle.texi
@set VERSION 8.2.9
@@ -11,7 +12,6 @@
@set MAINTAINER Carsten Dominik
@set MAINTAINEREMAIL @email{carsten at orgmode dot org}
@set MAINTAINERCONTACT @uref{mailto:carsten at orgmode dot org,contact the maintainer}
-@documentencoding UTF-8
@c %**end of header
@finalout
diff --git a/doc/misc/pcl-cvs.texi b/doc/misc/pcl-cvs.texi
index 6970c69c20a..dd2ba388348 100644
--- a/doc/misc/pcl-cvs.texi
+++ b/doc/misc/pcl-cvs.texi
@@ -2,8 +2,8 @@
@c %**start of header
@setfilename ../../info/pcl-cvs.info
@settitle PCL-CVS---Emacs Front-End to CVS
+@include docstyle.texi
@syncodeindex vr fn
-@documentencoding UTF-8
@c %**end of header
@copying
diff --git a/doc/misc/pgg.texi b/doc/misc/pgg.texi
index a46c0fb8b4a..49a2cfd1851 100644
--- a/doc/misc/pgg.texi
+++ b/doc/misc/pgg.texi
@@ -6,8 +6,7 @@
@set VERSION 0.1
@settitle PGG @value{VERSION}
-
-@documentencoding UTF-8
+@include docstyle.texi
@copying
This file describes PGG @value{VERSION}, an Emacs interface to various
diff --git a/doc/misc/rcirc.texi b/doc/misc/rcirc.texi
index 646122bf897..a707ba5f03e 100644
--- a/doc/misc/rcirc.texi
+++ b/doc/misc/rcirc.texi
@@ -2,7 +2,7 @@
@c %**start of header
@setfilename ../../info/rcirc.info
@settitle rcirc Manual
-@documentencoding UTF-8
+@include docstyle.texi
@c %**end of header
@copying
diff --git a/doc/misc/reftex.texi b/doc/misc/reftex.texi
index 6488ae289a2..726ec4e8521 100644
--- a/doc/misc/reftex.texi
+++ b/doc/misc/reftex.texi
@@ -2,7 +2,7 @@
@c %**start of header
@setfilename ../../info/reftex.info
@settitle RefTeX User Manual
-@documentencoding UTF-8
+@include docstyle.texi
@synindex ky cp
@syncodeindex vr cp
@syncodeindex fn cp
diff --git a/doc/misc/remember.texi b/doc/misc/remember.texi
index d64d0eaab62..d5a03b63f22 100644
--- a/doc/misc/remember.texi
+++ b/doc/misc/remember.texi
@@ -2,8 +2,8 @@
@c %**start of header
@setfilename ../../info/remember.info
@settitle Remember Manual
+@include docstyle.texi
@syncodeindex fn cp
-@documentencoding UTF-8
@c %**end of header
@copying
diff --git a/doc/misc/sasl.texi b/doc/misc/sasl.texi
index f6f0a98ba62..86bcd1a0a6a 100644
--- a/doc/misc/sasl.texi
+++ b/doc/misc/sasl.texi
@@ -6,8 +6,7 @@
@set VERSION 0.2
@settitle Emacs SASL Library @value{VERSION}
-
-@documentencoding UTF-8
+@include docstyle.texi
@copying
This file describes the Emacs SASL library, version @value{VERSION}.
diff --git a/doc/misc/sc.texi b/doc/misc/sc.texi
index a851fa2d981..ba366722758 100644
--- a/doc/misc/sc.texi
+++ b/doc/misc/sc.texi
@@ -3,7 +3,7 @@
@comment %**start of header (This is for running Texinfo on a region.)
@setfilename ../../info/sc.info
@settitle Supercite User's Manual
-@documentencoding UTF-8
+@include docstyle.texi
@iftex
@finalout
@end iftex
diff --git a/doc/misc/semantic.texi b/doc/misc/semantic.texi
index 5f4a7821fec..71b81e76f9f 100644
--- a/doc/misc/semantic.texi
+++ b/doc/misc/semantic.texi
@@ -3,7 +3,7 @@
@set TITLE Semantic Manual
@set AUTHOR Eric M. Ludlam, David Ponce, and Richard Y. Kim
@settitle @value{TITLE}
-@documentencoding UTF-8
+@include docstyle.texi
@c *************************************************************************
@c @ Header
diff --git a/doc/misc/ses.texi b/doc/misc/ses.texi
index 068505089a3..7017429f063 100644
--- a/doc/misc/ses.texi
+++ b/doc/misc/ses.texi
@@ -2,11 +2,11 @@
@c %**start of header
@setfilename ../../info/ses.info
@settitle @acronym{SES}: Simple Emacs Spreadsheet
+@include docstyle.texi
@setchapternewpage off
@syncodeindex fn cp
@syncodeindex vr cp
@syncodeindex ky cp
-@documentencoding UTF-8
@c %**end of header
@copying
diff --git a/doc/misc/sieve.texi b/doc/misc/sieve.texi
index ca965e66bdd..e9cd9acb881 100644
--- a/doc/misc/sieve.texi
+++ b/doc/misc/sieve.texi
@@ -4,7 +4,7 @@
@setfilename ../../info/sieve.info
@settitle Emacs Sieve Manual
-@documentencoding UTF-8
+@include docstyle.texi
@synindex fn cp
@synindex vr cp
@synindex pg cp
diff --git a/doc/misc/smtpmail.texi b/doc/misc/smtpmail.texi
index 314e6a03abc..2d4e7f94b16 100644
--- a/doc/misc/smtpmail.texi
+++ b/doc/misc/smtpmail.texi
@@ -1,7 +1,7 @@
\input texinfo @c -*-texinfo-*-
@setfilename ../../info/smtpmail.info
@settitle Emacs SMTP Library
-@documentencoding UTF-8
+@include docstyle.texi
@syncodeindex vr fn
@copying
Copyright @copyright{} 2003--2015 Free Software Foundation, Inc.
diff --git a/doc/misc/speedbar.texi b/doc/misc/speedbar.texi
index da507dbb83c..6ad369c8609 100644
--- a/doc/misc/speedbar.texi
+++ b/doc/misc/speedbar.texi
@@ -1,7 +1,7 @@
\input texinfo @c -*-texinfo-*-
@setfilename ../../info/speedbar.info
@settitle Speedbar: File/Tag summarizing utility
-@documentencoding UTF-8
+@include docstyle.texi
@syncodeindex fn cp
@copying
diff --git a/doc/misc/srecode.texi b/doc/misc/srecode.texi
index b58cc4a204f..98fab5ceafa 100644
--- a/doc/misc/srecode.texi
+++ b/doc/misc/srecode.texi
@@ -4,7 +4,7 @@
@set TITLE SRecoder Manual
@set AUTHOR Eric M. Ludlam
@settitle @value{TITLE}
-@documentencoding UTF-8
+@include docstyle.texi
@c Merge all indexes into a single index for now.
@c We can always separate them later into two or more as needed.
diff --git a/doc/misc/todo-mode.texi b/doc/misc/todo-mode.texi
index 3032da34e28..69656da8880 100644
--- a/doc/misc/todo-mode.texi
+++ b/doc/misc/todo-mode.texi
@@ -2,10 +2,10 @@
@c %**start of header
@setfilename ../../info/todo-mode.info
@settitle Todo Mode User Manual
+@include docstyle.texi
@syncodeindex fn cp
@syncodeindex vr cp
@syncodeindex ky cp
-@documentencoding UTF-8
@c %**end of header
@copying
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 1875a70af43..ec39fc70088 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -2,7 +2,7 @@
@setfilename ../../info/tramp.info
@c %**start of header
@settitle TRAMP User Manual
-@documentencoding UTF-8
+@include docstyle.texi
@c %**end of header
@c This is *so* much nicer :)
diff --git a/doc/misc/url.texi b/doc/misc/url.texi
index 8c4afbe28b6..d94b19f77b6 100644
--- a/doc/misc/url.texi
+++ b/doc/misc/url.texi
@@ -1,8 +1,7 @@
\input texinfo
@setfilename ../../info/url.info
@settitle URL Programmer's Manual
-
-@documentencoding UTF-8
+@include docstyle.texi
@iftex
@c @finalout
diff --git a/doc/misc/vhdl-mode.texi b/doc/misc/vhdl-mode.texi
index 829c4f6564b..b8b3850c55a 100644
--- a/doc/misc/vhdl-mode.texi
+++ b/doc/misc/vhdl-mode.texi
@@ -2,7 +2,7 @@
@setfilename ../../info/vhdl-mode.info
@settitle VHDL Mode, an Emacs mode for editing VHDL code
-@documentencoding UTF-8
+@include docstyle.texi
@c Adapted from the VHDL Mode texinfo manual version 2 by Rodney J. Whitby.
@c Adapted from the CC Mode texinfo manual by Barry A. Warsaw.
diff --git a/doc/misc/vip.texi b/doc/misc/vip.texi
index 250ced951b1..4680a098f06 100644
--- a/doc/misc/vip.texi
+++ b/doc/misc/vip.texi
@@ -1,8 +1,7 @@
\input texinfo
@setfilename ../../info/vip.info
@settitle VIP
-
-@documentencoding UTF-8
+@include docstyle.texi
@copying
Copyright @copyright{} 1987, 2001--2015 Free Software Foundation, Inc.
diff --git a/doc/misc/viper.texi b/doc/misc/viper.texi
index cfaf4e66d85..f449e3b738b 100644
--- a/doc/misc/viper.texi
+++ b/doc/misc/viper.texi
@@ -5,8 +5,7 @@
@comment @setfilename viper
@comment @setfilename viper.info
@setfilename ../../info/viper.info
-
-@documentencoding UTF-8
+@include docstyle.texi
@copying
Copyright @copyright{} 1995--1997, 2001--2015 Free Software Foundation, Inc.
diff --git a/doc/misc/widget.texi b/doc/misc/widget.texi
index 1942b79977a..ea785501698 100644
--- a/doc/misc/widget.texi
+++ b/doc/misc/widget.texi
@@ -2,10 +2,10 @@
@c %**start of header
@setfilename ../../info/widget.info
@settitle The Emacs Widget Library
+@include docstyle.texi
@syncodeindex fn cp
@syncodeindex vr cp
@syncodeindex ky cp
-@documentencoding UTF-8
@c %**end of header
@copying
diff --git a/doc/misc/wisent.texi b/doc/misc/wisent.texi
index 16b5d122df1..7bcc46d58f0 100644
--- a/doc/misc/wisent.texi
+++ b/doc/misc/wisent.texi
@@ -4,6 +4,7 @@
@set TITLE Wisent Parser Development
@set AUTHOR Eric M. Ludlam, David Ponce, and Richard Y. Kim
@settitle @value{TITLE}
+@include docstyle.texi
@c *************************************************************************
@c @ Header
@@ -20,7 +21,6 @@
@c @footnotestyle separate
@c @paragraphindent 2
@c @@smallbook
-@documentencoding UTF-8
@c %**end of header
@copying
diff --git a/doc/misc/woman.texi b/doc/misc/woman.texi
index a935bedd47f..f1286fc3473 100644
--- a/doc/misc/woman.texi
+++ b/doc/misc/woman.texi
@@ -2,13 +2,13 @@
@c %**start of header
@setfilename ../../info/woman.info
@settitle WoMan: Browse Unix Manual Pages ``W.O. (without) Man''
+@include docstyle.texi
@include emacsver.texi
@afourpaper
@c With different size paper the printed page breaks will need attention!
@c Look for @page and @need commands.
@setchapternewpage off
@paragraphindent 0
-@documentencoding UTF-8
@c %**end of header
@copying