diff options
author | Andy Wingo <wingo@pobox.com> | 2012-01-10 00:41:42 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2012-01-10 00:41:42 +0100 |
commit | 91ee7515da0bad91330ce5c87b250d6cf12a2789 (patch) | |
tree | ce023c92c0d9bf895c1265b107b270c35ba59b94 /doc/sources | |
parent | 0bdd43515eb3c62839512181cf33e5aea383e661 (diff) | |
parent | 0e947e1d14597651c5762a4209225c472bdaef45 (diff) | |
download | guile-91ee7515da0bad91330ce5c87b250d6cf12a2789.tar.gz |
Merge remote-tracking branch 'origin/stable-2.0'
Conflicts:
libguile/__scm.h
libguile/array-map.c
libguile/procprop.c
libguile/tags.h
module/ice-9/deprecated.scm
module/ice-9/psyntax-pp.scm
module/ice-9/psyntax.scm
test-suite/standalone/test-num2integral.c
test-suite/tests/regexp.test
Diffstat (limited to 'doc/sources')
-rw-r--r-- | doc/sources/env.texi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/sources/env.texi b/doc/sources/env.texi index a3efce2e2..7a37b768b 100644 --- a/doc/sources/env.texi +++ b/doc/sources/env.texi @@ -21,7 +21,7 @@ [[add refs for all conditions signalled]] @ifinfo -Copyright 1999, 2006 Free Software Foundation, Inc. +Copyright 1999, 2006, 2012 Free Software Foundation, Inc. @end ifinfo @titlepage @@ -204,7 +204,7 @@ can implement any module system you like, as long as its efforts produce an environment object the interpreter can consult. Finally, environments may prove a convenient way for Guile to access the -features of other systems. For example, one might export the The GIMP's +features of other systems. For example, one might export The GIMP's Procedural Database to Guile as a custom environment type; this environment could create Scheme procedure objects corresponding to GIMP procedures, as the user referenced them. |