* doc/pmacros.texi: Fix .substr typo to .substring.

	Mention that .sym expansions are not further expanded.

diff --git a/ChangeLog b/ChangeLog
index cb49fd87b5a7c30565eec7c3d67f05b5873ecf8d..0e90b1f4d7348972a4ba70b41689039860c6b3fd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-28  Hans-Peter Nilsson  <hp@axis.com>
+
+       * doc/pmacros.texi: Fix .substr typo to .substring.
+       Mention that .sym expansions are not further expanded.
+
 2002-01-22  Graydon Hoare  <graydon@redhat.com>
 
        * desc-cpu.scm (ifld-number-cache): Add.

diff --git a/doc/pmacros.texi b/doc/pmacros.texi
index dc5b476aa1d0e76851553c0b9f4f4ea810485f40..58e86e1875a952aec26b724ed2128cfe36ff079c 100644 (file)
--- a/doc/pmacros.texi
+++ b/doc/pmacros.texi
@@ -21,7 +21,7 @@ Preprocessor macros provide a way of simplifying the writing of
 * Convert a number to a hex::     The @code{.hex} builtin
 * Convert a string to uppercase:: The @code{.upcase} builtin
 * Convert a string to lowercase:: The @code{.downcase} builtin
-* Getting part of a string::      The @code{.substr} builtin
+* Getting part of a string::      The @code{.substring} builtin
 * List splicing::                 The @code{.splice} builtin
 * Number generation::             The @code{.iota} builtin
 * Mapping a macro over a list::   The @code{.map} builtin
@@ -144,7 +144,8 @@ Acceptable arguments are symbols, strings, and numbers.
 The result is a symbol with the arguments concatenated together.
 Numbers are converted to a string, base 10, and then to a symbol.
 The result must be a valid Scheme symbol with the additional restriction
-that the first character must be a letter.
+that the first character must be a letter.  The result is not further
+expanded, regardless of whether there's a macro by that name.
 
 @node String concatenation
 @section String concatenation
@@ -222,11 +223,11 @@ Example:
 
 @node Getting part of a string
 @section Getting part of a string
-@cindex .substr
+@cindex .substring
 
-Extract a part of a string with @code{.substr}.
+Extract a part of a string with @code{.substring}.
 
-Syntax: @code{(.substr string start end)}
+Syntax: @code{(.substring string start end)}
 
 where @samp{start} is the starting character, and @samp{end} is one past
 the ending character.  Character numbering begins at position 0.
@@ -236,7 +237,7 @@ string is returned.
 Example:
 
 @smallexample
-(.substr "howzitgoineh?" 2 6) --> "wzit"
+(.substring "howzitgoineh?" 2 6) --> "wzit"
 @end smallexample
 
 @node List splicing