Change overarching structure of info document.

6 files changed, 34 insertions, 25 deletions

diff --git a/doc/ref/guile.texi b/doc/ref/calp-prime.texi
index 1e8d44fd..89decb1b 100644
--- a/doc/ref/guile.texi
+++ b/doc/ref/calp-prime.texi
@@ -1,21 +1,7 @@
-@node Guile
-@chapter Guile
-
-@include guile/datetime.texi
-@include guile/zic.texi
-@include guile/srfi-41.texi
-@include guile/util.texi
-@include guile/util-path.texi
-@include guile/util-config.texi
-@include guile/util-exceptions.texi
-@include guile/base64.texi
-@include guile/xdg-basedir.texi
-@include guile/web.texi
-@include guile/vcomponent.texi
+@node Calp as a Program
+@chapter Calp as a Program
+
 @include guile/translation.texi
-@include guile/glob.texi
-@include guile/graphviz.texi
-@include guile/crypto.texi
 
 @node Errors and Conditions
 @section Errors and Conditions
diff --git a/doc/ref/calp.texi b/doc/ref/calp.texi
index b9e8723d..c0a7f3cd 100644
--- a/doc/ref/calp.texi
+++ b/doc/ref/calp.texi
@@ -64,8 +64,11 @@ text @footnote{Improvements welcome}
 @c * Index::
 @c @end menu
 
-@include guile.texi
+@include calp-prime.texi
 @include entry-points.texi
+@include general.texi
+@include vcomponent.texi
+@include web.texi
 @include text.texi
 @include vulgar.texi
 
diff --git a/doc/ref/general.texi b/doc/ref/general.texi
new file mode 100644
index 00000000..0b54205a
--- /dev/null
+++ b/doc/ref/general.texi
@@ -0,0 +1,15 @@
+@node Generally Useful Utilities
+@chapter Generally Useful Utilities
+
+@include guile/datetime.texi
+@include guile/zic.texi
+@include guile/srfi-41.texi
+@include guile/util.texi
+@include guile/util-path.texi
+@include guile/util-config.texi
+@include guile/util-exceptions.texi
+@include guile/base64.texi
+@include guile/xdg-basedir.texi
+@include guile/glob.texi
+@include guile/graphviz.texi
+@include guile/crypto.texi
diff --git a/doc/ref/guile/util.texi b/doc/ref/guile/util.texi
index e7accf90..d4dce3a6 100644
--- a/doc/ref/guile/util.texi
+++ b/doc/ref/guile/util.texi
@@ -1,8 +1,5 @@
-@node General Utilities
-@section General Utilities
-
 @node Miscellaneous utilities
-@subsection Miscellaneous utilities
+@section Miscellaneous utilities
 
 Provided by the module @code{(hnh util)}.
 
@@ -362,7 +359,7 @@ last.
 @end defmac
 
 @node UUIDs
-@subsection UUID generation
+@section UUID generation
 
 Provided by module @code{(hnh util uuid)}.
 
@@ -380,7 +377,7 @@ this module. Only set this when you want non-random randomness.
 @end deftp
 
 @node IO operations
-@subsection IO
+@section IO
 
 Provided by module @code{(hnh util io)}.
 
@@ -412,7 +409,7 @@ Open file at path, and return its content as a string.
 @end defun
 
 @node Binary Search Tree
-@subsection Binary Search Tree
+@section Binary Search Tree
 
 A simple ``read only'' binary search tree.
 
diff --git a/doc/ref/vcomponent.texi b/doc/ref/vcomponent.texi
new file mode 100644
index 00000000..0aa7806c
--- /dev/null
+++ b/doc/ref/vcomponent.texi
@@ -0,0 +1,4 @@
+@node VComponents
+@chapter VComponents
+
+@include guile/vcomponent.texi
diff --git a/doc/ref/web.texi b/doc/ref/web.texi
new file mode 100644
index 00000000..342b6852
--- /dev/null
+++ b/doc/ref/web.texi
@@ -0,0 +1,4 @@
+@node Webservers and -Clients
+@chapter Webservers and -Clients
+
+@include guile/web.texi