Merge branch 'master' into wip-manual-2
authorNeil Jerram <neil@ossau.uklinux.net>
Sat, 10 Apr 2010 12:32:42 +0000 (13:32 +0100)
committerNeil Jerram <neil@ossau.uklinux.net>
Sat, 10 Apr 2010 12:32:42 +0000 (13:32 +0100)
commit26b9f9090073c896762af3125af54958e153f8f2
tree11c799f1191ef122c66329c36d6b03230c6962ef
parent3ce5e1304bd77eb167f856a2a163038f01f452c8
parent96ec2c9c65468b1404865371d19342d6badb0be9
Merge branch 'master' into wip-manual-2

Conflicts:

doc/ref/api-procedures.texi
doc/ref/misc-modules.texi

(Caused by me removing `@page' from a couple of sections that have been modified
by others.)
16 files changed:
doc/ref/Makefile.am
doc/ref/api-compound.texi
doc/ref/api-control.texi
doc/ref/api-data.texi
doc/ref/api-debug.texi
doc/ref/api-evaluation.texi
doc/ref/api-i18n.texi
doc/ref/api-io.texi
doc/ref/api-modules.texi
doc/ref/api-options.texi
doc/ref/api-procedures.texi
doc/ref/guile.texi
doc/ref/intro.texi
doc/ref/libguile-concepts.texi
doc/ref/misc-modules.texi
doc/ref/srfi-modules.texi