* Consolidate authorship information in AUTHORS file.

* Simplify THANKS file and add in recent contributors.
* Add top level menu entry for Manual Conventions node.
* Consolidate notes at beginning of guile.texi.

doc/AUTHORS

@@ -1,12 +1,73 @@
-The Guile reference and tutorial manuals were written and edited
+@c This file is in -*-texinfo-*- mode because it gets @included by
-largely by Mark Galassi and Jim Blandy.  Significant portions were
+@c the top level Texinfo source files for each manual in this
-contributed by Gary Houston and Tim Pierce.
+@c distribution.  We do this so as to avoid having to maintain
+@c authorship information in more than one place.
 
-Tom Lord contributed a great deal of material with early Guile
+@ifset guile
-snapshots; although most of this text has been rewritten, all of it
-was important, and much of the structure remains.
 
-Aubrey Jaffer wrote the SCM Scheme implementation and manual upon
+@c The Guile reference and tutorial manuals were written and edited
-which the Guile program and manual are based.  Some portions of the
+@c largely by Mark Galassi and Jim Blandy.
-SCM and SLIB manuals have been included here verbatim.
 
+@c Significant portions were contributed by Gary Houston (contributions
+@c to posix system calls and networking, expect, I/O internals and
+@c extensions, slib installation, error handling) and Tim Pierce
+@c (sections on script interpreter triggers, alists, function tracing).
+
+@c Tom Lord contributed a great deal of material with early Guile
+@c snapshots; although most of this text has been rewritten, all of it
+@c was important, and much of the structure remains.
+
+@c Aubrey Jaffer wrote the SCM Scheme implementation and manual upon
+@c which the Guile program and manual are based.  Some portions of the
+@c SCM and SLIB manuals have been included here verbatim.
+
+@c Since Guile 1.4, Neil Jerram has been maintaining and improving the
+@c reference manual.  Among other contributions, he wrote the Basic
+@c Ideas chapter, developed the tools for keeping the manual in sync
+@c with snarfed libguile docstrings, and reorganized the structure so as
+@c to accommodate docstrings for all Guile's primitives.
+
+@author Mark Galassi
+@author Cygnus Solution and Los Alamos National Laboratory
+@author @email{rosalia@@cygnus.com}
+@author
+@author Jim Blandy
+@author Free Software Foundation and MIT AI Lab
+@author @email{jimb@@red-bean.com}
+@author
+@author Gary Houston
+@author @email{ghouston@@arglist.com}
+@author
+@author Tim Pierce
+@author @email{twp@@skepsis.com}
+@author
+@author Neil Jerram
+@author @email{neil@@ossau.uklinux.net}
+
+@end ifset
+
+@ifset guile-tut
+
+@author Mark Galassi
+@author Cygnus Solutions and Los Alamos National Laboratory
+@author @email{rosalia@@nis.lanl.gov}
+
+@end ifset
+
+@ifset goops
+
+@c The GOOPS tutorial was written by Christian Lynbech and Mikael
+@c Djurfeldt, who also wrote GOOPS itself.  The GOOPS reference manual
+@c and MOP documentation were written by Neil Jerram and reviewed by
+@c Mikael Djurfeldt.
+
+@author Christian Lynbech
+@author @email{chl@@tbit.dk}
+@author
+@author Mikael Djurfeldt
+@author @email{djurfeldt@@nada.kth.se}
+@author
+@author Neil Jerram
+@author @email{neil@@ossau.uklinux.net}
+
+@end ifset

doc/ChangeLog

@@ -1,3 +1,16 @@
+2001-04-29  Neil Jerram  <neil@ossau.uklinux.net>
+
+	* guile.texi (Top): Add menu entry for Manual Conventions node.
+	
+2001-04-28  Neil Jerram  <neil@ossau.uklinux.net>
+
+	* THANKS: Move authorship bit into AUTHORS, simplify structure,
+	add Dirk Herrmann.
+
+	* AUTHORS, guile.texi, guile-tut.texi, goops.texi, Makefile.am:
+	Consolidate authorship information in AUTHORS file, and @include
+	AUTHORS from the top level source file for each manual.
+
 2001-04-28  Thien-Thi Nguyen  <ttn@revel.glug.org>
 
 	* preface.texi (Manual Conventions): New chapter.

doc/Makefile.am

@@ -35,9 +35,11 @@ guile_TEXINFOS = preface.texi intro.texi scheme-intro.texi \
 	scheme-reading.texi scheme-indices.texi slib.texi posix.texi \
 	expect.texi scsh.texi tcltk.texi scripts.texi gh.texi scm.texi \
 	appendices.texi indices.texi script-getopt.texi data-rep.texi \
-	extend.texi srfi-13-14.texi
+	extend.texi srfi-13-14.texi AUTHORS
 
-goops_TEXINFOS = goops-tutorial.texi hierarchy.eps hierarchy.txt
+guile_tut_TEXINFOS = guile-tut.texi AUTHORS
+
+goops_TEXINFOS = goops-tutorial.texi hierarchy.eps hierarchy.txt AUTHORS
 
 # Optionally support building an HTML version of the reference manual.
 

doc/THANKS

@@ -1,21 +1,18 @@
-The Guile reference manual:
+Many thanks to the following people for contributing to the Guile
-- Mark Galassi, for general stewardship
+manuals!
-- Tim Pierce, for writing sections on script interpreter triggers, alists,
-  function tracing, and splitting the manual into its own module.
-- Gary Houston, contributions to posix system calls and networking,
-  expect, I/O internals and extensions, slib installation, error handling.
 
-Proofreading, bug reports and bug fixes from:
+Proofreading, bug reports and patches from:
+    Chris Bitmead
    Marcus Daniels
+     Dirk Herrmann
+  Dale P. Smith
+    Steve Tell
       Lee Thomas
+    Masao Uebayashi
      Joel Weber
     Keith Wright
-    Chris Bitmead
-  Dale P. Smith
-    Masao Uebayashi
 
 New entries from:
       Per Bothner
-
+   Martin Grabmueller
-Build patches from:
+Thien Thi Nguyen
-    Steve Tell

doc/guile.texi

@@ -3,90 +3,30 @@
 @c %**start of header
 @setfilename guile.info
 @settitle Guile Reference Manual
+@set guile
 @c %**end of header
 
-@c Neil's notes:
+@c Notes: (distilled from Jim's and Tim's notes, and kept up to date)
-
+@c
-@c This file started life as a copy of guile-ref.texi, which I then
+@c Remember to use "primitive" whereever appropriate.
-@c modified to reflect the organization described in
-@c sources/jimb-org.texi.
-
-@c Jim's notes:
-
-@c Remember to use "subr" whereever appropriate.
-@c Actually, use "primitive", not "subr."  Why coin a new term?
 @c FIXME: gotta change existing "subr" uses to "Primitive".
-@c In my text for the Guile snarfer, I've used the term "subr" to denote
+@c [JimB:] In my text for the Guile snarfer, I've used the term "subr"
-@c a C function made available to the Scheme world as a function.  This
+@c to denote a C function made available to the Scheme world as a
-@c terminology is weird, but consistent with the function names and also
+@c function.  This terminology is weird, but consistent with the
-@c with Emacs Lisp, which I assume takes Maclisp's lead.
+@c function names and also with Emacs Lisp, which I assume takes
-
+@c Maclisp's lead.
-@c Tim's notes:
+@c
-
 @c When adding a new function to the Guile manual, please document
 @c it with @deffn as one of `primitive', `procedure', or `syntax'.
 @c
-@c The following Guile primitives are not documented.  We have a lot
+@c For a list of Guile primitives that are not yet incorporated into the
-@c of work to do.
+@c reference manual, see the file `new-docstrings.texi', which holds all
-@c
+@c the docstrings snarfed from the libguile C sources for primitives
-@c   arbiters.c: make-arbiter, try-arbiter, release-arbiter
+@c that are not in the reference manual.  If you have worked with some
-@c   async.c: async, async-mark, system-async, system-async-mark,
+@c of these concepts, implemented them, or just happen to know what they
-@c      run-asyncs, noop, set-tick-rate, set-switch-rate,
+@c do, please write up a little explanation -- it would be a big help.
-@c      unmask-signals, mask-signals
+@c Alternatively, if you know of a great reason why some of these should
-@c   backtrace.c: backtrace, display-error, display-application,
+@c *not* go in the manual, please let me know. 
-@c      display-backtrace
-@c   chars.c: char-is-both?
-@c   debug.c: single-step, memoized?, unmemoize, memoized-environment,
-@c      procedure-name, procedure-source, procedure-environment,
-@c      local-eval, debug-object?, debug-hang
-@c   dynl.c: c-registered-modules, c-clear-registered-modules,
-@c      dynamic-link, dynamic-object?, dynamic-unlink, dynamic-func,
-@c      dynamic-call, dynamic-args-call
-@c   eval.c: procedure->syntax, procedure->macro, procedure->memoizing-macro,
-@c      macro-name, macro-transformer
-@c   fluids.c: make-fluid, fluid?, fluid-ref, fluid-set, with-fluids*
-@c   gc.c: map-free-list, unhash-name
-@c   kw.c: make-keyword-from-dash-symbol
-@c   net_db.c: sethost, setnet, setproto, setserv
-@c   print.c: current-pstate
-@c   procs.c: make-cclo, closure?, thunk?
-@c   read.c: read-hash-extend
-@c   readline.c: readline, add-history
-@c   srcprop.c: source-properties, set-source-properties!,
-@c      source-property, set-source-property!
-@c   stacks.c: make-stack, stack-ref, stack-length,
-@c      frame?, last-stack-frame, frame-number, frame-source,
-@c      frame-procedure, frame-arguments, frame-previous, frame-next,
-@c      frame-real?, frame-procedure?, frame-evaluating-args?,
-@c      frame-overflow
-@c   struct.c: struct-vtable-tag
-@c   symbols.c: builtin-weak-bindings
-@c   tag.c: tag
-@c   threads.c: single-active-thread?, yield, call-with-new-thread,
-@c      make-condition-variable, wait-condition-variable,
-@c      signal-condition-variable
-@c   throw.c: lazy-catch, vector-set-length!
-@c   unif.c: uniform-vector-ref, uniform-array-set1!
-@c   variable.c: make-variable, make-undefined-variable, variable?,
-@c      variable-ref, variable-set!, builtin-variable, variable-bound?
-@c   weaks.c: make-weak-vector, weak-vector, list->weak-vector,
-@c      weak-vector? make-weak-key-hash-table,
-@c      make-weak-value-hash-table, make-doubly-weak-hash-table,
-@c      weak-key-hash-table?, weak-value-hash-table?,
-@c      doubly-weak-hash-table?
-@c
-@c If you have worked with some of these concepts, implemented them,
-@c or just happen to know what they do, please write up a little
-@c explanation -- it would be a big help.  Alternatively, if you
-@c know of a great reason why some of these should *not* go in the
-@c manual, please let me know.
-@c
-@c The following functions are currently left undocumented for various reasons.
-@c   * should be documented in a section on debugging or Guile internals:
-@c       ports.c: pt-size, pt-member
-@c       eval.c: apply:nconc2last
-@c
-@c Thanks. -twp
 
 @c Define indices that are used in the Guile Scheme part of the
 @c reference manual to group stuff according to whether it is R5RS or a
@@ -140,24 +80,10 @@ by the Free Software Foundation.
 @sp 10
 @comment The title is printed in a large font.
 @title Guile Reference Manual
-@subtitle $Id: guile.texi,v 1.6 2001-04-28 09:00:31 ossau Exp $
+@subtitle $Id: guile.texi,v 1.7 2001-04-28 23:38:52 ossau Exp $
 @subtitle For use with Guile @value{VERSION}
-@author Mark Galassi
+@include AUTHORS
-@author Cygnus Solution and Los Alamos National Laboratory
+
-@author @email{rosalia@@cygnus.com}
-@author
-@author Jim Blandy
-@author Free Software Foundation and MIT AI Lab
-@author @email{jimb@@red-bean.com}
-@author
-@author Gary Houston
-@author @email{ghouston@@arglist.com}
-@author
-@author Tim Pierce
-@author @email{twp@@skepsis.com}
-@author
-@author Neil Jerram
-@author @email{neil@@ossau.uklinux.net}
 @c The following two commands start the copyright page.
 @page
 @vskip 0pt plus 1filll
@@ -207,6 +133,7 @@ Preface
 
 * Guile License::               Conditions for copying and using Guile.
 * Manual Layout::               How to read the rest of this manual.
+* Manual Conventions::          Conventional terminology.
 
 Part I: Introduction to Guile