[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.7-141-g994d87b

[Andy Wingo]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=994d87be35769480b04c9f96085a7a0b41040c9d

The branch, stable-2.0 has been updated
       via  994d87be35769480b04c9f96085a7a0b41040c9d (commit)
      from  183d2ace576710079a2bcf2a8bfcbc39b7d9becc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 994d87be35769480b04c9f96085a7a0b41040c9d
Author: Bake Timmons <address@hidden>
Date:   Sat Mar 2 20:33:56 2013 +0100

    Improve keyword notation of Texinfo function definitions.
    
    * doc/ref/api-debug.texi:
    * doc/ref/api-evaluation.texi:
    * doc/ref/api-modules.texi:
    * doc/ref/compiler.texi:
    * doc/ref/web.texi: Make Texinfo function headers more consistent.
      Change lesser used keyword notation to the predominant form.
    
    * doc/ref/api-procedures.texi: Fix an argument name in a header that should
      use repeated argument notation.
    
    * doc/ref/srfi-modules.texi: Update references in Texinfo function
      definition body to match previously updated variable notation in
      definition header.

-----------------------------------------------------------------------

Summary of changes:
 doc/ref/api-debug.texi      |    6 ++++--
 doc/ref/api-evaluation.texi |   18 ++++++++++++------
 doc/ref/api-modules.texi    |    9 ++++++---
 doc/ref/api-procedures.texi |    6 +++++-
 doc/ref/compiler.texi       |    9 +++++----
 doc/ref/srfi-modules.texi   |    7 ++++---
 doc/ref/web.texi            |   18 ++++++++++++------
 7 files changed, 48 insertions(+), 25 deletions(-)

diff --git a/doc/ref/api-debug.texi b/doc/ref/api-debug.texi
index dd2a3d1..f6c706c 100644
--- a/doc/ref/api-debug.texi
+++ b/doc/ref/api-debug.texi
@@ -1,6 +1,6 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Guile Reference Manual.
address@hidden Copyright (C)  1996, 1997, 2000, 2001, 2002, 2003, 2004, 2007, 
2010, 2011, 2012
address@hidden Copyright (C)  1996, 1997, 2000, 2001, 2002, 2003, 2004, 2007, 
2010, 2011, 2012, 2013
 @c   Free Software Foundation, Inc.
 @c See the file guile.texi for copying conditions.
 
@@ -1175,7 +1175,9 @@ calls to @var{proc}.
 In addition, Guile defines a procedure to call a thunk, tracing all
 procedure calls and returns within the thunk.
 
address@hidden {Scheme Procedure} call-with-trace thunk  #:key (calls? #t) 
(instructions? #f) (width 80) (vm (the-vm))
address@hidden {Scheme Procedure} call-with-trace thunk [#:calls?=#t] @
+                          [#:instructions?=#f] @
+                          [#:width=80] [#:vm=(the-vm)]
 Call @var{thunk}, tracing all execution within its dynamic extent.
 
 If @var{calls?} is true, Guile will print a brief report at each
diff --git a/doc/ref/api-evaluation.texi b/doc/ref/api-evaluation.texi
index 0ffb501..5c932a7 100644
--- a/doc/ref/api-evaluation.texi
+++ b/doc/ref/api-evaluation.texi
@@ -488,7 +488,10 @@ procedure in the default environment, but you really want 
the one from
 (use-modules (ice-9 eval-string))
 @end example
 
address@hidden {Scheme Procedure} eval-string string [module=#f] [file=#f] 
[line=#f] [column=#f] [lang=(current-language)] [compile?=#f]
address@hidden {Scheme Procedure} eval-string string [#:module=#f] [#:file=#f] @
+                          [#:line=#f] [#:column=#f] @
+                          [#:lang=(current-language)] @
+                          [#:compile?=#f]
 Parse @var{string} according to the current language, normally Scheme.
 Evaluate or compile the expressions it contains, in order, returning the
 last expression.
@@ -691,7 +694,9 @@ coding declaration as recognized by @code{file-encoding}
 The compiler can also be invoked directly by Scheme code using the procedures
 below:
 
address@hidden {Scheme Procedure} compile exp [env=#f] 
[from=(current-language)] [to=value] [opts=()]
address@hidden {Scheme Procedure} compile exp [#:env=#f] @
+                          [#:from=(current-language)] @
+                          [#:to=value] [#:opts=()]
 Compile the expression @var{exp} in the environment @var{env}. If
 @var{exp} is a procedure, the result will be a compiled procedure;
 otherwise @code{compile} is mostly equivalent to @code{eval}.
@@ -700,10 +705,11 @@ For a discussion of languages and compiler options, 
@xref{Compiling to
 the Virtual Machine}.
 @end deffn
 
address@hidden {Scheme Procedure} compile-file file [output-file=#f] @
-  [from=(current-language)] [to='objcode] @
-  [env=(default-environment from)] [opts='()] @
-  [canonicalization 'relative]
address@hidden {Scheme Procedure} compile-file file [#:output-file=#f] @
+                          [#:from=(current-language)] [#:to='objcode] @
+                          [#:env=(default-environment from)] @
+                          [#:opts='()] @
+                          [#:canonicalization='relative]
 Compile the file named @var{file}.
 
 Output will be written to a @var{output-file}.   If you do not supply an
diff --git a/doc/ref/api-modules.texi b/doc/ref/api-modules.texi
index 17ab462..b9befc0 100644
--- a/doc/ref/api-modules.texi
+++ b/doc/ref/api-modules.texi
@@ -1,6 +1,6 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Guile Reference Manual.
address@hidden Copyright (C)  1996, 1997, 2000, 2001, 2002, 2003, 2004, 2007, 
2008, 2009, 2010, 2011, 2012
address@hidden Copyright (C)  1996, 1997, 2000, 2001, 2002, 2003, 2004, 2007, 
2008, 2009, 2010, 2011, 2012, 2013
 @c   Free Software Foundation, Inc.
 @c See the file guile.texi for copying conditions.
 
@@ -827,7 +827,8 @@ the time @var{thunk}'s dynamic extent was last entered) is 
restored.  If
 saved, and the previously saved inner module is set current again.
 @end deffn
 
address@hidden {Scheme Procedure} resolve-module name [autoload=#t] 
[version=#f] [#:ensure=#t]
address@hidden {Scheme Procedure} resolve-module name [autoload=#t] 
[version=#f] @
+                          [#:ensure=#t]
 @deffnx {C Function} scm_resolve_module (name)
 Find the module named @var{name} and return it.  When it has not already
 been defined and @var{autoload} is true, try to auto-load it.  When it
@@ -837,7 +838,9 @@ that the resulting module is compatible with the given 
version reference
 (@pxref{R6RS Version References}).  The name is a list of symbols.
 @end deffn
 
address@hidden {Scheme Procedure} resolve-interface name [#:select=#f] 
[#:hide='()] [#:select=()] [#:prefix=#f] [#:renamer] [#:version=#f]
address@hidden {Scheme Procedure} resolve-interface name [#:select=#f] @
+                          [#:hide='()] [#:prefix=#f] @
+                          [#:renamer=#f] [#:version=#f]
 Find the module named @var{name} as with @code{resolve-module} and
 return its interface.  The interface of a module is also a module
 object, but it contains only the exported bindings.
diff --git a/doc/ref/api-procedures.texi b/doc/ref/api-procedures.texi
index bef3386..38ae1bb 100644
--- a/doc/ref/api-procedures.texi
+++ b/doc/ref/api-procedures.texi
@@ -333,7 +333,11 @@ cheaply, without allocating a rest list.
 @code{lambda*} is like @code{lambda}, except with some extensions to
 allow optional and keyword arguments.
 
address@hidden {library syntax} lambda* (address@hidden @* [#:optional 
address@hidden @* [#:key  address@hidden [#:allow-other-keys]] @* [#:rest var | 
. var]) @* body
address@hidden {library syntax} lambda* (address@hidden @* @
+                        [#:optional address@hidden @* @
+                        [#:key  address@hidden [#:allow-other-keys]] @* @
+                        [#:rest var | . var]) @* @
+                        body1 body2 @dots{}
 @sp 1
 Create a procedure which takes optional and/or keyword arguments
 specified with @code{#:optional} and @code{#:key}.  For example,
diff --git a/doc/ref/compiler.texi b/doc/ref/compiler.texi
index 0fe75e3..4008140 100644
--- a/doc/ref/compiler.texi
+++ b/doc/ref/compiler.texi
@@ -53,10 +53,11 @@ Languages are registered in the module, @code{(system base 
language)}:
 They are registered with the @code{define-language} form.
 
 @deffn {Scheme Syntax} define-language @
-name title reader printer @
-[parser=#f] [compilers='()] [decompilers='()] [evaluator=#f] @
-[joiner=#f] [for-humans?=#t] @
-[make-default-environment=make-fresh-user-module]
+                       [#:name] [#:title] [#:reader] [#:printer] @
+                       [#:parser=#f] [#:compilers='()] @
+                       [#:decompilers='()] [#:evaluator=#f] @
+                       [#:joiner=#f] [#:for-humans?=#t] @
+                       [#:make-default-environment=make-fresh-user-module]
 Define a language.
 
 This syntax defines a @code{#<language>} object, bound to @var{name}
diff --git a/doc/ref/srfi-modules.texi b/doc/ref/srfi-modules.texi
index dff8ca9..af1afc0 100644
--- a/doc/ref/srfi-modules.texi
+++ b/doc/ref/srfi-modules.texi
@@ -3429,9 +3429,10 @@ Note that all fields of @var{type} and its supertypes 
must be specified.
 @end deffn
 
 @deffn {Scheme Procedure} make-compound-condition condition1 condition2 @dots{}
-Return a new compound condition composed of @var{conditions}.  The
-returned condition has the type of each condition of @var{conditions}
-(per @code{condition-has-type?}).
+Return a new compound condition composed of @var{condition1}
address@hidden @enddots{}.  The returned condition has the type of
+each condition of condition1 condition2 @dots{} (per
address@hidden).
 @end deffn
 
 @deffn {Scheme Procedure} condition-has-type? c type
diff --git a/doc/ref/web.texi b/doc/ref/web.texi
index 6c33f32..ae387ce 100644
--- a/doc/ref/web.texi
+++ b/doc/ref/web.texi
@@ -1615,7 +1615,9 @@ and body, and write the response to the client.  Return 
the new state
 produced by the handler procedure.
 @end deffn
 
address@hidden {Scheme Procedure} run-server handler [impl='http] 
[open-params='()] . state
address@hidden {Scheme Procedure} run-server handler @
+                          [impl='http] [open-params='()] @
+                          arg @dots{}
 Run Guile's built-in web server.
 
 @var{handler} should be a procedure that takes two or more arguments,
@@ -1627,16 +1629,20 @@ For examples, skip ahead to the next section, @ref{Web 
Examples}.
 The response and body will be run through @code{sanitize-response}
 before sending back to the client.
 
-Additional arguments to @var{handler} are taken from @var{state}.
-Additional return values are accumulated into a new @var{state}, which
-will be used for subsequent requests.  In this way a handler can
-explicitly manage its state.
+Additional arguments to @var{handler} are taken from @var{arg}
address@hidden  These arguments comprise a @dfn{state}.  Additional return
+values are accumulated into a new state, which will be used for
+subsequent requests.  In this way a handler can explicitly manage its
+state.
 @end deffn
 
 The default web server implementation is @code{http}, which binds to a
 socket, listening for request on that port.
 
address@hidden {HTTP Implementation} http [#:host=#f] [#:family=AF_INET] 
[#:addr=INADDR_LOOPBACK] [#:port 8080] [#:socket]
address@hidden {HTTP Implementation} http [#:host=#f] @
+                             [#:family=AF_INET] @
+                             [#:addr=INADDR_LOOPBACK] @
+                             [#:port 8080] [#:socket]
 The default HTTP implementation.  We document it as a function with
 keyword arguments, because that is precisely the way that it is -- all
 of the @var{open-params} to @code{run-server} get passed to the


hooks/post-receive
-- 
GNU Guile