Merge from trunk.

21 files changed, 67 insertions, 71 deletions

diff --git a/etc/AUTHORS b/etc/AUTHORS
index f214d5e5515..f8ab274e136 100644
--- a/etc/AUTHORS
+++ b/etc/AUTHORS
@@ -908,7 +908,7 @@ Derek Upham: changed nxml-mode.el
 
 Detlev Zundel: wrote re-builder.el
 
-Devon Sean Mccullough: changed comint.el
+Devon Sean McCullough: changed comint.el
 
 Dhruva Krishnamurthy: changed makefile.w32-in emacsclient.c fontset.c
   sound.c w32proc.c
diff --git a/etc/ChangeLog b/etc/ChangeLog
index b494c8e3c96..48b1acacbf9 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2011-11-14  Juanma Barranquero  <lekktu@gmail.com>
+
+        * MAILINGLISTS: Fix typo.
+
 2011-10-29  Eli Zaretskii  <eliz@gnu.org>
 
         * themes/wombat-theme.el: Add a coding cookie.  (Bug#9905)
@@ -371,7 +375,7 @@
 
 2011-01-04  Jan Moringen  <jan.moringen@uni-bielefeld.de>
 
-        * NEWS: Extended behaviour of dbus-register-{method,property}.
+        * NEWS: Extended behavior of dbus-register-{method,property}.
 
 2011-01-02  Kenichi Handa  <handa@m17n.org>
 
@@ -4103,7 +4107,7 @@
 
 2002-02-01  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
-        * gnus.xpm: Remove garbages.
+        * gnus.xpm: Remove garbage.
 
 2002-01-27  Pavel Janík  <Pavel@Janik.cz>
 
diff --git a/etc/ERC-NEWS b/etc/ERC-NEWS
index 17bf4fc3877..14d2a22e9f9 100644
--- a/etc/ERC-NEWS
+++ b/etc/ERC-NEWS
@@ -852,7 +852,7 @@ Only the macros in cl-macs.el are used.
 ** If possible, re-use channel buffers when reconnecting to a server.
 
 ** Text in ERC buffers is now read-only by default.
-To get the previous behavior, 
+To get the previous behavior,
 
 ** Changes and additions to modules
 
@@ -1279,8 +1279,8 @@ in XEmacs.
 ** The module system has again changed a lot.  You can now customize
   the variable `erc-modules' and define once and for all which
   extension modules you want to use.  This unfortunately may require
-  you to change your current erc initialisation code a bit, if you
-  have some existing customsations.  On the other hand, this change
+  you to change your current erc initialization code a bit, if you
+  have some existing customizations.  On the other hand, this change
   makes the configuration of extension modules a lot easier for new
   users.  In theory, you should be able to configure all aspects of
   ERC by using the customize interface, you should no longer really
@@ -1342,4 +1342,3 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
diff --git a/etc/JOKES b/etc/JOKES
index 9cbba845111..af304e778da 100644
--- a/etc/JOKES
+++ b/etc/JOKES
@@ -197,7 +197,7 @@ Each
 Manual's
 Audience is
 Completely
-Stupified
+Stupefied
 
 Emacs
 Means
@@ -333,7 +333,7 @@ Easily
 Mangles,
 Aborts,
 Crashes and
-Stupifies
+Stupefies
 
 Extraneous
 Macros
diff --git a/etc/MAILINGLISTS b/etc/MAILINGLISTS
index ef918d3d211..98f10511835 100644
--- a/etc/MAILINGLISTS
+++ b/etc/MAILINGLISTS
@@ -170,7 +170,7 @@ for yourself in particular, you may have to hire someone.  The GNU
 project maintains a list of people providing such services.  It is
 found in <URL:http://www.gnu.org/prep/SERVICE>.
 
-Anything addressed to the implementors and maintainers of a GNU program
+Anything addressed to the implementers and maintainers of a GNU program
 via a bug-* list, should NOT be sent to the corresponding info-* or
 help-* list.
 
diff --git a/etc/NEWS b/etc/NEWS
index 59fab6d9107..b5ff946f722 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -172,7 +172,7 @@ server should listen.
 *** New emacsclient argument --frame-parameters can be used to set the
 frame parameters of a newly-created graphical frame.
 +++
-*** If emacsclient shuts down as a result of Emacs signalling an
+*** If emacsclient shuts down as a result of Emacs signaling an
 error, its exit status is 1.
 +++
 *** New emacsclient argument --parent-id ID.
@@ -403,20 +403,21 @@ specified by `display-buffer-fallback-action'.
 display actions, taking precedence over `display-buffer-base-action'.
 
 +++
-*** New option `window-nest'.
-The new option `window-nest' allows to return the space obtained for
-resizing or creating a window more reliably to the window from which
-such space was obtained.
+*** New option `window-combination-limit'.
+The new option `window-combination-limit' allows to return the space
+obtained for resizing or creating a window more reliably to the window
+from which such space was obtained.
 
 +++
-*** New option `window-splits'.
-The new option `window-splits' allows to split a window that otherwise
-cannot be split because it's too small by stealing space from other
-windows in the same combination.
+*** New option `window-combination-resize'.
+The new option `window-combination-resize' allows to split a window that
+otherwise cannot be split because it's too small by stealing space from
+other windows in the same combination.  Subsequent resizing or deletion
+of the window will resize all windows in the same combination as well.
 
 +++
 *** New commands `maximize-window' and `minimize-window'.
-These maximize and minize the size of a window within its frame.
+These maximize and minimize the size of a window within its frame.
 
 +++
 *** New commands `switch-to-prev-buffer' and `switch-to-next-buffer'.
@@ -1125,7 +1126,7 @@ state before the last buffer display operation in that window.
 
 +++
 *** The new option `frame-auto-hide-function' lets you choose between
-iconfying or deleting a frame when burying a buffer shown in a dedicated
+iconifying or deleting a frame when burying a buffer shown in a dedicated
 frame or quitting a window showing a buffer in a frame of its own.
 
 ** Completion
@@ -1243,7 +1244,7 @@ argument is supplied (see Trash changes, above).
 
 ** `facemenu-read-color' is now an alias for `read-color'.
 The command `read-color' now requires a match for a color name or RGB
-triplet, instead of signalling an error if the user provides a invalid
+triplet, instead of signaling an error if the user provides a invalid
 input.
 
 ** Tool-bars can display separators.
diff --git a/etc/NEWS.1-17 b/etc/NEWS.1-17
index 89856429b1d..9a72089859e 100644
--- a/etc/NEWS.1-17
+++ b/etc/NEWS.1-17
@@ -963,7 +963,7 @@ a slash is appended to it.
 * Undo can clear modified-flag.
 
 If you undo changes in a buffer back to a state in which the
-buffer was not considered "modified", then it is labelled as
+buffer was not considered "modified", then it is labeled as
 once again "unmodified".
 
 * M-x run-lisp.
@@ -996,7 +996,7 @@ with no confirmation.
 view-buffer selects the named buffer, view-file finds the named file; the
 resulting buffer is placed into view-mode (a recursive edit).  The normal
 emacs commands are not available.  Instead a set of special commands is
-provided which faclitate moving around in the buffer, searching and
+provided which facilitate moving around in the buffer, searching and
 scrolling by screenfuls.  Exiting view-mode returns to the buffer in which
 the view-file or view-buffer command was given.
 Type ? or h when viewing for a complete list of view commands.
@@ -1074,7 +1074,7 @@ Another `t' switches back to the usual display.
 
 * Rmail commands `a' and `k' set message attributes.
 `a' adds an attribute and `k' removes one.  You specify
-the attrbute by name.  You can specify either a built-in
+the attribute by name.  You can specify either a built-in
 flag such as "deleted" or "filed", or a user-defined keyword
 (anything not recognized as built-in).
 
@@ -1090,7 +1090,7 @@ the messages should have.
 * Interface to MH mail system.
 
 mh-e is a front end for GNU emacs and the MH mail system.  It
-provides a friendly and convient interface to the MH commands.
+provides a friendly and convenient interface to the MH commands.
 
 To read mail, invoke mh-rmail.  This will inc new mail and display the
 scan listing on the screen.  To see a summary of the mh-e commands,
@@ -1382,7 +1382,7 @@ Changes in Emacs 15
  specify the tag table file name initially, or to switch
  to a new tag table.
 
-* If truncate-partial-width-windows is non-nil (as it intially is),
+* If truncate-partial-width-windows is non-nil (as it initially is),
  all windows less than the full screen width (that is,
  made by side-by-side splitting) truncate lines rather than continuing
  them.
@@ -1612,7 +1612,7 @@ Changes in Emacs 13
  The string "../lisp" now adds to the front of the load-path
  used for searching for Lisp files during Emacs initialization.
  It used to replace the path specified in paths.h entirely.
- Now the directory ../lisp is searched first and the directoris
+ Now the directory ../lisp is searched first and the directories
  specified in paths.h are searched afterward.
 
 
@@ -1670,7 +1670,7 @@ Changes in Emacs 1.12
  the string, it is used unchanged.
 
  One way this feature can be used is to fix bad keyboard
- designes.  For example, on some terminals, Delete is
+ designs.  For example, on some terminals, Delete is
  Shift-Underscore.  Since Delete is a more useful character
  than Underscore, it is an improvement to make the unshifted
  character Delete and the shifted one Underscore.  This can
@@ -2019,7 +2019,7 @@ Changes in Emacs 1.6
 * save-buffers-kill-emacs is now on C-x C-c
  while C-x C-z does suspend-emacs.  This is to make
  C-x C-c like the normal Unix meaning of C-c
- and C-x C-z linke the normal Unix meaning of C-z.
+ and C-x C-z like the normal Unix meaning of C-z.
 
 * M-ESC (eval-expression) is now a disabled command by default.
  This prevents users who type ESC ESC accidentally from
@@ -2423,7 +2423,7 @@ Changes in Emacs 1.1
  or show the text or subheadings under each heading line
  independently.  Hidden text or subheadings are invisibly
  attached to the end of the preceding heading line, so that
- if you kill the hading line and yank it back elsewhere
+ if you kill the heading line and yank it back elsewhere
  all the invisible lines accompany it.
 
   All editing commands treat hidden outline-mode lines
@@ -2446,7 +2446,7 @@ Changes in Emacs 1.1
  containing *'s, etc, all processed by the shell).  Also, you
  can dired more than one directory; dired names the buffer
  according to the filespec or directory name.  Reinvoking
- dired on a directory already direded just switches back to
+ dired on a directory already diredded just switches back to
  the same directory used last time; do M-x revert if you want
  to read in the current contents of the directory.
 
@@ -2530,4 +2530,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 Local variables:
 mode: text
 end:
-
diff --git a/etc/NEWS.18 b/etc/NEWS.18
index 6bf854d8b33..ce1f6b12fb3 100644
--- a/etc/NEWS.18
+++ b/etc/NEWS.18
@@ -519,7 +519,7 @@ exist to customize these feature for different Lisp implementations.
 
 ** C-x p now disabled.
 
-The command C-x p, a nonrecomended command which narrows to the current
+The command C-x p, a nonrecommended command which narrows to the current
 page, is now initially disabled like C-x n.
 
 * Dealing with files.
@@ -1620,4 +1620,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 Local variables:
 mode: text
 end:
-
diff --git a/etc/NEWS.19 b/etc/NEWS.19
index 90d96c12fb8..90671cee18c 100644
--- a/etc/NEWS.19
+++ b/etc/NEWS.19
@@ -1729,7 +1729,7 @@ projects to define project-specific structures.  It also enables the
 use of etags and TAGS files for languages not supported by etags.
 
 The Emacs manual section on Tags contains explanations and examples
-for Emacs's DEFVAR, VHDL, Cobol, Postscript and TCL.
+for Emacs's DEFVAR, VHDL, Cobol, PostScript and TCL.
 
 ** Various mode-specific commands that used to be bound to C-c LETTER
 have been moved.
@@ -4288,7 +4288,7 @@ filename completion in comint mode apply, together with a variable
 controlling whether to restrict possible completions to only files
 that are executable (`shell-command-execonly').
 
-The input history is initialised from the file name given in the
+The input history is initialized from the file name given in the
 variable `shell-input-ring-file-name'--normally `.history' in your
 home directory.
 
diff --git a/etc/NEWS.20 b/etc/NEWS.20
index f4cfb14de62..332eec60535 100644
--- a/etc/NEWS.20
+++ b/etc/NEWS.20
@@ -696,7 +696,7 @@ pasting operations.
 ** You can specify the printer to use for commands that do printing by
 setting the variable `printer-name'.  Just what a printer name looks
 like depends on your operating system.  You can specify a different
-printer for the Postscript printing commands by setting
+printer for the PostScript printing commands by setting
 `ps-printer-name'.
 
 ** Emacs now supports on-the-fly spell checking by the means of a
@@ -3494,9 +3494,9 @@ not by default.  Use --members to turn this feature on.
 *** Java is tagged like C++.  In addition, "extends" and "implements"
 constructs are tagged.  Files are recognized by the extension .java.
 
-*** Etags can now handle programs written in Postscript.  Files are
-recognized by the extensions .ps and .pdb (Postscript with C syntax).
-In Postscript, tags are lines that start with a slash.
+*** Etags can now handle programs written in PostScript.  Files are
+recognized by the extensions .ps and .pdb (PostScript with C syntax).
+In PostScript, tags are lines that start with a slash.
 
 *** Etags now handles Objective C and Objective C++ code.  The usual C and
 C++ tags are recognized in these languages; in addition, etags
diff --git a/etc/NEWS.21 b/etc/NEWS.21
index 47f61a13e3b..c3c54d8bb01 100644
--- a/etc/NEWS.21
+++ b/etc/NEWS.21
@@ -446,7 +446,7 @@ This behavior may be disabled by customizing the option
 
 ** Polish, Czech, German, and French translations of Emacs' reference card
 have been added.  They are named `pl-refcard.tex', `cs-refcard.tex',
-`de-refcard.tex' and `fr-refcard.tex'.  Postscript files are included.
+`de-refcard.tex' and `fr-refcard.tex'.  PostScript files are included.
 
 ** An `Emacs Survival Guide', etc/survival.tex, is available.
 
@@ -850,7 +850,7 @@ default).
 *** If Emacs was invoked with the `-q' or `--no-init-file' options, it
 does not allow you to save customizations in your `~/.emacs' init
 file.  This is because saving customizations from such a session would
-wipe out all the other customizationss you might have on your init
+wipe out all the other customizations you might have on your init
 file.
 
 ** If Emacs was invoked with the `-q' or `--no-init-file' options, it
@@ -2189,7 +2189,7 @@ variables are tagged.
 
 *** New language Python: def and class at the beginning of a line are tags.
 
-*** .ss files are Scheme files, .pdb is Postscript with C syntax, .psw is
+*** .ss files are Scheme files, .pdb is PostScript with C syntax, .psw is
 for PSWrap.
 
 ** Changes in etags.el
diff --git a/etc/NEWS.23 b/etc/NEWS.23
index 5b170231bbd..3a222d50d4c 100644
--- a/etc/NEWS.23
+++ b/etc/NEWS.23
@@ -1182,7 +1182,7 @@ run processes remotely.
 matches a regexp.
 
 *** The value of comment-style now defaults to `indent'.
-Thefore, comment-start markers are inserted at the current indentation
+Therefore, comment-start markers are inserted at the current indentation
 of the region to comment, rather than the leftmost column.
 
 *** The new commands `pp-macroexpand-expression' and
@@ -1235,8 +1235,8 @@ details, see the commentary in doc-view.el.
 
 PDF and DVI files are now opened in Doc View mode by default.
 
-In Postcript mode, C-c C-c launches Doc View minor mode for viewing
-the postscript file.
+In PostScript mode, C-c C-c launches Doc View minor mode for viewing
+the PostScript file.
 
 ** EasyPG provides an interface to the GNU Privacy Guard (GnuPG).
 It includes a GnuPG keyring browser, cryptographic operations on
@@ -2102,7 +2102,7 @@ function to use for searching in `query-replace-regexp',
 *** New keymap `search-map' bound to `M-s' provides global bindings
 for search related commands.
 
-*** New keymap `multi-query-replace-map' contains additonal keys bound
+*** New keymap `multi-query-replace-map' contains additional keys bound
 to `automatic-all' and `exit-current' for multi-buffer interactive replacement.
 
 *** The variable `inhibit-changing-match-data', if non-nil, prevents
@@ -2529,4 +2529,3 @@ Local variables:
 mode: outline
 paragraph-separate: "[  ]*$"
 end:
-
diff --git a/etc/NEXTSTEP b/etc/NEXTSTEP
index fcde9727dff..4aa1dca93f2 100644
--- a/etc/NEXTSTEP
+++ b/etc/NEXTSTEP
@@ -38,7 +38,7 @@ meantime.
 Release History
 ---------------
 
-1990-1992       1.0-3.0 (?)     Michael Brouwer's socket/terminal communication 
+1990-1992       1.0-3.0 (?)     Michael Brouwer's socket/terminal communication
                                 based version (GUI ran as a separate process.)
 
 1993/10/25      3.0.1           Last (?) release of Brouwer version.  Supports
@@ -126,7 +126,7 @@ Release History
                                 rendering for synthetic italic fonts.  Further
                                 improved menu parsing.  Use system highlight
                                 color.  Added previous- and next-mark history
-                                navigation commmands bound to M-p,M-n.
+                                navigation commands bound to M-p,M-n.
                                 Miscellaneous bug fixes.
 
 2005/08/04      8.0-rc5         All internal string handling changed to UTF-8.
@@ -146,7 +146,7 @@ Release History
                                 handling now added.  Transparency (e.g., M-x
                                 set-background-color ARGB88FFFFFF) improved:
                                 only the background is made transparent.
-                                Cursor drawing glitches fixed.  Preferences 
+                                Cursor drawing glitches fixed.  Preferences
                                 handling improved.  Fixed some portability
                                 problems on Tiger and Puma.
 
@@ -185,7 +185,7 @@ Release History
                                 rendering, pasting, Color panel.  Added function
                                 ns-set-background-alpha to work around
                                 inability to customize with numeric colors.
-                                
+
 2006/12/24      9.0-rc1         Reworked font handling and text rendering to
                                 use Kenichi Handa's new font back-end system.
                                 Font sets are now supported and automatically
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index e85972f0bfd..57a3387ee40 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -1250,7 +1250,7 @@ be carried out at the same time:
 4) Use lbxproxy on the remote end of the connection.  This is an interface
    to the low bandwidth X extension in most modern X servers, which
    improves performance dramatically, at the slight expense of correctness
-   of the X protocol.  lbxproxy acheives the performance gain by grouping
+   of the X protocol.  lbxproxy achieves the performance gain by grouping
    several X requests in one TCP packet and sending them off together,
    instead of requiring a round-trip for each X request in a separate
    packet.  The switches that seem to work best for emacs are:
diff --git a/etc/TODO b/etc/TODO
index c38b04a681d..aa06f73ee94 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -165,7 +165,7 @@ Change them to use report-emacs-bug.
 like make-backup-file-name-function for non-numeric backup files.
 
 ** `dired-mode' should specify the semantics of `buffer-modified-p' for
-dired buffers and DTRT WRT `auto-revert-mode'. 
+dired buffers and DTRT WRT `auto-revert-mode'.
 
 ** Check uses of prin1 for error-handling.
 http://lists.gnu.org/archive/html/emacs-devel/2008-08/msg00456.html
@@ -325,7 +325,7 @@ typically due to pilot errors and should thus be in debug-ignored-errors.
 
 ** Beefed-up syntax-tables.
 *** recognize multi-character syntactic entities like `begin' and `end'.
-*** nested string-delimiters (for Postscript's (foo(bar)baz) strings).
+*** nested string-delimiters (for PostScript's (foo(bar)baz) strings).
 *** support for infix operators (with precedence).
 *** support for the $ (paired delimiter) in parse-partial-sexp.
 *** support for hook-chars whose effect on the parsing-state is specified
@@ -1043,7 +1043,7 @@ was an error in the namespace URI.
 
 **** Better recovery from ill-formed XML declarations.
 
-*** Useability improvements
+*** Usability improvements
 
 **** Should print a "Parsing..." message during long movements.
 
@@ -1243,4 +1243,3 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
diff --git a/etc/gnus-tut.txt b/etc/gnus-tut.txt
index 80a652ba25f..9132ece533e 100644
--- a/etc/gnus-tut.txt
+++ b/etc/gnus-tut.txt
@@ -188,7 +188,7 @@ remove all hilit code from all the Gnus hooks
 (`gnus-group-prepare-hook', `gnus-summary-prepare-hook' and
 `gnus-summary-article-hook').  (Well, at the very least the first
 two.)  Gnus provides various integrated functions for highlighting,
-which are both faster and more accurated.
+which are both faster and more accurate.
 
 There is absolutely no chance, whatsoever, of getting Gnus to work
 with Emacs 18.  It won't even work on Emacsen older than Emacs
@@ -288,5 +288,3 @@ me the patches, but one can't have everything.
 
 If you have any questions on usage, the "ding@ifi.uio.no" mailing list
 is where to post the questions.
-
-
diff --git a/etc/gnus/news-server.ast b/etc/gnus/news-server.ast
index 432f71a50f0..df0bab4519b 100644
--- a/etc/gnus/news-server.ast
+++ b/etc/gnus/news-server.ast
@@ -7,7 +7,7 @@
 @validate (or (assistant-validate-connect-to-server server port) (y-or-n-p "Do you want to use the server anyway, although you can't confirm it's valid?"))
 @result gnus-select-method (list 'nntp server (list 'nntp-server port))
 @text
-Usenet news is usually read from your Internet service prodider's news
+Usenet news is usually read from your Internet service provider's news
 server.  If you don't know the name of this server, contact your ISP.
 
 As a guess, the name of the server might be news.yourisp.com.
@@ -61,4 +61,3 @@ Password: @variable{user-name}
 @c End:
 
 @c arch tag is missing
-
diff --git a/etc/srecode/test.srt b/etc/srecode/test.srt
index b296f9dc515..d3dad33a5a2 100644
--- a/etc/srecode/test.srt
+++ b/etc/srecode/test.srt
@@ -81,7 +81,7 @@ template gapsomething :blank
 ----
 
 template inlinetext
-"Insert text that has no nelines"
+"Insert text that has no newlines"
 ----
  *In the middle* 
 ----
diff --git a/etc/srecode/wisent.srt b/etc/srecode/wisent.srt
index d45392e93dd..b66a17a4be5 100644
--- a/etc/srecode/wisent.srt
+++ b/etc/srecode/wisent.srt
@@ -55,7 +55,7 @@ goal
 
 %%
 (define-lex wisent-{{TARGETMODE}}-lexer
-  "Lexical analzer to handle {{TARGETMODE}} buffers."
+  "Lexical analyzer to handle {{TARGETMODE}} buffers."
   ;; semantic-lex-newline
   semantic-lex-ignore-whitespace
   semantic-lex-ignore-newline
diff --git a/etc/themes/manoj-dark-theme.el b/etc/themes/manoj-dark-theme.el
index bd6bbaa88a2..b06678636c7 100644
--- a/etc/themes/manoj-dark-theme.el
+++ b/etc/themes/manoj-dark-theme.el
@@ -37,7 +37,7 @@
 ;; (blueish) or mail (greenish), have states (large number of under
 ;; messages, normal, and empty). The large number unread groups have
 ;; highest luminance (appear brighter), and the empty one have lower
-;; luminance (appear greyer), but have the same chroma and saturation.
+;; luminance (appear grayer), but have the same chroma and saturation.
 ;; Sub states and group priorities are rendered using a color series
 ;; which has constant luminance and saturation, and vary in hue by a
 ;; constant separation -- so all the related groups have the same
@@ -52,8 +52,8 @@
 ;; reading mail/USENET.
 
 ;; In the message itself, quoted mail messages from different people
-;; are color coordinated, with high contrast beteen citations that are
-;; close to each other in the heirarchy, so it is less likely that one
+;; are color coordinated, with high contrast between citations that are
+;; close to each other in the hierarchy, so it is less likely that one
 ;; misunderstands who said what in a long conversation.
 
 ;; The following scheme covers programming languages, Gnus, Erc, mail,
diff --git a/etc/tutorials/TUTORIAL.ja b/etc/tutorials/TUTORIAL.ja
index e4917d40987..d50727ceb82 100644
--- a/etc/tutorials/TUTORIAL.ja
+++ b/etc/tutorials/TUTORIAL.ja
@@ -524,7 +524,7 @@ C-_ $B$d(B C-x u $B$O?tCM0z?t$r7+$jJV$72s?t$H2r<a$7$^$9!#(B
 
 >> "foo" $B$H$$$&L>$N%U%!%$%k$r:n$j$^$7$g$&!#(BC-x C-f foo <Return> $B$G$9!#(B
    $B2?$+J8>O$rF~$l!"JT=8$7!"(BC-x C-s $B$G(B "foo" $B$r%;!<%V$7$F2<$5$$!#(B
-   $B:G8e$K(B C-x C-f TUTORIAL.ja <Retrun> $B$H%?%$%W$7(B
+   $B:G8e$K(B C-x C-f TUTORIAL.ja <Return> $B$H%?%$%W$7(B
    $BF~Lg%,%$%I$KLa$j$^$7$g$&!#(B
 
 Emacs $B$O%U%!%$%k$NFbMF$r%P%C%U%!!J(Bbuffer$B!K$H8F$P$l$k$b$N$NCf$K3JG<$7$F(B
@@ -890,7 +890,7 @@ ESC $B$O$=$l<+BN$,0l$D$NJ8;z$G=$>~%-!<$G$O$J$$$+$i$G$9!#(B
 
 >> M-x make-frame <Return> $B$H%?%$%W$7$F!"?7$7$$%U%l!<%`$,I=<($5$l$k$N(B
    $B$r3NG'$7$^$7$g$&!#(B
-   
+
 $B85$N%U%l!<%`$G$d$C$F$$$?$3$H$O$J$s$G$b$3$N?7$7$$%U%l!<%`$G$b$G$-$^$9!#(B
 $B:G=i$N%U%l!<%`$H$=$N8e$K:n$i$l$k%U%l!<%`$G0c$$$O$"$j$^$;$s!#(B
 
@@ -1083,4 +1083,3 @@ GNU Emacs to your friends.  Help stamp out software obstructionism
 ;;; Local Variables:
 ;;; coding: iso-2022-jp
 ;;; End:
-