summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2016-11-15 19:18:28 -0500
committerGlenn Morris <rgm@gnu.org>2016-11-15 19:18:28 -0500
commit1fc101b0c4009e664c102b896e8d510f4821e754 (patch)
treedaecaba55163f5ae51c1491161824cfd8c87b2b8
parent91aa5d19237fa54ff28abaa2ec07627b52e76a7f (diff)
downloademacs-1fc101b0c4009e664c102b896e8d510f4821e754.tar.gz
Don't confuse how Texinfo outputs @var with the input
* doc/emacs/rmail.texi (Movemail): * doc/lispref/control.texi (Pattern matching case statement): * doc/lispref/frames.texi (Size and Position): * doc/lispref/processes.texi (Asynchronous Processes): * doc/lispref/text.texi (Document Object Model): * doc/lispref/windows.texi (Coordinates and Windows): Do not upper-case the argument of @var.
-rw-r--r--doc/emacs/rmail.texi12
-rw-r--r--doc/lispref/control.texi2
-rw-r--r--doc/lispref/frames.texi6
-rw-r--r--doc/lispref/processes.texi2
-rw-r--r--doc/lispref/text.texi2
-rw-r--r--doc/lispref/windows.texi4
6 files changed, 14 insertions, 14 deletions
diff --git a/doc/emacs/rmail.texi b/doc/emacs/rmail.texi
index a8cf5e4a512..84f1296484a 100644
--- a/doc/emacs/rmail.texi
+++ b/doc/emacs/rmail.texi
@@ -1425,7 +1425,7 @@ local mailbox.
@end table
@noindent
-@var{Proto} can be one of:
+@var{proto} can be one of:
@table @code
@item mbox
@@ -1434,12 +1434,12 @@ Usual Unix mailbox format. In this case, neither @var{user} nor
of the mailbox file, e.g., @code{mbox://var/spool/mail/smith}.
@item mh
-A local mailbox in the @acronym{MH} format. @var{User} and
-@var{pass} are not used. @var{Host-or-file-name} denotes the name of
+A local mailbox in the @acronym{MH} format. @var{user} and
+@var{pass} are not used. @var{host-or-file-name} denotes the name of
@acronym{MH} folder, e.g., @code{mh://Mail/inbox}.
@item maildir
-A local mailbox in the @acronym{maildir} format. @var{User} and
+A local mailbox in the @acronym{maildir} format. @var{user} and
@var{pass} are not used, and @var{host-or-file-name} denotes the name of
@code{maildir} mailbox, e.g., @code{maildir://mail/inbox}.
@@ -1448,14 +1448,14 @@ Any local mailbox format. Its actual format is detected automatically
by @code{movemail}.
@item pop
-A remote mailbox to be accessed via POP3 protocol. @var{User}
+A remote mailbox to be accessed via POP3 protocol. @var{user}
specifies the remote user name to use, @var{pass} may be used to
specify the user password, @var{host-or-file-name} is the name or IP
address of the remote mail server to connect to; e.g.,
@code{pop://smith:guessme@@remote.server.net}.
@item imap
-A remote mailbox to be accessed via IMAP4 protocol. @var{User}
+A remote mailbox to be accessed via IMAP4 protocol. @var{user}
specifies the remote user name to use, @var{pass} may be used to
specify the user password, @var{host-or-file-name} is the name or IP
address of the remote mail server to connect to;
diff --git a/doc/lispref/control.texi b/doc/lispref/control.texi
index 0c0827909a3..947c54f9c35 100644
--- a/doc/lispref/control.texi
+++ b/doc/lispref/control.texi
@@ -368,7 +368,7 @@ UPattern. For example:
@item (app @var{function} @var{upattern})
Matches if @var{function} applied to the value being matched returns a
value that matches @var{upattern}. This is like the @code{pred}
-UPattern, except that it tests the result against @var{UPattern},
+UPattern, except that it tests the result against @var{upattern},
rather than against a boolean truth value. The @var{function} call can
use one of the forms described below.
@item (or @var{upattern1} @var{upattern2}@dots{})
diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi
index ea7da088398..ec344c726ce 100644
--- a/doc/lispref/frames.texi
+++ b/doc/lispref/frames.texi
@@ -772,9 +772,9 @@ origin at the position (0, 0) of the frame's display. On a text
terminal frame both values are zero.
@end defun
-@defun set-frame-position frame X Y
-This function sets the outer frame position of @var{frame} to @var{X}
-and @var{Y}. The latter arguments specify pixels and normally count
+@defun set-frame-position frame x y
+This function sets the outer frame position of @var{frame} to @var{x}
+and @var{y}. The latter arguments specify pixels and normally count
from an origin at the position (0, 0) of @var{frame}'s display.
A negative parameter value positions the right edge of the outer frame
diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi
index 9c4f8ca18e5..950dc9c6d49 100644
--- a/doc/lispref/processes.texi
+++ b/doc/lispref/processes.texi
@@ -642,7 +642,7 @@ I/O, file-name-coding-system}).
If @var{coding} is @code{nil}, the default rules for finding the
coding system will apply. @xref{Default Coding Systems}.
-@item :connection-type @var{TYPE}
+@item :connection-type @var{type}
Initialize the type of device used to communicate with the subprocess.
Possible values are @code{pty} to use a pty, @code{pipe} to use a
pipe, or @code{nil} to use the default derived from the value of the
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index f37f75f0c7b..b6635ddb0a0 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -4572,7 +4572,7 @@ Return all nodes in @var{dom} that have IDs that match @var{match},
which is a regular expression.
@item dom-strings @var{dom}
-Return all strings in @var{DOM}.
+Return all strings in @var{dom}.
@end table
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index 5b7bb0f4a9c..a9965a116c3 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -3999,14 +3999,14 @@ This function returns the pixel edges of @var{window}'s body. Calling
the origin of the display screen rather than that of the frame:
@defun window-absolute-pixel-edges &optional window
-This function returns the pixel coordinates of @var{WINDOW} relative to
+This function returns the pixel coordinates of @var{window} relative to
an origin at (0, 0) of the display of @var{window}'s frame. Calling
@code{(window-absolute-pixel-edges)} is equivalent to calling
@code{(window-edges window nil t t)}, see above.
@end defun
@defun window-absolute-body-pixel-edges &optional window
-This function returns the pixel coordinates of @var{WINDOW}'s body
+This function returns the pixel coordinates of @var{window}'s body
relative to an origin at (0, 0) of the display of @var{window}'s frame.
Calling @code{(window-absolute-body-pixel-edges window)} is equivalent
to calling @code{(window-edges window t t t)}, see above.