summaryrefslogtreecommitdiff
path: root/doc/emacs
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2014-10-03 23:35:55 -0700
committerGlenn Morris <rgm@gnu.org>2014-10-03 23:35:55 -0700
commitfc7db7066bc611ce95fc44492371dea6a8a3e5bd (patch)
treefccabc881fc8dcc0e0590d0b2ef66bd76f3b4aa9 /doc/emacs
parentb7529d917a6552f91a08519e5c25a9807f58fd17 (diff)
downloademacs-fc7db7066bc611ce95fc44492371dea6a8a3e5bd.tar.gz
Small doc/ fixes re @var usage.
* doc/emacs/cmdargs.texi (Misc X): * doc/emacs/display.texi (Optional Mode Line): * doc/emacs/misc.texi (emacsclient Options): * doc/emacs/vc1-xtra.texi (VC Delete/Rename): * doc/lispref/buffers.texi (Buffer List): * doc/lispref/display.texi (Image Descriptors, Defining Images): * doc/lispref/functions.texi (Core Advising Primitives): Small fixes re @var usage.
Diffstat (limited to 'doc/emacs')
-rw-r--r--doc/emacs/ChangeLog5
-rw-r--r--doc/emacs/cmdargs.texi4
-rw-r--r--doc/emacs/display.texi4
-rw-r--r--doc/emacs/misc.texi4
-rw-r--r--doc/emacs/vc1-xtra.texi2
5 files changed, 12 insertions, 7 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index c0bd8979631..a712d26fa28 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,5 +1,10 @@
2014-10-04 Glenn Morris <rgm@gnu.org>
+ * cmdargs.texi (Misc X):
+ * display.texi (Optional Mode Line):
+ * misc.texi (emacsclient Options):
+ * vc1-xtra.texi (VC Delete/Rename): Small fixes re @var usage.
+
* killing.texi (Rectangles): Copyedits re rectangle-mark-mode.
(CUA Bindings): Mention rectangle-mark-mode.
diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi
index 3443f0b1627..b438281b2a2 100644
--- a/doc/emacs/cmdargs.texi
+++ b/doc/emacs/cmdargs.texi
@@ -1106,8 +1106,8 @@ rectangle containing the frame's title.
@c Enable horizontal scroll bars. Since horizontal scroll bars
@c are not yet implemented, this actually does nothing.
-@item --parent-id @var{ID}
-Open Emacs as a client X window via the XEmbed protocol, with @var{ID}
+@item --parent-id @var{id}
+Open Emacs as a client X window via the XEmbed protocol, with @var{id}
as the parent X window id. Currently, this option is mainly useful
for developers.
diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi
index bdcb185a5f3..0a77e722d32 100644
--- a/doc/emacs/display.texi
+++ b/doc/emacs/display.texi
@@ -1245,11 +1245,11 @@ Size Indication mode. The size will be displayed immediately
following the buffer percentage like this:
@example
-@var{POS} of @var{SIZE}
+@var{pos} of @var{size}
@end example
@noindent
-Here @var{SIZE} is the human readable representation of the number of
+Here @var{size} is the human readable representation of the number of
characters in the buffer, which means that @samp{k} for 10^3, @samp{M}
for 10^6, @samp{G} for 10^9, etc., are used to abbreviate.
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index f09f23e6a4b..09e606fe2fe 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -1610,9 +1610,9 @@ all server buffers are finished. You can take as long as you like to
edit the server buffers within Emacs, and they are @emph{not} killed
when you type @kbd{C-x #} in them.
-@item --parent-id @var{ID}
+@item --parent-id @var{id}
Open an @command{emacsclient} frame as a client frame in the parent X
-window with id @var{ID}, via the XEmbed protocol. Currently, this
+window with id @var{id}, via the XEmbed protocol. Currently, this
option is mainly useful for developers.
@item -q
diff --git a/doc/emacs/vc1-xtra.texi b/doc/emacs/vc1-xtra.texi
index 07f956c488d..dd52d97780d 100644
--- a/doc/emacs/vc1-xtra.texi
+++ b/doc/emacs/vc1-xtra.texi
@@ -113,7 +113,7 @@ Prompt for a file name, delete the file from the working tree, and
schedule the deletion for committing.
@item M-x vc-rename-file
-Prompt for two file names, @var{VAR} and @var{OLD}, rename them in the
+Prompt for two file names, @var{var} and @var{old}, rename them in the
working tree, and schedule the renaming for committing.
@end table