summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2013-12-08 16:33:27 +0100
committerJuanma Barranquero <lekktu@gmail.com>2013-12-08 16:33:27 +0100
commit36291308801eefe5c04280c32d4b247bf7aa984e (patch)
tree9d6034dcd49506ae4333794ef32edadb7860cfdc
parentb3e42b7083e6d13701179e22774b4803b1054392 (diff)
downloademacs-36291308801eefe5c04280c32d4b247bf7aa984e.tar.gz
Fix typos in doc files (bug#16089).
* emacs/msdog.texi (Windows Keyboard): Fix typo. * lispref/display.texi (Progress, Face Remapping): * lispref/processes.texi (Serial Ports): * lispref/windows.texi (Recombining Windows): Fix typos. * misc/dbus.texi (Properties and Annotations): Fix typo.
-rw-r--r--doc/emacs/ChangeLog4
-rw-r--r--doc/emacs/msdog.texi2
-rw-r--r--doc/lispref/ChangeLog6
-rw-r--r--doc/lispref/display.texi4
-rw-r--r--doc/lispref/processes.texi2
-rw-r--r--doc/lispref/windows.texi2
-rw-r--r--doc/misc/ChangeLog4
-rw-r--r--doc/misc/dbus.texi2
8 files changed, 20 insertions, 6 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index cf37ab25199..5da37003152 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2013-12-08 Juanma Barranquero <lekktu@gmail.com>
+
+ * msdog.texi (Windows Keyboard): Fix typo.
+
2013-11-30 Glenn Morris <rgm@gnu.org>
* Makefile.in (distclean): Remove Makefile.
diff --git a/doc/emacs/msdog.texi b/doc/emacs/msdog.texi
index 0f01958b51c..5fbf2e45e4a 100644
--- a/doc/emacs/msdog.texi
+++ b/doc/emacs/msdog.texi
@@ -482,7 +482,7 @@ the variable @code{w32-alt-is-meta} to a @code{nil} value.
@kbd{Alt-@key{TAB}}, for its own use. These key combinations are
intercepted by the system before Emacs can see them. You can use the
@code{w32-register-hot-key} function to allow a key sequence to be
-seen by Emacs instead of being grabbed by Windows. This functions
+seen by Emacs instead of being grabbed by Windows. This function
registers a key sequence as a @dfn{hot key}, overriding the special
meaning of that key sequence for Windows. (MS-Windows is told that
the key sequence is a hot key only when one of the Emacs windows has
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index f4f036f33ad..d2173793d00 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,9 @@
+2013-12-08 Juanma Barranquero <lekktu@gmail.com>
+
+ * display.texi (Progress, Face Remapping):
+ * processes.texi (Serial Ports):
+ * windows.texi (Recombining Windows): Fix typos. (Bug#16089)
+
2013-12-04 Juri Linkov <juri@jurta.org>
* searching.texi (Search and Replace): Fix `unread-command-events'
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index eeede08ecd9..c6eeaf9c6a8 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -439,7 +439,7 @@ that it prints a message in the echo area unconditionally.
The first two arguments have the same meaning as for
@code{progress-reporter-update}. Optional @var{new-message} allows
-you to change the message of the @var{reporter}. Since this functions
+you to change the message of the @var{reporter}. Since this function
always updates the echo area, such a change will be immediately
presented to the user.
@end defun
@@ -2683,7 +2683,7 @@ and @code{face-remap-reset-base} functions; it is intended for major
modes to remap faces in the buffers they control.
@defun face-remap-add-relative face &rest specs
-This functions adds the face spec in @var{specs} as relative
+This function adds the face spec in @var{specs} as relative
remappings for face @var{face} in the current buffer. The remaining
arguments, @var{specs}, should form either a list of face names, or a
property list of attribute/value pairs.
diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi
index 1181244a974..880d5fff598 100644
--- a/doc/lispref/processes.texi
+++ b/doc/lispref/processes.texi
@@ -2613,7 +2613,7 @@ Here is an example:
@cindex stopbits, in serial connections
@cindex flowcontrol, in serial connections
-This functions configures a serial port connection. Arguments are
+This function configures a serial port connection. Arguments are
specified as keyword/argument pairs. Attributes that are not given
are re-initialized from the process's current configuration (available
via the function @code{process-contact}), or set to reasonable default
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index 661860025f3..673351005fb 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -1164,7 +1164,7 @@ vertical combination @var{W1}.
@cindex window combination limit
@defun set-window-combination-limit window limit
-This functions sets the @dfn{combination limit} of the window
+This function sets the @dfn{combination limit} of the window
@var{window} to @var{limit}. This value can be retrieved via the
function @code{window-combination-limit}. See below for its effects;
note that it is only meaningful for internal windows. The
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 5a7b301d5b0..83e681990aa 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
+2013-12-08 Juanma Barranquero <lekktu@gmail.com>
+
+ * dbus.texi (Properties and Annotations): Fix typo.
+
2013-12-06 Bastien Guerry <bzg@gnu.org>
* org.texi: Don't include Emacs version within Org's version.
diff --git a/doc/misc/dbus.texi b/doc/misc/dbus.texi
index 1e887e02a30..a6155e2e724 100644
--- a/doc/misc/dbus.texi
+++ b/doc/misc/dbus.texi
@@ -760,7 +760,7 @@ If there are no properties, @code{nil} is returned. Example:
@end defun
@defun dbus-get-all-managed-objects bus service path
-This functions returns all objects at @var{bus}, @var{service},
+This function returns all objects at @var{bus}, @var{service},
@var{path}, and the children of @var{path}. The result is a list of
objects. Every object is a cons of an existing path name, and the
list of available interface objects. An interface object is another