summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/emacs/ChangeLog3
-rw-r--r--doc/emacs/msdog.texi2
-rw-r--r--doc/lispref/spellfile1
-rw-r--r--doc/misc/ada-mode.texi2
-rw-r--r--doc/misc/cc-mode.texi2
-rw-r--r--doc/misc/faq.texi4
-rw-r--r--doc/misc/newsticker.texi16
7 files changed, 14 insertions, 16 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 9d78b7f948a..b796acd8b39 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1239,7 +1239,8 @@
2010-03-27 Nick Roberts <nickrob@snap.net.nz>
- doc/emacs/building.texi: Describe restored GDB/MI fuctionality removed by 2009-12-29T07:15:34Z!nickrob@snap.net.nz.
+ doc/emacs/building.texi: Describe restored GDB/MI functionality
+ removed by 2009-12-29T07:15:34Z!nickrob@snap.net.nz.
doc/emacs/emacs.texi: Update node names for building.texi.
2010-03-24 Glenn Morris <rgm@gnu.org>
diff --git a/doc/emacs/msdog.texi b/doc/emacs/msdog.texi
index 0e72c4737bd..bbaf31ade85 100644
--- a/doc/emacs/msdog.texi
+++ b/doc/emacs/msdog.texi
@@ -322,7 +322,7 @@ default value is @code{(links uid gid)} i.e.@: all the 3 optional
attributes are displayed.
@vindex ls-lisp-emulation
- The variable @code{ls-lisp-emulation} controls the flavour of the
+ The variable @code{ls-lisp-emulation} controls the flavor of the
@code{ls} emulation by setting the defaults for the 3 options
described above: @code{ls-lisp-ignore-case},
@code{ls-lisp-dirs-first}, and @code{ls-lisp-verbosity}. The value of
diff --git a/doc/lispref/spellfile b/doc/lispref/spellfile
index f8e136f6bd9..e66dcc88f71 100644
--- a/doc/lispref/spellfile
+++ b/doc/lispref/spellfile
@@ -331,7 +331,6 @@ for'
formfeed
forms'
forw
-forwa
found'
frob
from'
diff --git a/doc/misc/ada-mode.texi b/doc/misc/ada-mode.texi
index 49f455b4e41..374158c2c78 100644
--- a/doc/misc/ada-mode.texi
+++ b/doc/misc/ada-mode.texi
@@ -1357,7 +1357,7 @@ specifies the casing of one word or word fragment. Comments may be
included, separated from the word by a space.
If the word starts with an asterisk (@key{*}), it defines the casing
-af a word fragemnt (or ``substring''); part of a word between two
+af a word fragment (or ``substring''); part of a word between two
underscores or word boundary.
For example:
diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi
index a4d377ebdce..55c2c4c0ae8 100644
--- a/doc/misc/cc-mode.texi
+++ b/doc/misc/cc-mode.texi
@@ -1173,7 +1173,7 @@ Full details on how these minor modes work are at @ref{Electric Keys},
and @ref{Indentation Engine Basics}.
You can toggle each of these minor modes on and off, and you can
-configure @ccmode{} so that it starts up with your favourite
+configure @ccmode{} so that it starts up with your favorite
combination of them (@pxref{Sample .emacs File}). By default, when
you initialize a buffer, electric mode and syntactic-indentation mode
are enabled but the other two modes are disabled.
diff --git a/doc/misc/faq.texi b/doc/misc/faq.texi
index 7528abca58d..262c3d734fe 100644
--- a/doc/misc/faq.texi
+++ b/doc/misc/faq.texi
@@ -80,7 +80,7 @@ Emacs, the Emacs manual is often the best starting point.
@ifnottex
@insertcopying
-@end ifnottex
+@end ifnottex
@menu
* FAQ notation::
@@ -368,7 +368,7 @@ only be known if and when a judge rules on its validity and scope.
There has never been a copyright infringement case involving the GPL to
set any precedents. Although legal actions have been brought against
companies for violating the terms of the GPL, so far all have been
-settled out of court (in favour of the plaintiffs). Please take any
+settled out of court (in favor of the plaintiffs). Please take any
discussion regarding this issue to the newsgroup
@uref{news:gnu.misc.discuss}, which was created to hold the extensive
flame wars on the subject.
diff --git a/doc/misc/newsticker.texi b/doc/misc/newsticker.texi
index c7d82245973..18e11aeeeb3 100644
--- a/doc/misc/newsticker.texi
+++ b/doc/misc/newsticker.texi
@@ -52,7 +52,7 @@ developing GNU and promoting software freedom.''
@node Top
@top Newsticker
-@insertcopying
+@insertcopying
@end ifnottex
@@ -112,9 +112,9 @@ enclosed files (as delivered by podcasts, e.g.).
Here are screen shots of the @uref{newsticker-1.7.png, version 1.7
(current version)} and some older screen shots:
@uref{newsticker-1.6.png, version 1.6},
-@uref{newsticker-1.5.png, version 1.5},
+@uref{newsticker-1.5.png, version 1.5},
@uref{newsticker-1.4.png, version 1.4}
-@uref{newsticker-1.3.png, version 1.3},
+@uref{newsticker-1.3.png, version 1.3},
@uref{newsticker-1.0.png, version 1.0}.
@end ifhtml
@@ -163,7 +163,7 @@ You can choose between two different frontends for reading headlines:
@item Newsticker's @emph{treeview} uses separate windows for the
feeds (in tree form), a list of headlines for the current feed, and
the content of the current headline. Feeds can be placed into groups
-which itself can be placed in groups and so on.
+which itself can be placed in groups and so on.
@item Newsticker's @emph{plainview} displays all headlines in a
single buffer, called @samp{*newsticker*}. The modeline in the
@samp{*newsticker*} buffer informs whenever new headlines have
@@ -171,7 +171,7 @@ arrived.
@end itemize
In both views clicking mouse-button 2 or pressing RET on a headline
will call @code{browse-url} to load the corresponding news story in
-your favourite web browser.
+your favorite web browser.
@findex newsticker-start-ticker
@findex newsticker-stop-ticker
@@ -205,7 +205,7 @@ and some of the most important options.
@item
@code{newsticker-retrieval} contains options that define which news
-feeds are retrieved and how this is done.
+feeds are retrieved and how this is done.
@itemize
@item
@@ -241,7 +241,7 @@ automatically mark headlines as immortal or old.
@item
@code{newsticker-hooks} contains options for hooking other Emacs
-commands to newsticker functions.
+commands to newsticker functions.
@itemize
@item
@vindex newsticker-new-item-functions
@@ -313,5 +313,3 @@ Byte-compiling newsticker.el is recommended.
@printindex cp
@bye
-
-