aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2009-02-20 12:36:50 +0000
committerJuanma Barranquero2009-02-20 12:36:50 +0000
commit867d4bb3718f1fee9191e2c17cd810ef620d4b54 (patch)
tree802e52f3063cc18c53e8789bba89e7392db04c5d
parent52f8870bd7b8508449605a33840bfddc2ea98a2b (diff)
downloademacs-867d4bb3718f1fee9191e2c17cd810ef620d4b54.tar.gz
emacs-867d4bb3718f1fee9191e2c17cd810ef620d4b54.zip
Remove duplicate words.
-rw-r--r--doc/emacs/ChangeLog7
-rw-r--r--doc/emacs/basic.texi4
-rw-r--r--doc/emacs/emacs.texi2
-rw-r--r--doc/emacs/files.texi2
-rw-r--r--doc/emacs/mini.texi2
-rw-r--r--doc/emacs/text.texi2
-rw-r--r--doc/lispintro/ChangeLog5
-rw-r--r--doc/lispintro/emacs-lisp-intro.texi10
-rw-r--r--doc/lispref/ChangeLog5
-rw-r--r--doc/lispref/modes.texi4
-rw-r--r--doc/misc/ChangeLog11
-rw-r--r--doc/misc/ada-mode.texi4
-rw-r--r--doc/misc/dbus.texi2
-rw-r--r--doc/misc/gnus.texi18
-rw-r--r--doc/misc/mh-e.texi2
-rw-r--r--doc/misc/nxml-mode.texi36
-rw-r--r--doc/misc/org.texi10
-rw-r--r--doc/misc/rcirc.texi4
-rw-r--r--lisp/ChangeLog2
-rw-r--r--src/ChangeLog4
20 files changed, 82 insertions, 54 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 70d036d6749..e79d61c95aa 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,10 @@
12009-02-19 Juanma Barranquero <lekktu@gmail.com>
2
3 * basic.texi (Moving Point, Position Info):
4 * files.texi (Visiting):
5 * mini.texi (Completion Options):
6 * text.texi (HTML Mode): Remove duplicate words.
7
12009-02-20 Glenn Morris <rgm@gnu.org> 82009-02-20 Glenn Morris <rgm@gnu.org>
2 9
3 * rmail.texi: Minor updates for mbox rather than Babyl. 10 * rmail.texi: Minor updates for mbox rather than Babyl.
diff --git a/doc/emacs/basic.texi b/doc/emacs/basic.texi
index 9994639c14e..710a093f495 100644
--- a/doc/emacs/basic.texi
+++ b/doc/emacs/basic.texi
@@ -206,7 +206,7 @@ Move to the end of the buffer (@code{end-of-buffer}).
206Scroll the display one screen forward, and move point if necessary to 206Scroll the display one screen forward, and move point if necessary to
207put it on the screen (@code{scroll-up}). If your keyboard has a 207put it on the screen (@code{scroll-up}). If your keyboard has a
208@key{PageDown} key (sometimes labelled @key{next}), it does the same 208@key{PageDown} key (sometimes labelled @key{next}), it does the same
209thing as as @key{C-v}. Scrolling commands are described further in 209thing as @key{C-v}. Scrolling commands are described further in
210@ref{Scrolling}. 210@ref{Scrolling}.
211@item M-v 211@item M-v
212@itemx @key{PageUp} 212@itemx @key{PageUp}
@@ -539,7 +539,7 @@ Toggle automatic display of the size of the buffer.
539 @kbd{M-x what-line} displays the current line number in the echo 539 @kbd{M-x what-line} displays the current line number in the echo
540area. This command is usually redundant, because the current line 540area. This command is usually redundant, because the current line
541number is shown in the mode line (@pxref{Mode Line}). However, if you 541number is shown in the mode line (@pxref{Mode Line}). However, if you
542narrow the buffer, the mode line shows the the line number relative to 542narrow the buffer, the mode line shows the line number relative to
543the accessible portion (@pxref{Narrowing}). By contrast, 543the accessible portion (@pxref{Narrowing}). By contrast,
544@code{what-line} displays both the line number relative to the 544@code{what-line} displays both the line number relative to the
545narrowed region and the line number relative to the whole buffer. 545narrowed region and the line number relative to the whole buffer.
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index 925153fac85..b19d4ff33ab 100644
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -1233,7 +1233,7 @@ in various programming languages.
1233 1233
1234 @dfn{Self-documenting} means that at any time you can use special 1234 @dfn{Self-documenting} means that at any time you can use special
1235commands, known as @dfn{help commands}, to find out what your options 1235commands, known as @dfn{help commands}, to find out what your options
1236are, or to find out what what any command does, or to find all the 1236are, or to find out what any command does, or to find all the
1237commands that pertain to a given topic. @xref{Help}. 1237commands that pertain to a given topic. @xref{Help}.
1238 1238
1239 @dfn{Customizable} means that you can easily alter the behavior of 1239 @dfn{Customizable} means that you can easily alter the behavior of
diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi
index 481d1208689..aad2b4adddc 100644
--- a/doc/emacs/files.texi
+++ b/doc/emacs/files.texi
@@ -277,7 +277,7 @@ slight error in typing the name.
277 277
278@vindex find-file-run-dired 278@vindex find-file-run-dired
279 If you ``visit'' a file that is actually a directory, Emacs invokes 279 If you ``visit'' a file that is actually a directory, Emacs invokes
280Dired, the Emacs directory browser; this lets you you ``edit'' the 280Dired, the Emacs directory browser; this lets you ``edit'' the
281contents of the directory. @xref{Dired}. You can disable this 281contents of the directory. @xref{Dired}. You can disable this
282behavior by setting the variable @code{find-file-run-dired} to 282behavior by setting the variable @code{find-file-run-dired} to
283@code{nil}; in that case, it is an error to try to visit a directory. 283@code{nil}; in that case, it is an error to try to visit a directory.
diff --git a/doc/emacs/mini.texi b/doc/emacs/mini.texi
index 630bce8d8a9..3f6208c46ef 100644
--- a/doc/emacs/mini.texi
+++ b/doc/emacs/mini.texi
@@ -379,7 +379,7 @@ commands never display the completion list buffer; you must type
379shows the completion list buffer on the second attempt to complete. 379shows the completion list buffer on the second attempt to complete.
380In other words, if there is nothing to complete, the first @key{TAB} 380In other words, if there is nothing to complete, the first @key{TAB}
381echoes @samp{Next char not unique}; the second @key{TAB} does the 381echoes @samp{Next char not unique}; the second @key{TAB} does the
382completion list buffer buffer. 382completion list buffer.
383 383
384@vindex completion-ignored-extensions 384@vindex completion-ignored-extensions
385@cindex ignored file names, in completion 385@cindex ignored file names, in completion
diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi
index 3a26a0530d0..3202d28769f 100644
--- a/doc/emacs/text.texi
+++ b/doc/emacs/text.texi
@@ -1855,7 +1855,7 @@ used as a cheap preview.
1855@cindex mode, nXML 1855@cindex mode, nXML
1856@findex nxml-mode 1856@findex nxml-mode
1857@cindex XML schema 1857@cindex XML schema
1858 Emacs also provides a more advanced mode mode for editing XML 1858 Emacs also provides a more advanced mode for editing XML
1859documents, called nXML mode (@code{nxml-mode}). nXML mode is aware of 1859documents, called nXML mode (@code{nxml-mode}). nXML mode is aware of
1860many existing XML schema, and uses them to provide completion of XML 1860many existing XML schema, and uses them to provide completion of XML
1861elements via @kbd{C-@key{RET}} or @kbd{M-@key{TAB}}, as well as 1861elements via @kbd{C-@key{RET}} or @kbd{M-@key{TAB}}, as well as
diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index c65368091a4..da5c9f671b5 100644
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,3 +1,8 @@
12009-02-20 Juanma Barranquero <lekktu@gmail.com>
2
3 * emacs-lisp-intro.texi (current-kill, Code for current-kill)
4 (Body of current-kill): Remove duplicate words.
5
12008-11-19 Glenn Morris <rgm@gnu.org> 62008-11-19 Glenn Morris <rgm@gnu.org>
2 7
3 * doclicense.texi: New file. 8 * doclicense.texi: New file.
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index 3221521ef68..c3ba966895f 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -25,7 +25,7 @@
25@comment %**end of header 25@comment %**end of header
26 26
27@c per rms and peterb, use 10pt fonts for the main text, mostly to 27@c per rms and peterb, use 10pt fonts for the main text, mostly to
28@c save on paper cost. 28@c save on paper cost.
29@c Do this inside @tex for now, so current makeinfo does not complain. 29@c Do this inside @tex for now, so current makeinfo does not complain.
30@tex 30@tex
31@ifset smallbook 31@ifset smallbook
@@ -17997,7 +17997,7 @@ version 21 and is likely to continue, you could write
17997@end smallexample 17997@end smallexample
17998 17998
17999@noindent 17999@noindent
18000and add other expressions, too. 18000and add other expressions, too.
18001 18001
18002 18002
18003@node X11 Colors, Miscellaneous, Simple Extension, Emacs Initialization 18003@node X11 Colors, Miscellaneous, Simple Extension, Emacs Initialization
@@ -19261,7 +19261,7 @@ To return to the old value for the length of the kill ring, evaluate:
19261The @code{current-kill} function changes the element in the kill ring 19261The @code{current-kill} function changes the element in the kill ring
19262to which @code{kill-ring-yank-pointer} points. (Also, the 19262to which @code{kill-ring-yank-pointer} points. (Also, the
19263@code{kill-new} function sets @code{kill-ring-yank-pointer} to point 19263@code{kill-new} function sets @code{kill-ring-yank-pointer} to point
19264to the latest element of the the kill ring. The @code{kill-new} 19264to the latest element of the kill ring. The @code{kill-new}
19265function is used directly or indirectly by @code{kill-append}, 19265function is used directly or indirectly by @code{kill-append},
19266@code{copy-region-as-kill}, @code{kill-ring-save}, @code{kill-line}, 19266@code{copy-region-as-kill}, @code{kill-ring-save}, @code{kill-line},
19267and @code{kill-region}.) 19267and @code{kill-region}.)
@@ -19319,7 +19319,7 @@ yanking point; just return the Nth kill forward."
19319@end smallexample 19319@end smallexample
19320 19320
19321Remember also that the @code{kill-new} function sets 19321Remember also that the @code{kill-new} function sets
19322@code{kill-ring-yank-pointer} to the latest element of the the kill 19322@code{kill-ring-yank-pointer} to the latest element of the kill
19323ring, which means that all the functions that call it set the value 19323ring, which means that all the functions that call it set the value
19324indirectly: @code{kill-append}, @code{copy-region-as-kill}, 19324indirectly: @code{kill-append}, @code{copy-region-as-kill},
19325@code{kill-ring-save}, @code{kill-line}, and @code{kill-region}. 19325@code{kill-ring-save}, @code{kill-line}, and @code{kill-region}.
@@ -19381,7 +19381,7 @@ The @code{if} expression has two parts, one if there exists
19381 19381
19382@need 2000 19382@need 2000
19383Let us consider the `if not' or else-part of the @code{current-kill} 19383Let us consider the `if not' or else-part of the @code{current-kill}
19384function. (The then-part uses the the @code{kill-new} function, which 19384function. (The then-part uses the @code{kill-new} function, which
19385we have already described. @xref{kill-new function, , The 19385we have already described. @xref{kill-new function, , The
19386@code{kill-new} function}.) 19386@code{kill-new} function}.)
19387 19387
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index cfff6a23539..e98d8b03668 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
12009-02-20 Juanma Barranquero <lekktu@gmail.com>
2
3 * modes.texi (Major Mode Conventions): Remove duplicate words.
4 (Customizing Keywords): Fix typo.
5
12009-02-14 Eli Zaretskii <eliz@gnu.org> 62009-02-14 Eli Zaretskii <eliz@gnu.org>
2 7
3 * nonascii.texi (User-Chosen Coding Systems): Document that 8 * nonascii.texi (User-Chosen Coding Systems): Document that
diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index ec8b2345046..3547dd3e304 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -376,7 +376,7 @@ Rmail that do not allow self-insertion of text can reasonably redefine
376letters and other printing characters as special commands. 376letters and other printing characters as special commands.
377 377
378@item 378@item
379Major modes modes for editing text should not define @key{RET} to do 379Major modes for editing text should not define @key{RET} to do
380anything other than insert a newline. However, it is ok for 380anything other than insert a newline. However, it is ok for
381specialized modes for text that users don't directly edit, such as 381specialized modes for text that users don't directly edit, such as
382Dired and Info modes, to redefine @key{RET} to do something entirely 382Dired and Info modes, to redefine @key{RET} to do something entirely
@@ -2708,7 +2708,7 @@ Non-@code{nil} means that regular expression matching for the sake of
2708 2708
2709 You can use @code{font-lock-add-keywords} to add additional 2709 You can use @code{font-lock-add-keywords} to add additional
2710search-based fontification rules to a major mode, and 2710search-based fontification rules to a major mode, and
2711@code{font-lock-remove-keywords} to removes rules. 2711@code{font-lock-remove-keywords} to remove rules.
2712 2712
2713@defun font-lock-add-keywords mode keywords &optional how 2713@defun font-lock-add-keywords mode keywords &optional how
2714This function adds highlighting @var{keywords}, for the current buffer 2714This function adds highlighting @var{keywords}, for the current buffer
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index bd0cd7ef701..4b234b85bb2 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,14 @@
12009-02-20 Juanma Barranquero <lekktu@gmail.com>
2
3 * ada-mode.texi (Project files, Automatic Casing):
4 * dbus.texi (Signals):
5 * gnus.texi (Selecting a Group, Filtering Incoming Mail):
6 * mh-e.texi (HTML):
7 * nxml-mode.texi (Locating a schema)
8 (Using the document's URI to locate a schema):
9 * org.texi (Footnotes, Using the mapping API):
10 * rcirc.texi (Channels): Remove duplicate words.
11
12009-02-20 Glenn Morris <rgm@gnu.org> 122009-02-20 Glenn Morris <rgm@gnu.org>
2 13
3 * dired-x.texi (Miscellaneous Commands): 14 * dired-x.texi (Miscellaneous Commands):
diff --git a/doc/misc/ada-mode.texi b/doc/misc/ada-mode.texi
index ae9597818c6..274bdcb1ae0 100644
--- a/doc/misc/ada-mode.texi
+++ b/doc/misc/ada-mode.texi
@@ -376,7 +376,7 @@ and other things on a per-project basis.
376 376
377Note that Ada mode project files @samp{*.adp} are different than GNAT 377Note that Ada mode project files @samp{*.adp} are different than GNAT
378compiler project files @samp{*.gpr}. However, Emacs Ada mode can use a 378compiler project files @samp{*.gpr}. However, Emacs Ada mode can use a
379GNAT project project file to specify the project directories. If no 379GNAT project file to specify the project directories. If no
380other customization is needed, a GNAT project file can be used without 380other customization is needed, a GNAT project file can be used without
381an Emacs Ada mode project file. 381an Emacs Ada mode project file.
382 382
@@ -1351,7 +1351,7 @@ to @code{My_VARIable}.
1351@end table 1351@end table
1352 1352
1353Ada mode allows you to define exceptions to these rules, in a file 1353Ada mode allows you to define exceptions to these rules, in a file
1354specified by the variable variable @code{ada-case-exception-file} 1354specified by the variable @code{ada-case-exception-file}
1355(default @file{~/.emacs_case_exceptions}). Each line in this file 1355(default @file{~/.emacs_case_exceptions}). Each line in this file
1356specifies the casing of one word or word fragment. Comments may be 1356specifies the casing of one word or word fragment. Comments may be
1357included, separated from the word by a space. 1357included, separated from the word by a space.
diff --git a/doc/misc/dbus.texi b/doc/misc/dbus.texi
index 51dabf8028d..40b652d95ac 100644
--- a/doc/misc/dbus.texi
+++ b/doc/misc/dbus.texi
@@ -1437,7 +1437,7 @@ which objects the GNU/Linux @code{hal} daemon adds.
1437@end defun 1437@end defun
1438 1438
1439@defun dbus-unregister-object object 1439@defun dbus-unregister-object object
1440Unregister @var{object} from the the D-Bus. @var{object} must be the 1440Unregister @var{object} from the D-Bus. @var{object} must be the
1441result of a preceding @code{dbus-register-signal} or 1441result of a preceding @code{dbus-register-signal} or
1442@code{dbus-register-method} call. It returns @code{t} if @var{object} 1442@code{dbus-register-method} call. It returns @code{t} if @var{object}
1443has been unregistered, @code{nil} otherwise. 1443has been unregistered, @code{nil} otherwise.
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index f4c84a5ed26..9d2faf02509 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -2208,7 +2208,7 @@ means Gnus never ignores old articles.
2208@vindex gnus-auto-select-subject 2208@vindex gnus-auto-select-subject
2209If @code{gnus-auto-select-first} is non-@code{nil}, select an article 2209If @code{gnus-auto-select-first} is non-@code{nil}, select an article
2210automatically when entering a group with the @kbd{SPACE} command. 2210automatically when entering a group with the @kbd{SPACE} command.
2211Which article this is is controlled by the 2211Which article this is controlled by the
2212@code{gnus-auto-select-subject} variable. Valid values for this 2212@code{gnus-auto-select-subject} variable. Valid values for this
2213variable are: 2213variable are:
2214 2214
@@ -4390,7 +4390,7 @@ FIXME: As a first step, convert the commentary of @file{nnir} to texi.
4390@node nnmairix 4390@node nnmairix
4391@subsection nnmairix 4391@subsection nnmairix
4392 4392
4393@cindex mairix 4393@cindex mairix
4394@cindex nnmairix 4394@cindex nnmairix
4395This paragraph describes how to set up mairix and the back end 4395This paragraph describes how to set up mairix and the back end
4396@code{nnmairix} for indexing and searching your mail from within 4396@code{nnmairix} for indexing and searching your mail from within
@@ -4480,7 +4480,7 @@ to certain mairix searches. This way, you can easily create a group
4480containing mails from a certain sender, with a certain subject line or 4480containing mails from a certain sender, with a certain subject line or
4481even for one specific thread based on the Message-ID. If you check for 4481even for one specific thread based on the Message-ID. If you check for
4482new mail in these folders (e.g. by pressing @kbd{g} or @kbd{M-g}), they 4482new mail in these folders (e.g. by pressing @kbd{g} or @kbd{M-g}), they
4483automatically update themselves by calling mairix. 4483automatically update themselves by calling mairix.
4484 4484
4485You might ask why you need @code{nnmairix} at all, since mairix already 4485You might ask why you need @code{nnmairix} at all, since mairix already
4486creates the group, populates it with links to the mails so that you can 4486creates the group, populates it with links to the mails so that you can
@@ -14475,7 +14475,7 @@ List of strings to be used as the switches to
14475Does essentially the same, but uses @code{telnet} instead of @samp{netcat} 14475Does essentially the same, but uses @code{telnet} instead of @samp{netcat}
14476to connect to the real @acronym{NNTP} server from the intermediate host. 14476to connect to the real @acronym{NNTP} server from the intermediate host.
14477@code{telnet} is a bit less robust because of things like 14477@code{telnet} is a bit less robust because of things like
14478line-end-conversion, but sometimes @code{netcat} is simply not available. 14478line-end-conversion, but sometimes @code{netcat} is simply not available.
14479 14479
14480@code{nntp-open-via-rlogin-and-telnet}-specific variables: 14480@code{nntp-open-via-rlogin-and-telnet}-specific variables:
14481 14481
@@ -25029,7 +25029,7 @@ the value @samp{spam} means @samp{nnimap+your-server:spam}. The value
25029@vindex nnimap-split-download-body 25029@vindex nnimap-split-download-body
25030Note for IMAP users: if you use the @code{spam-check-bogofilter}, 25030Note for IMAP users: if you use the @code{spam-check-bogofilter},
25031@code{spam-check-ifile}, and @code{spam-check-stat} spam back ends, 25031@code{spam-check-ifile}, and @code{spam-check-stat} spam back ends,
25032you should also set set the variable @code{nnimap-split-download-body} 25032you should also set the variable @code{nnimap-split-download-body}
25033to @code{t}. These spam back ends are most useful when they can 25033to @code{t}. These spam back ends are most useful when they can
25034``scan'' the full message body. By default, the nnimap back end only 25034``scan'' the full message body. By default, the nnimap back end only
25035retrieves the message headers; @code{nnimap-split-download-body} tells 25035retrieves the message headers; @code{nnimap-split-download-body} tells
@@ -26587,10 +26587,10 @@ of all messages matching a particular set of criteria.
26587@end enumerate 26587@end enumerate
26588 26588
26589@menu 26589@menu
26590* Setup:: 26590* Setup::
26591* Fancy splitting to parent:: 26591* Fancy splitting to parent::
26592* Store custom flags and keywords:: 26592* Store custom flags and keywords::
26593* Store arbitrary data:: 26593* Store arbitrary data::
26594@end menu 26594@end menu
26595 26595
26596@node Setup 26596@node Setup
diff --git a/doc/misc/mh-e.texi b/doc/misc/mh-e.texi
index b4a26fa6451..0a2399043a1 100644
--- a/doc/misc/mh-e.texi
+++ b/doc/misc/mh-e.texi
@@ -2666,7 +2666,7 @@ documentation for the Gnus command @kbd{W h} (see section
2666@findex browse-url-at-mouse 2666@findex browse-url-at-mouse
2667@kindex S-Mouse-2 2667@kindex S-Mouse-2
2668 2668
2669A useful key binding that you can add to to @file{~/.emacs} is the 2669A useful key binding that you can add to @file{~/.emacs} is the
2670following which displays an HTML link or textual URL in an external 2670following which displays an HTML link or textual URL in an external
2671browser when clicked with @kbd{S-mouse-2}. This binding works in any 2671browser when clicked with @kbd{S-mouse-2}. This binding works in any
2672buffer, including HTML buffers. 2672buffer, including HTML buffers.
diff --git a/doc/misc/nxml-mode.texi b/doc/misc/nxml-mode.texi
index 1181e743e74..a27835a7576 100644
--- a/doc/misc/nxml-mode.texi
+++ b/doc/misc/nxml-mode.texi
@@ -6,7 +6,7 @@
6 6
7@copying 7@copying
8This manual documents nxml-mode, an Emacs major mode for editing 8This manual documents nxml-mode, an Emacs major mode for editing
9XML with RELAX NG support. 9XML with RELAX NG support.
10 10
11Copyright @copyright{} 2007, 2008, 2009 Free Software Foundation, Inc. 11Copyright @copyright{} 2007, 2008, 2009 Free Software Foundation, Inc.
12 12
@@ -43,13 +43,13 @@ license to the document, as described in section 6 of the license.
43This manual is not yet complete. 43This manual is not yet complete.
44 44
45@menu 45@menu
46* Completion:: 46* Completion::
47* Inserting end-tags:: 47* Inserting end-tags::
48* Paragraphs:: 48* Paragraphs::
49* Outlining:: 49* Outlining::
50* Locating a schema:: 50* Locating a schema::
51* DTDs:: 51* DTDs::
52* Limitations:: 52* Limitations::
53@end menu 53@end menu
54 54
55@node Completion 55@node Completion
@@ -427,7 +427,7 @@ of the current section.
427@kbd{C-c C-o C-d} hides the text content 427@kbd{C-c C-o C-d} hides the text content
428and subsections of the current section. 428and subsections of the current section.
429@item 429@item
430@kbd{C-c C-o C-s} shows the current section 430@kbd{C-c C-o C-s} shows the current section
431and all its direct and indirect subsections normally. 431and all its direct and indirect subsections normally.
432@item 432@item
433@kbd{C-c C-o C-k} shows the headings of the 433@kbd{C-c C-o C-k} shows the headings of the
@@ -483,7 +483,7 @@ from file @var{x} have precedence over rules from file
483@samp{rng-schema-locating-files} may be relative. If so, it will 483@samp{rng-schema-locating-files} may be relative. If so, it will
484be resolved relative to the document for which a schema is being 484be resolved relative to the document for which a schema is being
485located. It is not an error if relative file-names in 485located. It is not an error if relative file-names in
486@samp{rng-schema-locating-files} do not not exist. You can use 486@samp{rng-schema-locating-files} do not exist. You can use
487@kbd{M-x customize-variable @key{RET} rng-schema-locating-files 487@kbd{M-x customize-variable @key{RET} rng-schema-locating-files
488@key{RET}} to customize the list of schema locating 488@key{RET}} to customize the list of schema locating
489files. 489files.
@@ -498,8 +498,8 @@ edited if such a file exist. The second member contains rules for the
498schemas that are included with the nXML distribution. 498schemas that are included with the nXML distribution.
499 499
500@menu 500@menu
501* Commands for locating a schema:: 501* Commands for locating a schema::
502* Schema locating files:: 502* Schema locating files::
503@end menu 503@end menu
504 504
505@node Commands for locating a schema 505@node Commands for locating a schema
@@ -565,11 +565,11 @@ there is nothing specific to locating schemas in the design; it could
565equally well be used for locating a stylesheet. 565equally well be used for locating a stylesheet.
566 566
567@menu 567@menu
568* Schema locating file syntax basics:: 568* Schema locating file syntax basics::
569* Using the document's URI to locate a schema:: 569* Using the document's URI to locate a schema::
570* Using the document element to locate a schema:: 570* Using the document element to locate a schema::
571* Using type identifiers in schema locating files:: 571* Using type identifiers in schema locating files::
572* Using multiple schema locating files:: 572* Using multiple schema locating files::
573@end menu 573@end menu
574 574
575@node Schema locating file syntax basics 575@node Schema locating file syntax basics
@@ -626,7 +626,7 @@ the schema for a particular document. For example,
626@end example 626@end example
627 627
628@noindent 628@noindent
629specifies that that the schema for @samp{spec.xml} is 629specifies that the schema for @samp{spec.xml} is
630@samp{docbook.rnc}. 630@samp{docbook.rnc}.
631 631
632The @samp{pattern} attribute can be used instead of the 632The @samp{pattern} attribute can be used instead of the
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index b8f56f123c7..fe06865fa95 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -310,7 +310,7 @@ Markup rules
310* Include files:: Include the contents of a file during export 310* Include files:: Include the contents of a file during export
311* Tables exported:: Tables are exported richly 311* Tables exported:: Tables are exported richly
312* Inlined images:: How to inline images during export 312* Inlined images:: How to inline images during export
313* Footnote markup:: 313* Footnote markup::
314* Emphasis and monospace:: To bold or not to bold 314* Emphasis and monospace:: To bold or not to bold
315* TeX macros and LaTeX fragments:: Create special, rich export. 315* TeX macros and LaTeX fragments:: Create special, rich export.
316* Horizontal rules:: A line across the page 316* Horizontal rules:: A line across the page
@@ -1413,7 +1413,7 @@ A LaTeX-like anonymous footnote where the definition is given directly at the
1413reference point. 1413reference point.
1414@item [fn:name: a definition] 1414@item [fn:name: a definition]
1415An inline definition of a footnote, which also specifies a name for the note. 1415An inline definition of a footnote, which also specifies a name for the note.
1416Since Org allows multiple references to the same note, you can then use use 1416Since Org allows multiple references to the same note, you can then use
1417@code{[fn:name]} to create additional references. 1417@code{[fn:name]} to create additional references.
1418@end table 1418@end table
1419 1419
@@ -2737,7 +2737,7 @@ the current URL. For IRC links, if you set the variable
2737@code{org-irc-link-to-logs} to non-nil then @kbd{C-c l} will store a 2737@code{org-irc-link-to-logs} to non-nil then @kbd{C-c l} will store a
2738@samp{file:/} style link to the relevant point in the logs for the current 2738@samp{file:/} style link to the relevant point in the logs for the current
2739conversation. Otherwise an @samp{irc:/} style link to the user/channel/server 2739conversation. Otherwise an @samp{irc:/} style link to the user/channel/server
2740under the point will be stored. 2740under the point will be stored.
2741 2741
2742For any other files, the link will point to the file, with a search string 2742For any other files, the link will point to the file, with a search string
2743(@pxref{Search options}) pointing to the contents of the current line. If 2743(@pxref{Search options}) pointing to the contents of the current line. If
@@ -7348,7 +7348,7 @@ markup rule used in an Org mode buffer.
7348* Include files:: Include the contents of a file during export 7348* Include files:: Include the contents of a file during export
7349* Tables exported:: Tables are exported richly 7349* Tables exported:: Tables are exported richly
7350* Inlined images:: How to inline images during export 7350* Inlined images:: How to inline images during export
7351* Footnote markup:: 7351* Footnote markup::
7352* Emphasis and monospace:: To bold or not to bold 7352* Emphasis and monospace:: To bold or not to bold
7353* TeX macros and LaTeX fragments:: Create special, rich export. 7353* TeX macros and LaTeX fragments:: Create special, rich export.
7354* Horizontal rules:: A line across the page 7354* Horizontal rules:: A line across the page
@@ -10230,7 +10230,7 @@ archive @r{skip trees with the archive tag}
10230comment @r{skip trees with the COMMENT keyword} 10230comment @r{skip trees with the COMMENT keyword}
10231function or Lisp form 10231function or Lisp form
10232 @r{will be used as value for @code{org-agenda-skip-function},} 10232 @r{will be used as value for @code{org-agenda-skip-function},}
10233 @r{so whenever the the function returns t, FUNC} 10233 @r{so whenever the function returns t, FUNC}
10234 @r{will not be called for that entry and search will} 10234 @r{will not be called for that entry and search will}
10235 @r{continue from the point where the function leaves it} 10235 @r{continue from the point where the function leaves it}
10236@end example 10236@end example
diff --git a/doc/misc/rcirc.texi b/doc/misc/rcirc.texi
index 6bc7185370b..e2902ccbed0 100644
--- a/doc/misc/rcirc.texi
+++ b/doc/misc/rcirc.texi
@@ -657,7 +657,7 @@ expected.
657 657
658@kindex C-c C-l 658@kindex C-c C-l
659@cindex low priority channels 659@cindex low priority channels
660The solution is to mark this channel as as a low priority channel. 660The solution is to mark this channel as a low priority channel.
661Use @kbd{C-c C-l} to make the current channel a low-priority channel. 661Use @kbd{C-c C-l} to make the current channel a low-priority channel.
662Low priority channels have the modeline indicator ``LowPri''. 662Low priority channels have the modeline indicator ``LowPri''.
663@kbd{C-c C-@key{SPC}} will not switch to low priority channels unless 663@kbd{C-c C-@key{SPC}} will not switch to low priority channels unless
@@ -745,7 +745,7 @@ listed. Example: @code{/keyword manual}.
745 745
746@node Notices, , Keywords, Fighting Information Overload 746@node Notices, , Keywords, Fighting Information Overload
747@section Notices 747@section Notices
748@cindex part notices, how to omit 748@cindex part notices, how to omit
749@cindex join notices, how to omit 749@cindex join notices, how to omit
750@cindex quit notices, how to omit 750@cindex quit notices, how to omit
751@cindex nick notices, how to omit 751@cindex nick notices, how to omit
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fbcec5b8f5e..2bf46c5aa38 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -5277,7 +5277,7 @@
52772008-09-30 Jay Belanger <jay.p.belanger@gmail.com> 52772008-09-30 Jay Belanger <jay.p.belanger@gmail.com>
5278 5278
5279 * calc/calc-units.el (math-standard-units): Add entries used to 5279 * calc/calc-units.el (math-standard-units): Add entries used to
5280 display the the values in the units buffer. 5280 display the values in the units buffer.
5281 (math-build-units-table): Add entries to the units table to be used 5281 (math-build-units-table): Add entries to the units table to be used
5282 to display the values in the units buffer. 5282 to display the values in the units buffer.
5283 (math-build-units-table-buffer): Use the display entry of the units 5283 (math-build-units-table-buffer): Use the display entry of the units
diff --git a/src/ChangeLog b/src/ChangeLog
index 89df449c281..492a3c41e75 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -218,7 +218,7 @@
218 the frame. 218 the frame.
219 (composition_compute_stop_pos): Adjust cmp_it->stop_pos if point 219 (composition_compute_stop_pos): Adjust cmp_it->stop_pos if point
220 is within a composition. 220 is within a composition.
221 (Fcomposition_get_gstring): Fix the the terminal case. 221 (Fcomposition_get_gstring): Fix the terminal case.
222 222
223 * term.c (encode_terminal_code): Fix handling of composition. 223 * term.c (encode_terminal_code): Fix handling of composition.
224 (produce_composite_glyph): For static composition, get pixel_width 224 (produce_composite_glyph): For static composition, get pixel_width
@@ -9095,7 +9095,7 @@
9095 * ftfont.c (struct OpenTypeSpec): Rename members script_tag to 9095 * ftfont.c (struct OpenTypeSpec): Rename members script_tag to
9096 script, langsys_tag to langsys, new member script. 9096 script, langsys_tag to langsys, new member script.
9097 (OTF_TAG_STR): Terminate by '\0'. 9097 (OTF_TAG_STR): Terminate by '\0'.
9098 (ftfont_get_open_type_spec): If :otf prop is is spec, Limit the 9098 (ftfont_get_open_type_spec): If :otf prop is spec, limit the
9099 listing to the script specified in that property. Fix arg to 9099 listing to the script specified in that property. Fix arg to
9100 OTF_check_features. 9100 OTF_check_features.
9101 9101