aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorGlenn Morris2012-07-04 20:06:50 -0700
committerGlenn Morris2012-07-04 20:06:50 -0700
commite8d712837dc25ae863406879a1ea39dba378aded (patch)
tree139045f519b2d84f523db028b93bae7cd151eea6 /doc
parent47187200768305401540094d47531c8b066bff19 (diff)
downloademacs-e8d712837dc25ae863406879a1ea39dba378aded.tar.gz
emacs-e8d712837dc25ae863406879a1ea39dba378aded.zip
* doc/lispref/intro.texi (A Sample Function Description): Fix cross-refs.
Diffstat (limited to 'doc')
-rw-r--r--doc/lispref/ChangeLog4
-rw-r--r--doc/lispref/intro.texi6
2 files changed, 7 insertions, 3 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 2e70ccc026a..bbccdd83b61 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
12012-07-05 Glenn Morris <rgm@gnu.org>
2
3 * intro.texi (A Sample Function Description): Fix cross-refs.
4
12012-07-05 Michael Witten <mfwitten@gmail.com> (tiny change) 52012-07-05 Michael Witten <mfwitten@gmail.com> (tiny change)
2 6
3 * intro.texi (Evaluation Notation, A Sample Function Description) 7 * intro.texi (Evaluation Notation, A Sample Function Description)
diff --git a/doc/lispref/intro.texi b/doc/lispref/intro.texi
index da393751f6f..6dc5991f23d 100644
--- a/doc/lispref/intro.texi
+++ b/doc/lispref/intro.texi
@@ -384,14 +384,14 @@ More generally,
384to an object of that type. A plural of a type (such as @var{buffers}) 384to an object of that type. A plural of a type (such as @var{buffers})
385often means a list of objects of that type. An argument named with the 385often means a list of objects of that type. An argument named with the
386type @var{object} may be bound to an object of any type. 386type @var{object} may be bound to an object of any type.
387(@xref{Lisp Data Types} for a list of Emacs object types.) An argument 387(For a list of Emacs object types, @pxref{Lisp Data Types}.) An argument
388with some other sort of name (e.g., @var{new-file}) is discussed 388with some other sort of name (e.g., @var{new-file}) is discussed
389specifically in the description of the function. In some sections, 389specifically in the description of the function. In some sections,
390features common to the arguments of several functions are described at 390features common to the arguments of several functions are described at
391the beginning. 391the beginning.
392 392
393 @xref{Lambda Expressions} for a more complete description of arguments 393 For a more complete description of arguments modified by
394modified by @code{&optional} and @code{&rest}. 394@code{&optional} and @code{&rest}, @pxref{Lambda Expressions}.
395 395
396 Command, macro, and special form descriptions have the same format, 396 Command, macro, and special form descriptions have the same format,
397but the word `Function' is replaced by `Command', `Macro', or `Special 397but the word `Function' is replaced by `Command', `Macro', or `Special