summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2010-05-03 18:01:23 -0400
committerChong Yidong <cyd@stupidchicken.com>2010-05-03 18:01:23 -0400
commitda0bbbc4e336566be28cc99dce4b155d4a9a194f (patch)
treeb8acdd7660e1ce746fdec7dc0c73fc87564f5c29 /doc
parentf034e1762ba3824627494e479a47189ec62db6d1 (diff)
downloademacs-da0bbbc4e336566be28cc99dce4b155d4a9a194f.tar.gz
Fix typos (Bug#6094). From Štěpán Němec.
Diffstat (limited to 'doc')
-rw-r--r--doc/emacs/ChangeLog7
-rw-r--r--doc/emacs/mark.texi2
-rw-r--r--doc/emacs/mini.texi2
-rw-r--r--doc/emacs/misc.texi2
-rw-r--r--doc/emacs/programs.texi2
-rw-r--r--doc/lispref/ChangeLog9
-rw-r--r--doc/lispref/edebug.texi2
-rw-r--r--doc/lispref/loading.texi2
-rw-r--r--doc/lispref/locals.texi6
-rw-r--r--doc/lispref/maps.texi2
-rw-r--r--doc/lispref/minibuf.texi2
-rw-r--r--doc/lispref/tips.texi2
-rw-r--r--doc/lispref/windows.texi4
-rw-r--r--doc/misc/ChangeLog6
-rw-r--r--doc/misc/cl.texi2
-rw-r--r--doc/misc/message.texi4
-rw-r--r--doc/misc/url.texi6
17 files changed, 42 insertions, 20 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index b2fc399c1df..3030466f7fe 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,10 @@
+2010-05-03 Štěpán Němec <stepnem@gmail.com> (tiny change)
+
+ * programs.texi (Man Page):
+ * misc.texi (Invoking emacsclient):
+ * mini.texi (Repetition):
+ * mark.texi (Setting Mark): Fix typos.
+
2010-04-25 Chong Yidong <cyd@stupidchicken.com>
* misc.texi (Printing): Document htmlfontify-buffer.
diff --git a/doc/emacs/mark.texi b/doc/emacs/mark.texi
index 217d5b1b06d..4d6b38ad713 100644
--- a/doc/emacs/mark.texi
+++ b/doc/emacs/mark.texi
@@ -80,7 +80,7 @@ Set the mark at point if the mark is inactive, then move point.
character in @acronym{ASCII}; usually, typing @kbd{C-@key{SPC}} on a
text terminal gives the character @kbd{C-@@}. This key is also bound
to @code{set-mark-command}, so unless you are unlucky enough to have
-an text terminal that behaves differently, you might as well think of
+a text terminal that behaves differently, you might as well think of
@kbd{C-@@} as @kbd{C-@key{SPC}}.}. This sets the mark where point is,
and activates it. You can then move point away, leaving the mark
behind.
diff --git a/doc/emacs/mini.texi b/doc/emacs/mini.texi
index 41943e5502d..1726a6780d5 100644
--- a/doc/emacs/mini.texi
+++ b/doc/emacs/mini.texi
@@ -601,7 +601,7 @@ repetition. If you type just @key{RET}, that repeats the command
unchanged. You can also change the command by editing the Lisp
expression before you execute it. The repeated command is added to
the front of the command history unless it is identical to the most
-recently item.
+recent item.
Once inside the minibuffer for @kbd{C-x @key{ESC} @key{ESC}}, you can
use the minibuffer history commands (@kbd{M-p}, @kbd{M-n}, @kbd{M-r},
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index df39a7d2291..8c89c7b7a27 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -1528,7 +1528,7 @@ still use Emacs to edit the file.
@kbd{C-x #} (@code{server-edit}) in its buffer. This saves the file
and sends a message back to the @command{emacsclient} program, telling
it to exit. Programs that use @env{EDITOR} usually wait for the
-``editor''---in the case @command{emacsclient}---to exit before doing
+``editor''---in this case @command{emacsclient}---to exit before doing
something else.
You can also call @command{emacsclient} with multiple file name
diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi
index 72aa8ff121a..72541eccc6f 100644
--- a/doc/emacs/programs.texi
+++ b/doc/emacs/programs.texi
@@ -1202,7 +1202,7 @@ completion based on the list of manual pages that are installed on
your machine; the list of available manual pages is computed
automatically the first time you invoke @code{woman}. The word at
point in the current buffer is used to suggest the default for the
-name the manual page.
+name of the manual page.
With a numeric argument, @kbd{M-x woman} recomputes the list of the
manual pages used for completion. This is useful if you add or delete
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index e3028f26c07..e331a3d5df0 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,12 @@
+2010-05-03 Štěpán Němec <stepnem@gmail.com> (tiny change)
+
+ * windows.texi (Textual Scrolling):
+ * tips.texi (Coding Conventions):
+ * minibuf.texi (Minibuffer History):
+ * maps.texi (Standard Keymaps):
+ * loading.texi (Where Defined):
+ * edebug.texi (Instrumenting): Fix typos.
+
2010-04-25 Chong Yidong <cyd@stupidchicken.com>
* keymaps.texi (Menu Bar): Document :advertised-binding property.
diff --git a/doc/lispref/edebug.texi b/doc/lispref/edebug.texi
index c68b342c5e6..fba83980cd1 100644
--- a/doc/lispref/edebug.texi
+++ b/doc/lispref/edebug.texi
@@ -186,7 +186,7 @@ instrument any top-level form regardless of the values of
While Edebug is active, the command @kbd{I}
(@code{edebug-instrument-callee}) instruments the definition of the
-function or macro called by the list form after point, if is not already
+function or macro called by the list form after point, if it is not already
instrumented. This is possible only if Edebug knows where to find the
source for that function; for this reason, after loading Edebug,
@code{eval-region} records the position of every definition it
diff --git a/doc/lispref/loading.texi b/doc/lispref/loading.texi
index ec10c51b236..7e3240d72de 100644
--- a/doc/lispref/loading.texi
+++ b/doc/lispref/loading.texi
@@ -823,7 +823,7 @@ without extension.
@code{load-history}.
@defvar load-history
-This value of this variable is an alist that associates the names of
+The value of this variable is an alist that associates the names of
loaded library files with the names of the functions and variables
they defined, as well as the features they provided or required.
diff --git a/doc/lispref/locals.texi b/doc/lispref/locals.texi
index 1414387e409..25bbc6f02b5 100644
--- a/doc/lispref/locals.texi
+++ b/doc/lispref/locals.texi
@@ -85,6 +85,9 @@ Minor mode variables will not be listed here.
@item case-fold-search
@xref{Searching and Case}.
+@item comment-column
+@xref{Comments,,, emacs, The GNU Emacs Manual}.
+
@item ctl-arrow
@xref{Usual Display}.
@@ -94,9 +97,6 @@ Minor mode variables will not be listed here.
@item cursor-type
@xref{Cursor Parameters}.
-@item comment-column
-@xref{Comments,,, emacs, The GNU Emacs Manual}.
-
@item default-directory
@xref{File Name Expansion}.
diff --git a/doc/lispref/maps.texi b/doc/lispref/maps.texi
index 232d38d63c0..a5b126afcb2 100644
--- a/doc/lispref/maps.texi
+++ b/doc/lispref/maps.texi
@@ -163,7 +163,7 @@ search.
@item key-translation-map
A keymap for translating keys. This one overrides ordinary key
-bindings, unlike @code{local- function-key-map}. @xref{Translation
+bindings, unlike @code{local-function-key-map}. @xref{Translation
Keymaps}.
@item kmacro-map
diff --git a/doc/lispref/minibuf.texi b/doc/lispref/minibuf.texi
index d01d4d1ef26..66b4cb096cc 100644
--- a/doc/lispref/minibuf.texi
+++ b/doc/lispref/minibuf.texi
@@ -511,7 +511,7 @@ set to a non-@code{nil} value.
@defopt history-length
The value of this variable specifies the maximum length for all
history lists that don't specify their own maximum lengths. If the
-value is @code{t}, that means there no maximum (don't delete old
+value is @code{t}, that means there is no maximum (don't delete old
elements). The value of @code{history-length} property of the history
list variable's symbol, if set, overrides this variable for that
particular history list.
diff --git a/doc/lispref/tips.texi b/doc/lispref/tips.texi
index bea513df044..c1f1423dabf 100644
--- a/doc/lispref/tips.texi
+++ b/doc/lispref/tips.texi
@@ -90,7 +90,7 @@ Put a call to @code{provide} at the end of each separate Lisp file.
If a file requires certain other Lisp programs to be loaded
beforehand, then the comments at the beginning of the file should say
so. Also, use @code{require} to make sure they are loaded.
-x@xref{Named Features}.
+@xref{Named Features}.
@item
If a file @var{foo} uses a macro defined in another file @var{bar},
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index 0e1062a622f..de7ebbc405e 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -1661,8 +1661,8 @@ point should be placed from the bottom of the window; thus, as with
@end defopt
@defopt scroll-step
-This variable is an older variant of @code{scroll-conservatively}. The
-difference is that it if its value is @var{n}, that permits scrolling
+This variable is an older variant of @code{scroll-conservatively}.
+The difference is that if its value is @var{n}, that permits scrolling
only by precisely @var{n} lines, not a smaller number. This feature
does not work with @code{scroll-margin}. The default value is zero.
@end defopt
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 89c24185949..eac91977f31 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-03 Štěpán Němec <stepnem@gmail.com> (tiny change)
+
+ * url.texi (HTTP language/coding, Customization):
+ * message.texi (Header Commands, Responses):
+ * cl.texi (Argument Lists): Fix typos.
+
2010-04-18 Chong Yidong <cyd@stupidchicken.com>
* ede.texi (EDE Mode): Refer to init file rather than `.emacs'. Note
diff --git a/doc/misc/cl.texi b/doc/misc/cl.texi
index 84f9b67b938..39561341b0d 100644
--- a/doc/misc/cl.texi
+++ b/doc/misc/cl.texi
@@ -356,7 +356,7 @@ is defined is automatically proclaimed @code{inline}, i.e.,
calls to it may be expanded into in-line code by the byte compiler.
This is analogous to the @code{defsubst} form;
@code{defsubst*} uses a different method (compiler macros) which
-works in all version of Emacs, and also generates somewhat more
+works in all versions of Emacs, and also generates somewhat more
efficient inline expansions. In particular, @code{defsubst*}
arranges for the processing of keyword arguments, default values,
etc., to be done at compile-time whenever possible.
diff --git a/doc/misc/message.texi b/doc/misc/message.texi
index 6f509b5ed5d..1667c5ca503 100644
--- a/doc/misc/message.texi
+++ b/doc/misc/message.texi
@@ -659,7 +659,7 @@ address from @code{To:} and @code{Cc:} headers.
@findex message-insert-disposition-notification-to
Insert a request for a disposition
notification. (@code{message-insert-disposition-notification-to}).
-This means that if the recipient support RFC 2298 she might send you a
+This means that if the recipient supports RFC 2298 she might send you a
notification that she received the message.
@item M-x message-insert-importance-high
@@ -2387,7 +2387,7 @@ consulted, in turn:
@item wide reply
A @dfn{wide reply} is a mail response that includes @emph{all} entities
-mentioned in the message you are responded to. All mailboxes from the
+mentioned in the message you are responding to. All mailboxes from the
following headers will be concatenated to form the outgoing
@code{To}/@code{Cc} headers:
diff --git a/doc/misc/url.texi b/doc/misc/url.texi
index c9c0d320ac2..ea7f3211f52 100644
--- a/doc/misc/url.texi
+++ b/doc/misc/url.texi
@@ -313,7 +313,7 @@ encoding of documents which servers may honor. For each of these
variables, the value is a string; it can specify a single choice, or
it can be a comma-separated list.
-Normally this list ordered by descending preference. However, each
+Normally, this list is ordered by descending preference. However, each
element can be followed by @samp{;q=@var{priority}} to specify its
preference level, a decimal number from 0 to 1; e.g., for
@code{url-mime-language-string}, @w{@code{"de, en-gb;q=0.8,
@@ -1120,11 +1120,11 @@ general operation of the package.
@defopt url-debug
@cindex debugging
-Specifies the types of debug messages the library which are logged to
+Specifies the types of debug messages which are logged to
the @code{*URL-DEBUG*} buffer.
@code{t} means log all messages.
A number means log all messages and show them with @code{message}.
-If may also be a list of the types of messages to be logged.
+It may also be a list of the types of messages to be logged.
@end defopt
@defopt url-personal-mail-address
@end defopt