summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2013-12-30 19:08:32 +0200
committerEli Zaretskii <eliz@gnu.org>2013-12-30 19:08:32 +0200
commit634425957a55b272b0e06a617c725766e1ae0ee9 (patch)
treeea3269a6163fc30c2678c4ec564a8f73df5c3c8f
parent564eb533f9f36bbc1a18ea17522d97fa21d1b4bc (diff)
downloademacs-634425957a55b272b0e06a617c725766e1ae0ee9.tar.gz
Revert @documentencoding changes in the docs.
-rw-r--r--doc/emacs/ChangeLog5
-rw-r--r--doc/emacs/emacs-xtra.texi1
-rw-r--r--doc/emacs/emacs.texi1
-rw-r--r--doc/lispintro/ChangeLog5
-rw-r--r--doc/lispintro/emacs-lisp-intro.texi2
-rw-r--r--doc/lispref/ChangeLog6
-rw-r--r--doc/lispref/back.texi2
-rw-r--r--doc/lispref/book-spine.texi2
-rw-r--r--doc/lispref/elisp.texi1
-rw-r--r--doc/lispref/lay-flat.texi2
-rw-r--r--doc/misc/ChangeLog18
-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.texi10
-rw-r--r--doc/misc/cc-mode.texi2
-rw-r--r--doc/misc/cl.texi4
-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.texi22
-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/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.texi1
-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.texi1
-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/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
71 files changed, 17 insertions, 181 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index d88c6037210..4c931ce8cb8 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,8 +1,3 @@
-2013-12-30 Paul Eggert <eggert@cs.ucla.edu>
-
- Specify info encoding and language (Bug#16292).
- * emacs.texi, emacs-xtra.texi: Add @documentlanguage directive.
-
2013-12-28 Glenn Morris <rgm@gnu.org>
* trouble.texi (Understanding Bug Reporting): Brevity.
diff --git a/doc/emacs/emacs-xtra.texi b/doc/emacs/emacs-xtra.texi
index d0712dcae64..f67ed3d5cad 100644
--- a/doc/emacs/emacs-xtra.texi
+++ b/doc/emacs/emacs-xtra.texi
@@ -27,7 +27,6 @@ modify this GNU manual.''
@end copying
@documentencoding UTF-8
-@documentlanguage en
@dircategory Emacs
@direntry
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index 27ad8530361..4845d49b823 100644
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -45,7 +45,6 @@ developing GNU and promoting software freedom.''
@end copying
@documentencoding UTF-8
-@documentlanguage en
@dircategory Emacs
@direntry
diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index 4c702f7dc2e..32e2b5ea726 100644
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,8 +1,3 @@
-2013-12-30 Paul Eggert <eggert@cs.ucla.edu>
-
- Specify info encoding and language (Bug#16292).
- * emacs-lisp-intro.texi: Add @documentencoding, @documentlanguage.
-
2013-12-30 Glenn Morris <rgm@gnu.org>
* emacs-lisp-intro.texi: Use @quotation for license notice.
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index 1e0cf4fb4d9..07cd449ade0 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -4,8 +4,6 @@
@c setfilename emacs-lisp-intro.info
@c sethtmlfilename emacs-lisp-intro.html
@settitle Programming in Emacs Lisp
-@documentencoding UTF-8
-@documentlanguage en
@syncodeindex vr cp
@syncodeindex fn cp
@finalout
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 99da484c002..3de4ae598fe 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,9 +1,3 @@
-2013-12-30 Paul Eggert <eggert@cs.ucla.edu>
-
- Specify info encoding and language (Bug#16292).
- * back.texi, book-spine.texi, elisp.texi, lay-flat.texi:
- Add @documentencoding, @documentlanguage as needed.
-
2013-12-29 Paul Eggert <eggert@cs.ucla.edu>
Plain copy-file no longer chmods an existing destination (Bug#16133).
diff --git a/doc/lispref/back.texi b/doc/lispref/back.texi
index ff83a2b9f7a..ef20f8b79e0 100644
--- a/doc/lispref/back.texi
+++ b/doc/lispref/back.texi
@@ -6,8 +6,6 @@
@c %**start of header
@setfilename back-cover
@settitle GNU Emacs Lisp Reference Manual
-@documentencoding UTF-8
-@documentlanguage en
@c %**end of header
.
@sp 7
diff --git a/doc/lispref/book-spine.texi b/doc/lispref/book-spine.texi
index f56995dba22..721416316d2 100644
--- a/doc/lispref/book-spine.texi
+++ b/doc/lispref/book-spine.texi
@@ -2,8 +2,6 @@
@c %**start of header
@setfilename book-spine
@settitle book-spine
-@documentencoding UTF-8
-@documentlanguage en
@c %**end of header
@include emacsver.texi
diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi
index 20818ec2d4d..d6f7df5fb01 100644
--- a/doc/lispref/elisp.texi
+++ b/doc/lispref/elisp.texi
@@ -116,7 +116,6 @@ developing GNU and promoting software freedom.''
@end copying
@documentencoding UTF-8
-@documentlanguage en
@dircategory Emacs lisp
@direntry
diff --git a/doc/lispref/lay-flat.texi b/doc/lispref/lay-flat.texi
index 96b5b73aa0f..f12e724d6a9 100644
--- a/doc/lispref/lay-flat.texi
+++ b/doc/lispref/lay-flat.texi
@@ -7,8 +7,6 @@
@setfilename inner-covers.info
@settitle Inner Covers
@smallbook
-@documentencoding UTF-8
-@documentlanguage en
@comment %**end of header
@headings off
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 5f8490f29cb..72df4408d0d 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,21 +1,3 @@
-2013-12-30 Paul Eggert <eggert@cs.ucla.edu>
-
- Specify info encoding and language (Bug#16292).
- * ada-mode.texi, auth.texi, autotype.texi, bovine.texi, calc.texi:
- * cc-mode.texi, cl.texi, dbus.texi, dired-x.texi, ebrowse.texi:
- * ede.texi, ediff.texi, edt.texi, efaq-w32.texi, efaq.texi:
- * eieio.texi, emacs-gnutls.texi, emacs-mime.texi, epa.texi, erc.texi:
- * ert.texi, eshell.texi, eudc.texi, flymake.texi, forms.texi:
- * gnus-coding.texi, gnus-faq.texi, gnus.texi, htmlfontify.texi:
- * idlwave.texi, ido.texi, info.texi, mairix-el.texi, message.texi:
- * mh-e.texi, newsticker.texi, nxml-mode.texi, octave-mode.texi:
- * org.texi, pcl-cvs.texi, pgg.texi, rcirc.texi, reftex.texi:
- * remember.texi, sasl.texi, sc.texi, semantic.texi, ses.texi:
- * sieve.texi, smtpmail.texi, speedbar.texi, srecode.texi:
- * todo-mode.texi, tramp.texi, url.texi, vip.texi, viper.texi:
- * widget.texi, wisent.texi, woman.texi:
- Add @documentencoding, @documentlanguage as needed.
-
2013-12-23 Teodor Zlatanov <tzz@lifelogs.com>
* emacs-gnutls.texi (Help For Users): Document `gnutls-verify-error'.
diff --git a/doc/misc/ada-mode.texi b/doc/misc/ada-mode.texi
index a1a5642fbaf..b5a640e13e0 100644
--- a/doc/misc/ada-mode.texi
+++ b/doc/misc/ada-mode.texi
@@ -1,8 +1,6 @@
\input texinfo @c -*-texinfo-*-
@setfilename ../../info/ada-mode
@settitle Ada Mode
-@documentencoding UTF-8
-@documentlanguage en
@copying
Copyright @copyright{} 1999--2013 Free Software Foundation, Inc.
diff --git a/doc/misc/auth.texi b/doc/misc/auth.texi
index 047883791a6..36ee400acca 100644
--- a/doc/misc/auth.texi
+++ b/doc/misc/auth.texi
@@ -6,8 +6,6 @@
@setfilename ../../info/auth
@settitle Emacs auth-source Library @value{VERSION}
-@documentencoding UTF-8
-@documentlanguage en
@copying
This file describes the Emacs auth-source library.
diff --git a/doc/misc/autotype.texi b/doc/misc/autotype.texi
index a043e912e82..92cd5cdeccd 100644
--- a/doc/misc/autotype.texi
+++ b/doc/misc/autotype.texi
@@ -5,8 +5,6 @@
@c @node Autotypist, Picture, Abbrevs, Top
@c @chapter Features for Automatic Typing
@settitle Features for Automatic Typing
-@documentencoding UTF-8
-@documentlanguage en
@c @cindex text
@c @cindex selfinserting text
@c @cindex autotypist
diff --git a/doc/misc/bovine.texi b/doc/misc/bovine.texi
index 083f271d23e..81ec2eb80ec 100644
--- a/doc/misc/bovine.texi
+++ b/doc/misc/bovine.texi
@@ -4,8 +4,6 @@
@set TITLE Bovine parser development
@set AUTHOR Eric M. Ludlam, David Ponce, and Richard Y. Kim
@settitle @value{TITLE}
-@documentencoding UTF-8
-@documentlanguage en
@c *************************************************************************
@c @ Header
diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index 93685195d96..425cd349784 100644
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -4,8 +4,6 @@
@setfilename ../../info/calc
@c [title]
@settitle GNU Emacs Calc Manual
-@documentencoding UTF-8
-@documentlanguage en
@setchapternewpage odd
@comment %**end of header (This is for running Texinfo on a region.)
@@ -11803,7 +11801,7 @@ Thus @kbd{M-@key{DEL}} by itself removes the second-from-top stack element,
leaving the first, third, fourth, and so on; @kbd{M-3 M-@key{DEL}} deletes
the third stack element.
-The above commands do not depend on the location of the cursor.
+The above commands do not depend on the location of the cursor.
If the customizable variable @code{calc-context-sensitive-enter} is
non-@code{nil} (@pxref{Customizing Calc}), these commands will become
context sensitive. For example, instead of duplicating the top of the stack,
@@ -33328,7 +33326,7 @@ integers. Each @var{d} is a base-@expr{10^n} ``digit'' (where again,
99@dots{}9. The least significant digit is @var{d0}; the last digit,
@var{dn}, which is always nonzero, is the most significant digit. For
example, the integer @mathit{-12345678} might be stored as
-@samp{(bigneg 678 345 12)}.
+@samp{(bigneg 678 345 12)}.
The distinction between small and large integers is entirely hidden from
the user. In @code{defmath} definitions, the Lisp predicate @code{integerp}
@@ -35714,10 +35712,10 @@ is @code{nil}.
The commands @code{calc-enter} and @code{calc-pop} will typically
duplicate the top of the stack. If
@code{calc-context-sensitive-enter} is non-@code{nil}, then the
-@code{calc-enter} will copy the element at the cursor to the
+@code{calc-enter} will copy the element at the cursor to the
top of the stack and @code{calc-pop} will delete the element at the
cursor. The default value of @code{calc-context-sensitive-enter} is
-@code{nil}.
+@code{nil}.
@end defvar
@defvar calc-undo-length
diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi
index c2252e82699..7d1baf7bf0c 100644
--- a/doc/misc/cc-mode.texi
+++ b/doc/misc/cc-mode.texi
@@ -83,8 +83,6 @@ the second with them pointing to the XEmacs manuals.
@setfilename ../../info/ccmode
@settitle CC Mode Manual
-@documentencoding UTF-8
-@documentlanguage en
@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 2d383c2f04f..49c02568475 100644
--- a/doc/misc/cl.texi
+++ b/doc/misc/cl.texi
@@ -1,8 +1,6 @@
\input texinfo @c -*-texinfo-*-
@setfilename ../../info/cl
@settitle Common Lisp Extensions
-@documentencoding UTF-8
-@documentlanguage en
@include emacsver.texi
@copying
@@ -1497,7 +1495,7 @@ simply returning @code{nil}.
@node Blocks and Exits
@section Blocks and Exits
-@cindex block
+@cindex block
@noindent
Common Lisp @dfn{blocks} provide a non-local exit mechanism very
diff --git a/doc/misc/dbus.texi b/doc/misc/dbus.texi
index 25a21dd2d88..a6155e2e724 100644
--- a/doc/misc/dbus.texi
+++ b/doc/misc/dbus.texi
@@ -2,8 +2,6 @@
@setfilename ../../info/dbus
@c %**start of header
@settitle Using of D-Bus
-@documentencoding UTF-8
-@documentlanguage en
@c @setchapternewpage odd
@c %**end of header
diff --git a/doc/misc/dired-x.texi b/doc/misc/dired-x.texi
index 26d6d633d53..0b88604543e 100644
--- a/doc/misc/dired-x.texi
+++ b/doc/misc/dired-x.texi
@@ -9,8 +9,6 @@
@comment %**start of header (This is for running Texinfo on a region.)
@setfilename ../../info/dired-x
@settitle Dired Extra User's Manual
-@documentencoding UTF-8
-@documentlanguage en
@include emacsver.texi
diff --git a/doc/misc/ebrowse.texi b/doc/misc/ebrowse.texi
index 16f343bcf32..aa9df988969 100644
--- a/doc/misc/ebrowse.texi
+++ b/doc/misc/ebrowse.texi
@@ -3,8 +3,6 @@
@comment %**start of header
@setfilename ../../info/ebrowse
@settitle A Class Browser for C++
-@documentencoding UTF-8
-@documentlanguage en
@setchapternewpage odd
@syncodeindex fn cp
@comment %**end of header
diff --git a/doc/misc/ede.texi b/doc/misc/ede.texi
index 7608dde14d9..283082141dc 100644
--- a/doc/misc/ede.texi
+++ b/doc/misc/ede.texi
@@ -1,8 +1,6 @@
\input texinfo
@setfilename ../../info/ede
@settitle Emacs Development Environment
-@documentencoding UTF-8
-@documentlanguage en
@copying
This file describes EDE, the Emacs Development Environment.
diff --git a/doc/misc/ediff.texi b/doc/misc/ediff.texi
index a1107348041..bb315fc41ef 100644
--- a/doc/misc/ediff.texi
+++ b/doc/misc/ediff.texi
@@ -10,8 +10,6 @@
@setfilename ../../info/ediff
@settitle Ediff User's Manual
-@documentencoding UTF-8
-@documentlanguage en
@synindex vr cp
@synindex fn cp
@synindex pg cp
diff --git a/doc/misc/edt.texi b/doc/misc/edt.texi
index 531f885b967..40aeae836ef 100644
--- a/doc/misc/edt.texi
+++ b/doc/misc/edt.texi
@@ -1,8 +1,6 @@
\input texinfo
@setfilename ../../info/edt
@settitle EDT Emulation for Emacs
-@documentencoding UTF-8
-@documentlanguage en
@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 255621bf9a0..c6f44cea2b8 100644
--- a/doc/misc/efaq-w32.texi
+++ b/doc/misc/efaq-w32.texi
@@ -162,7 +162,7 @@ Pre-compiled versions are distributed from
Emacs binaries are distributed as zip files, digitally
signed by the developer who built them. Generally most users will
want the file @file{emacs-@value{EMACSVER}-bin-i386.zip}, which
-contains everything you need to get started.
+contains everything you need to get started.
@cindex where to get sources
@cindex Emacs source code
@@ -286,7 +286,7 @@ Windows ports of the command line gzip and tar tools from multiple sources.
The command to unpack a source distribution from the command line is:
@example
-tar xzf emacs-@value{EMACSVER}.tar.gz
+tar xzf emacs-@value{EMACSVER}.tar.gz
@end example
If this does not work with the versions of tar and gzip that you have,
@@ -573,9 +573,9 @@ Message-ID: <fawg21mm4hm.fsf@@mordor.rsn.hp.com>
Subject: Re: Re[2]: problem with caps/ctrl swap on NT 4.0
@end ignore
@example
-It's a binary value that lets you map keystrokes in the low-level keyboard
-drivers in NT. As a result you don't have to worry about applications
-bypassing mappings that you've done at a higher level (i.e. it just works).
+It's a binary value that lets you map keystrokes in the low-level keyboard
+drivers in NT. As a result you don't have to worry about applications
+bypassing mappings that you've done at a higher level (i.e. it just works).
Here's the format of the value:
@@ -587,11 +587,11 @@ Here's the format of the value:
DWORD: mapping n
DWORD: 0x00000000 terminating null DWORD
-Each mapping DWORD has two parts: the input scancode, and an output
-scancode. To map scancode 0x1d (left control) to scancode 0x3a (caps
-lock), you want a value of 0x003a001d. Note that this does not swap the
-keys. Using just this mapping value, both the left control and the caps
-lock key will behave as caps-lock. To swap, you also need to map 0x3a to
+Each mapping DWORD has two parts: the input scancode, and an output
+scancode. To map scancode 0x1d (left control) to scancode 0x3a (caps
+lock), you want a value of 0x003a001d. Note that this does not swap the
+keys. Using just this mapping value, both the left control and the caps
+lock key will behave as caps-lock. To swap, you also need to map 0x3a to
0x1d, using 0x001d003a.
This registry value is system wide, and can't be made user-specific. It
@@ -1426,7 +1426,7 @@ this discussion} for more details.
You can start an interactive shell in Emacs by typing @kbd{M-x shell}.
Emacs uses the @env{SHELL} environment variable to determine which
program to use as the shell. To instruct Emacs to use a non-default
-shell, you can either set this environment variable, or customize
+shell, you can either set this environment variable, or customize
@code{explicit-shell-file-name}. You can also customize
@code{shell-file-name} to change the shell that will be used by
subprocesses that are started with @code{shell-command} and
diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi
index 0e2710b6580..54e067d65bd 100644
--- a/doc/misc/efaq.texi
+++ b/doc/misc/efaq.texi
@@ -2,8 +2,6 @@
@c %**start of header
@setfilename ../../info/efaq
@settitle GNU Emacs FAQ
-@documentencoding UTF-8
-@documentlanguage en
@c %**end of header
@include emacsver.texi
diff --git a/doc/misc/eieio.texi b/doc/misc/eieio.texi
index 6f6dd064fe9..5b9f3a8e004 100644
--- a/doc/misc/eieio.texi
+++ b/doc/misc/eieio.texi
@@ -3,8 +3,6 @@
@set TITLE Enhanced Implementation of Emacs Interpreted Objects
@set AUTHOR Eric M. Ludlam
@settitle @value{TITLE}
-@documentencoding UTF-8
-@documentlanguage en
@c *************************************************************************
@c @ Header
diff --git a/doc/misc/emacs-gnutls.texi b/doc/misc/emacs-gnutls.texi
index b30067830e5..369c6c3c3a1 100644
--- a/doc/misc/emacs-gnutls.texi
+++ b/doc/misc/emacs-gnutls.texi
@@ -4,8 +4,6 @@
@setfilename ../../info/emacs-gnutls
@settitle Emacs GnuTLS Integration @value{VERSION}
-@documentencoding UTF-8
-@documentlanguage en
@copying
This file describes the Emacs GnuTLS integration.
diff --git a/doc/misc/emacs-mime.texi b/doc/misc/emacs-mime.texi
index 37c6e1b6b1e..2c0e929e532 100644
--- a/doc/misc/emacs-mime.texi
+++ b/doc/misc/emacs-mime.texi
@@ -26,8 +26,8 @@ modify this GNU manual.''
@end quotation
@end copying
+@c Node ``Interface Functions'' uses non-ASCII characters
@documentencoding UTF-8
-@documentlanguage en
@dircategory Emacs lisp libraries
@direntry
diff --git a/doc/misc/epa.texi b/doc/misc/epa.texi
index c131a82c527..79f76560eb4 100644
--- a/doc/misc/epa.texi
+++ b/doc/misc/epa.texi
@@ -2,8 +2,6 @@
@c %**start of header
@setfilename ../../info/epa
@settitle EasyPG Assistant User's Manual
-@documentencoding UTF-8
-@documentlanguage en
@c %**end of header
@set VERSION 1.0.0
diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi
index 07e77f392fe..abf0766ee8f 100644
--- a/doc/misc/erc.texi
+++ b/doc/misc/erc.texi
@@ -4,8 +4,6 @@
@settitle ERC Manual
@syncodeindex fn cp
@include emacsver.texi
-@documentencoding UTF-8
-@documentlanguage en
@c %**end of header
@copying
diff --git a/doc/misc/ert.texi b/doc/misc/ert.texi
index 7d7157c6805..926a02fd1de 100644
--- a/doc/misc/ert.texi
+++ b/doc/misc/ert.texi
@@ -2,8 +2,6 @@
@c %**start of header
@setfilename ../../info/ert
@settitle Emacs Lisp Regression Testing
-@documentencoding UTF-8
-@documentlanguage en
@c %**end of header
@dircategory Emacs misc features
diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi
index 789fa01160c..e8fab42b899 100644
--- a/doc/misc/eshell.texi
+++ b/doc/misc/eshell.texi
@@ -4,8 +4,6 @@
@settitle Eshell: The Emacs Shell
@defindex cm
@synindex vr fn
-@documentencoding UTF-8
-@documentlanguage en
@c %**end of header
@copying
diff --git a/doc/misc/eudc.texi b/doc/misc/eudc.texi
index 30353fdfaa1..747494ffbde 100644
--- a/doc/misc/eudc.texi
+++ b/doc/misc/eudc.texi
@@ -3,8 +3,6 @@
@setfilename ../../info/eudc
@settitle Emacs Unified Directory Client (EUDC) Manual
@afourpaper
-@documentencoding UTF-8
-@documentlanguage en
@c %**end of header
@copying
diff --git a/doc/misc/flymake.texi b/doc/misc/flymake.texi
index dce0a714809..d1f3e21c20e 100644
--- a/doc/misc/flymake.texi
+++ b/doc/misc/flymake.texi
@@ -5,8 +5,6 @@
@set UPDATED April 2004
@settitle GNU Flymake @value{VERSION}
@syncodeindex pg cp
-@documentencoding UTF-8
-@documentlanguage en
@comment %**end of header
@copying
diff --git a/doc/misc/forms.texi b/doc/misc/forms.texi
index 817aafde2a1..17b117be961 100644
--- a/doc/misc/forms.texi
+++ b/doc/misc/forms.texi
@@ -14,8 +14,6 @@
@end iftex
@c @smallbook
@comment %**end of header (This is for running Texinfo on a region.)
-@documentencoding UTF-8
-@documentlanguage en
@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 cebe90bea9a..4e5855627b8 100644
--- a/doc/misc/gnus-coding.texi
+++ b/doc/misc/gnus-coding.texi
@@ -2,8 +2,6 @@
@setfilename gnus-coding
@settitle Gnus Coding Style and Maintenance Guide
-@documentencoding UTF-8
-@documentlanguage en
@syncodeindex fn cp
@syncodeindex vr cp
@syncodeindex pg cp
diff --git a/doc/misc/gnus-faq.texi b/doc/misc/gnus-faq.texi
index 3b4cf5d8c5e..1a0469c14f4 100644
--- a/doc/misc/gnus-faq.texi
+++ b/doc/misc/gnus-faq.texi
@@ -5,8 +5,6 @@
@c
@c @setfilename gnus-faq.info
@c @settitle Frequently Asked Questions
-@c @documentencoding UTF-8
-@c @documentlanguage en
@c %**end of header
@c
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 5e29a08eb98..d05ed53e69b 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -9,7 +9,6 @@
@syncodeindex pg cp
@documentencoding UTF-8
-@documentlanguage en
@copying
Copyright @copyright{} 1995--2013 Free Software Foundation, Inc.
diff --git a/doc/misc/htmlfontify.texi b/doc/misc/htmlfontify.texi
index efb52683c8d..9f3b99a1027 100644
--- a/doc/misc/htmlfontify.texi
+++ b/doc/misc/htmlfontify.texi
@@ -3,8 +3,6 @@
@setfilename ../../info/htmlfontify
@settitle Htmlfontify User Manual
@exampleindent 2
-@documentencoding UTF-8
-@documentlanguage en
@comment %**end of header
@copying
diff --git a/doc/misc/idlwave.texi b/doc/misc/idlwave.texi
index efe3db63b05..a432d4dc14a 100644
--- a/doc/misc/idlwave.texi
+++ b/doc/misc/idlwave.texi
@@ -12,8 +12,6 @@
@set DATE April, 2007
@set AUTHOR J.D. Smith & Carsten Dominik
@set MAINTAINER J.D. Smith
-@documentencoding UTF-8
-@documentlanguage en
@c %**end of header
@finalout
diff --git a/doc/misc/ido.texi b/doc/misc/ido.texi
index 816e42c4dbd..747a9d57d3f 100644
--- a/doc/misc/ido.texi
+++ b/doc/misc/ido.texi
@@ -1,8 +1,6 @@
\input texinfo @c -*-texinfo-*-
@setfilename ../../info/ido
@settitle Interactive Do
-@documentencoding UTF-8
-@documentlanguage en
@include emacsver.texi
@copying
diff --git a/doc/misc/info.texi b/doc/misc/info.texi
index 093a510187e..32aee99868d 100644
--- a/doc/misc/info.texi
+++ b/doc/misc/info.texi
@@ -8,8 +8,6 @@
@syncodeindex fn cp
@syncodeindex vr cp
@syncodeindex ky cp
-@documentencoding UTF-8
-@documentlanguage en
@comment %**end of header
@copying
diff --git a/doc/misc/mairix-el.texi b/doc/misc/mairix-el.texi
index 9fe46d5f9b4..210b709c1ea 100644
--- a/doc/misc/mairix-el.texi
+++ b/doc/misc/mairix-el.texi
@@ -4,7 +4,6 @@
@settitle Emacs Interface for Mairix
@documentencoding UTF-8
-@documentlanguage en
@copying
Copyright @copyright{} 2008--2013 Free Software Foundation, Inc.
diff --git a/doc/misc/message.texi b/doc/misc/message.texi
index 86092ab76d8..a98c7e48e53 100644
--- a/doc/misc/message.texi
+++ b/doc/misc/message.texi
@@ -4,8 +4,6 @@
@setfilename ../../info/message
@settitle Message Manual
-@documentencoding UTF-8
-@documentlanguage en
@synindex fn cp
@synindex vr cp
@synindex pg cp
diff --git a/doc/misc/mh-e.texi b/doc/misc/mh-e.texi
index d11cf3dfd7d..a0ea0fe6de9 100644
--- a/doc/misc/mh-e.texi
+++ b/doc/misc/mh-e.texi
@@ -5,8 +5,6 @@
@c %**start of header
@setfilename ../../info/mh-e
@settitle The MH-E Manual
-@documentencoding UTF-8
-@documentlanguage en
@c %**end of header
@c Version of the software and manual.
diff --git a/doc/misc/newsticker.texi b/doc/misc/newsticker.texi
index e5e3c11c0bd..afb44a6a396 100644
--- a/doc/misc/newsticker.texi
+++ b/doc/misc/newsticker.texi
@@ -7,8 +7,6 @@
@syncodeindex vr cp
@syncodeindex fn cp
@syncodeindex pg cp
-@documentencoding UTF-8
-@documentlanguage en
@comment %**end of header
@copying
diff --git a/doc/misc/nxml-mode.texi b/doc/misc/nxml-mode.texi
index df2a6c808ee..8c81b6fbd20 100644
--- a/doc/misc/nxml-mode.texi
+++ b/doc/misc/nxml-mode.texi
@@ -2,8 +2,6 @@
@c %**start of header
@setfilename ../../info/nxml-mode
@settitle nXML Mode
-@documentencoding UTF-8
-@documentlanguage en
@c %**end of header
@copying
diff --git a/doc/misc/octave-mode.texi b/doc/misc/octave-mode.texi
index 6590e1770b8..50bb4f11f2a 100644
--- a/doc/misc/octave-mode.texi
+++ b/doc/misc/octave-mode.texi
@@ -2,8 +2,6 @@
@c %**start of header
@setfilename ../../info/octave-mode
@settitle Octave Mode
-@documentencoding UTF-8
-@documentlanguage en
@c %**end of header
@copying
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index 9d3acac25aa..a90f3d4d536 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -15,8 +15,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
-@documentlanguage en
@c %**end of header
@finalout
diff --git a/doc/misc/pcl-cvs.texi b/doc/misc/pcl-cvs.texi
index 86bdad0e611..11123f977a0 100644
--- a/doc/misc/pcl-cvs.texi
+++ b/doc/misc/pcl-cvs.texi
@@ -3,8 +3,6 @@
@setfilename ../../info/pcl-cvs
@settitle PCL-CVS---Emacs Front-End to CVS
@syncodeindex vr fn
-@documentencoding UTF-8
-@documentlanguage en
@c %**end of header
@copying
diff --git a/doc/misc/pgg.texi b/doc/misc/pgg.texi
index df86117a6b1..370998c855a 100644
--- a/doc/misc/pgg.texi
+++ b/doc/misc/pgg.texi
@@ -7,9 +7,6 @@
@set VERSION 0.1
@settitle PGG @value{VERSION}
-@documentencoding UTF-8
-@documentlanguage en
-
@copying
This file describes PGG @value{VERSION}, an Emacs interface to various
PGP implementations.
diff --git a/doc/misc/rcirc.texi b/doc/misc/rcirc.texi
index e76172017a8..3bce0c7c24b 100644
--- a/doc/misc/rcirc.texi
+++ b/doc/misc/rcirc.texi
@@ -2,8 +2,6 @@
@c %**start of header
@setfilename ../../info/rcirc
@settitle rcirc Manual
-@documentencoding UTF-8
-@documentlanguage en
@c %**end of header
@copying
diff --git a/doc/misc/reftex.texi b/doc/misc/reftex.texi
index c2c7b0818aa..ba83d8129a8 100644
--- a/doc/misc/reftex.texi
+++ b/doc/misc/reftex.texi
@@ -2,8 +2,6 @@
@c %**start of header
@setfilename ../../info/reftex
@settitle RefTeX User Manual
-@documentencoding UTF-8
-@documentlanguage en
@synindex ky cp
@syncodeindex vr cp
@syncodeindex fn cp
diff --git a/doc/misc/remember.texi b/doc/misc/remember.texi
index b6a18b1433a..290c18a7b47 100644
--- a/doc/misc/remember.texi
+++ b/doc/misc/remember.texi
@@ -3,8 +3,6 @@
@setfilename ../../info/remember
@settitle Remember Manual
@syncodeindex fn cp
-@documentencoding UTF-8
-@documentlanguage en
@c %**end of header
@copying
diff --git a/doc/misc/sasl.texi b/doc/misc/sasl.texi
index 256077871f3..dcb25ec805a 100644
--- a/doc/misc/sasl.texi
+++ b/doc/misc/sasl.texi
@@ -7,9 +7,6 @@
@set VERSION 0.2
@settitle Emacs SASL Library @value{VERSION}
-@documentencoding UTF-8
-@documentlanguage en
-
@copying
This file describes the Emacs SASL library, version @value{VERSION}.
diff --git a/doc/misc/sc.texi b/doc/misc/sc.texi
index 43a8992a2e9..11dbf2eda5e 100644
--- a/doc/misc/sc.texi
+++ b/doc/misc/sc.texi
@@ -3,8 +3,6 @@
@comment %**start of header (This is for running Texinfo on a region.)
@setfilename ../../info/sc
@settitle Supercite User's Manual
-@documentencoding UTF-8
-@documentlanguage en
@iftex
@finalout
@end iftex
diff --git a/doc/misc/semantic.texi b/doc/misc/semantic.texi
index 132fdec67be..f43316f5012 100644
--- a/doc/misc/semantic.texi
+++ b/doc/misc/semantic.texi
@@ -3,8 +3,6 @@
@set TITLE Semantic Manual
@set AUTHOR Eric M. Ludlam, David Ponce, and Richard Y. Kim
@settitle @value{TITLE}
-@documentencoding UTF-8
-@documentlanguage en
@c *************************************************************************
@c @ Header
diff --git a/doc/misc/ses.texi b/doc/misc/ses.texi
index 8b9520bf790..8ac023b8135 100644
--- a/doc/misc/ses.texi
+++ b/doc/misc/ses.texi
@@ -6,8 +6,6 @@
@syncodeindex fn cp
@syncodeindex vr cp
@syncodeindex ky cp
-@documentencoding UTF-8
-@documentlanguage en
@c %**end of header
@copying
diff --git a/doc/misc/sieve.texi b/doc/misc/sieve.texi
index 1fb987fb2a0..f69e2b9b948 100644
--- a/doc/misc/sieve.texi
+++ b/doc/misc/sieve.texi
@@ -4,8 +4,6 @@
@setfilename ../../info/sieve
@settitle Emacs Sieve Manual
-@documentencoding UTF-8
-@documentlanguage en
@synindex fn cp
@synindex vr cp
@synindex pg cp
diff --git a/doc/misc/smtpmail.texi b/doc/misc/smtpmail.texi
index 6774f0e5545..dce90d06012 100644
--- a/doc/misc/smtpmail.texi
+++ b/doc/misc/smtpmail.texi
@@ -1,8 +1,6 @@
\input texinfo @c -*-texinfo-*-
@setfilename ../../info/smtpmail
@settitle Emacs SMTP Library
-@documentencoding UTF-8
-@documentlanguage en
@syncodeindex vr fn
@copying
Copyright @copyright{} 2003--2013 Free Software Foundation, Inc.
diff --git a/doc/misc/speedbar.texi b/doc/misc/speedbar.texi
index 49bc462a32e..3cb0ec3aed8 100644
--- a/doc/misc/speedbar.texi
+++ b/doc/misc/speedbar.texi
@@ -1,8 +1,6 @@
\input texinfo @c -*-texinfo-*-
@setfilename ../../info/speedbar
@settitle Speedbar: File/Tag summarizing utility
-@documentencoding UTF-8
-@documentlanguage en
@syncodeindex fn cp
@copying
diff --git a/doc/misc/srecode.texi b/doc/misc/srecode.texi
index 8715c488310..d6cf4d53edc 100644
--- a/doc/misc/srecode.texi
+++ b/doc/misc/srecode.texi
@@ -4,8 +4,6 @@
@set TITLE SRecoder Manual
@set AUTHOR Eric M. Ludlam
@settitle @value{TITLE}
-@documentencoding UTF-8
-@documentlanguage en
@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 715212e03d5..4920a9ccc81 100644
--- a/doc/misc/todo-mode.texi
+++ b/doc/misc/todo-mode.texi
@@ -5,8 +5,6 @@
@syncodeindex fn cp
@syncodeindex vr cp
@syncodeindex ky cp
-@documentencoding UTF-8
-@documentlanguage en
@c %**end of header
@copying
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 05e06724a81..7b2d2b33ba2 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -2,8 +2,6 @@
@setfilename ../../info/tramp
@c %**start of header
@settitle TRAMP User Manual
-@documentencoding UTF-8
-@documentlanguage en
@c %**end of header
@c This is *so* much nicer :)
diff --git a/doc/misc/url.texi b/doc/misc/url.texi
index 862a8068bed..fdec68b1c61 100644
--- a/doc/misc/url.texi
+++ b/doc/misc/url.texi
@@ -2,9 +2,6 @@
@setfilename ../../info/url
@settitle URL Programmer's Manual
-@documentencoding UTF-8
-@documentlanguage en
-
@iftex
@c @finalout
@end iftex
diff --git a/doc/misc/vip.texi b/doc/misc/vip.texi
index 3ce0221f6cb..28e78f5d381 100644
--- a/doc/misc/vip.texi
+++ b/doc/misc/vip.texi
@@ -2,9 +2,6 @@
@setfilename ../../info/vip
@settitle VIP
-@documentencoding UTF-8
-@documentlanguage en
-
@copying
Copyright @copyright{} 1987, 2001--2013 Free Software Foundation, Inc.
diff --git a/doc/misc/viper.texi b/doc/misc/viper.texi
index cb6268e0e03..db5a5736888 100644
--- a/doc/misc/viper.texi
+++ b/doc/misc/viper.texi
@@ -6,9 +6,6 @@
@comment @setfilename viper.info
@setfilename ../../info/viper
-@documentencoding UTF-8
-@documentlanguage en
-
@copying
Copyright @copyright{} 1995--1997, 2001--2013 Free Software Foundation, Inc.
diff --git a/doc/misc/widget.texi b/doc/misc/widget.texi
index 9d8fe14a8b0..2fe247dd750 100644
--- a/doc/misc/widget.texi
+++ b/doc/misc/widget.texi
@@ -5,8 +5,6 @@
@syncodeindex fn cp
@syncodeindex vr cp
@syncodeindex ky cp
-@documentencoding UTF-8
-@documentlanguage en
@c %**end of header
@copying
diff --git a/doc/misc/wisent.texi b/doc/misc/wisent.texi
index 1274e9b0724..c0f18f6363a 100644
--- a/doc/misc/wisent.texi
+++ b/doc/misc/wisent.texi
@@ -20,8 +20,6 @@
@c @footnotestyle separate
@c @paragraphindent 2
@c @@smallbook
-@documentencoding UTF-8
-@documentlanguage en
@c %**end of header
@copying
diff --git a/doc/misc/woman.texi b/doc/misc/woman.texi
index 324d5a7c84d..df67f02119c 100644
--- a/doc/misc/woman.texi
+++ b/doc/misc/woman.texi
@@ -8,8 +8,6 @@
@c Look for @page and @need commands.
@setchapternewpage off
@paragraphindent 0
-@documentencoding UTF-8
-@documentlanguage en
@c %**end of header
@copying