X-Git-Url: https://git.distorted.org.uk/~mdw/sod/blobdiff_plain/0a8f78ec333b8193d1155b5839aea67bb62cf480..713c49900fb0b323eb6d1b57e5737f677ffcbb20:/doc/misc.tex

diff --git a/doc/misc.tex b/doc/misc.tex
index 859ec51..353c948 100644
--- a/doc/misc.tex
+++ b/doc/misc.tex
@@ -84,7 +84,7 @@ of these are standard.
   If a @<value-form> is omitted, then the value of the corresponding @<var>
   is used.  It is conventional usage for a macro to wrap @|once-only| around
   its body so as to convert the arguments which it should evaluate into safe
-  gensyms capturing their runtime values.  (Not that the simple expansion
+  gensyms capturing their runtime values.  (Note that the simple expansion
   given above can't do this correctly.)  A bare symbol may be written in
   place of a singleton list.
 \end{describe}
@@ -138,11 +138,11 @@ These locatives can't usefully be compared.  It should be possible to compare
 true locatives, such that two locatives compare equal if and only if they
 refer to the same place; but that doesn't work for these locatives.
 
-\begin{describe}{cls}{loc}
+\begin{describe}{cls}{locative}
   The type of locative objects.
 \end{describe}
 
-\begin{describe}{fun}{locp @<object> @> @<generalized-boolean>}
+\begin{describe}{fun}{locativep @<object> @> @<generalized-boolean>}
   Return non-nil if and only if @<object> is a locative.
 \end{describe}
 
@@ -184,7 +184,7 @@ refer to the same place; but that doesn't work for these locatives.
 
 An anaphoric macro implicitly binds a well-known name to a value of interest,
 in the course of doing something else.  The concept was popularized by Paul
-Graham \cite{FIXME:OnLisp}.
+Graham \cite{graham-1993:on-lisp}.
 
 The macros described here all bind the variable @|it|.
 
@@ -192,10 +192,11 @@ The macros described here all bind the variable @|it|.
   The symbol @|it| is exported by the @|sod-utilities| package.
 \end{describe}
 
-\begin{describe}{mac}{aif @<condition> @<consequent> @[@<alt>@] @> @<value>^*}
+\begin{describe}{mac}
+    {aif @<condition> @<consequent> @[@<alternative>@] @> @<value>^*}
   Evaluate the @<condition>.  If @<condition> is non-nil, then bind @|it| to
   the resulting value and evaluate the @<consequent>, returning all of its
-  values.  Otherwise, evaluate @<alt>, returning all of its values.
+  values.  Otherwise, evaluate @<alternative>, returning all of its values.
 \end{describe}
 
 \begin{describe}{mac}{aand @<form>^* @> @<value>^*}
@@ -256,9 +257,16 @@ metaobject protocol.
 \begin{describe}{gf}{instance-initargs @<instance> @> @<initargs-list>}
   Return a fresh list of plausible initargs for the given @<instance>.
 
-  This is done by digging through the instance's class's slot definitions and
-  enquiring about their initargs.  Initargs which are handled by methods on
-  @|shared-initialize| or similar generic functions won't be discovered.
+  The default method should work for most classes, but may be overridden to
+  cope with special effects.
+
+  \begin{describe}{meth}{standard-object}
+      {instance-initargs (@<instance> standard-object) @> @<initargs-list>}
+    The default method works by digging through the instance's class's slot
+    definitions and enquiring about their initargs.  Initargs which are
+    handled by methods on @|shared-initialize| or similar generic functions
+    won't be discovered.
+  \end{describe}
 \end{describe}
 
 \begin{describe*}
@@ -275,18 +283,24 @@ metaobject protocol.
   that generic function.
 
   The default method on @|copy-instance-using-class| should work for most
-  classes, but may be overridden to cope with special effects.  It works as
-  follows.
-  \begin{enumerate}
-  \item Allocate a fresh instance of @<class>, using @|allocate-instance|.
-  \item For each slot defined by @<class>, if that slot is bound in the
-    original instance, then set the corresponding slot in the new instance to
-    the same value.
-  \item Call @|shared-initialize| on the new instance, providing it the given
-    list of @<initargs>, but inhibiting the usual initialization of slots
-    from their initforms.
-  \item Return the new instance.
-  \end{enumerate}
+  classes, but may be overridden to cope with special effects.
+
+  \begin{describe}{meth}{standard-class}
+    {copy-instance-using-class \=(@<class> standard-class) @<instance> \\
+                               \>\&rest initargs
+        \nlret @<new-instance>}
+    The default method works as follows.
+    \begin{enumerate}
+    \item Allocate a fresh instance of @<class>, using @|allocate-instance|.
+    \item For each slot defined by @<class>, if that slot is bound in the
+      original instance, then set the corresponding slot in the new instance
+      to the same value.
+    \item Call @|shared-initialize| on the new instance, providing it the
+      given list of @<initargs>, but inhibiting the usual initialization of
+      slots from their initforms.
+    \item Return the new instance.
+    \end{enumerate}
+  \end{describe}
 \end{describe*}
 
 \begin{describe*}
