More interbranch doc syncing.

diff --git a/doc/ref/ChangeLog b/doc/ref/ChangeLog
index a2e3a22..df31323 100644 (file)
--- a/doc/ref/ChangeLog
+++ b/doc/ref/ChangeLog
@@ -1,5 +1,11 @@
 2002-08-08  Neil Jerram  <neil@ossau.uklinux.net>
 
+       * gh.texi (Data types and constants defined by gh): Avoid
+       generating index entry for SCM.
+
+       * posix.texi (Runtime Environment): Remove duplicate doc for
+       setenv.
+
        * data-rep.texi, scheme-memory.texi, scheme-modules.texi: Merge
        recent updates from stable branch.
 

diff --git a/doc/ref/gh.texi b/doc/ref/gh.texi
index 1cadc16..f362f69 100644 (file)
--- a/doc/ref/gh.texi
+++ b/doc/ref/gh.texi
@@ -97,13 +97,10 @@ interpreter, you will have to add more libraries.
 
 The following C constants and data types are defined in gh:
 
-@deftp {Data type} SCM
-This is a C data type used to store all Scheme data, no matter what the
+@code{SCM} is a C data type used to store all Scheme data, no matter what the
 Scheme type.  Values are converted between C data types and the SCM type
 with utility functions described below (@pxref{Converting data between C
 and Scheme}).  [FIXME: put in references to Jim's essay and so forth.]
-@end deftp
-@cindex SCM data type
 
 @defvr Constant SCM_BOOL_T
 @defvrx Constant SCM_BOOL_F

diff --git a/doc/ref/posix.texi b/doc/ref/posix.texi
index f43eb14..dcac9d9 100644 (file)
--- a/doc/ref/posix.texi
+++ b/doc/ref/posix.texi
@@ -1120,7 +1120,6 @@ value is @code{#f} unless a string of the form @code{NAME=VALUE} is
 found, in which case the string @code{VALUE} is returned.
 @end deffn
 
-@c begin (scm-doc-string "boot-9.scm" "setenv")
 @deffn {Scheme Procedure} setenv name value
 Modifies the environment of the current process, which is
 also the default environment inherited by child processes.
@@ -1133,6 +1132,11 @@ to the environment, replacing any existing string with name matching
 The return value is unspecified.
 @end deffn
 
+@deffn {Scheme Procedure} unsetenv name
+Remove variable @var{name} from the environment.  The
+name can not contain a @samp{=} character.
+@end deffn
+
 @deffn {Scheme Procedure} environ [env]
 @deffnx {C Function} scm_environ (env)
 If @var{env} is omitted, return the current environment (in the
@@ -1159,15 +1163,6 @@ be removed.
 The return value is unspecified.
 @end deffn
 
-@deffn {Scheme Procedure} setenv name value
-Give the environment variable @var{name} the value @var{value}.  The
-name can not contain a @samp{=} character.
-@end deffn
-
-@deffn {Scheme Procedure} unsetenv name
-Remove variable @var{name} from the environment.  The
-name can not contain a @samp{=} character.
-@end deffn
 
 @node Processes
 @section Processes