Move around info nodes.

6 files changed, 19 insertions, 17 deletions

diff --git a/doc/ref/calp.texi b/doc/ref/calp.texi
index 5815d922..d54bce22 100644
--- a/doc/ref/calp.texi
+++ b/doc/ref/calp.texi
@@ -67,6 +67,7 @@ text @footnote{Improvements welcome}
 @include calp-prime.texi
 @include entry-points.texi
 @include general.texi
+@include webdav.texi
 @include vcomponent.texi
 @include web.texi
 @include text.texi
diff --git a/doc/ref/general.texi b/doc/ref/general.texi
index a6fce4e7..a2fc2ca3 100644
--- a/doc/ref/general.texi
+++ b/doc/ref/general.texi
@@ -26,7 +26,4 @@ of these should be generally useful in any project.
 @include general/util-type.texi
 @include general/util-object.texi
 @include general/lens.texi
-@include general/data-formats.texi
-@include general/data-stores.texi
-@include general/webdav.texi
 @include general/sxml.texi
diff --git a/doc/ref/vcomponent.texi b/doc/ref/vcomponent.texi
index 76acf6c3..5823e88e 100644
--- a/doc/ref/vcomponent.texi
+++ b/doc/ref/vcomponent.texi
@@ -10,3 +10,6 @@ Some of these values are still Calp specific.
 
 @include vcomponent/general.texi
 @include vcomponent/create.texi
+
+@include vcomponent/data-formats.texi
+@include vcomponent/data-stores.texi
diff --git a/doc/ref/general/data-formats.texi b/doc/ref/vcomponent/data-formats.texi
index 592b3085..a871ea1a 100644
--- a/doc/ref/general/data-formats.texi
+++ b/doc/ref/vcomponent/data-formats.texi
@@ -1,13 +1,14 @@
 @node Data Formats
 @section Data Formats
 
-A data format is some way that an individual event may get serialized
-to disk. The default is iCalendar (TODO reference RFC 5545), but
-others might be available (TODO footnote and reference xcal).
+Data formats are the serialization formats for components.
+The primary serialization format is iCalendar, but xCalendar and
+sxCalendar also exists.
 
 Each available format should be included as
 @code{(vcomponent formats @var{format-name})}.
-Which module corresponds to what file type is currently defined out of band.
+Which module corresponds to what file type is currently defined out of
+band.
 
 Each module should expose the following procedures.
 
diff --git a/doc/ref/general/data-stores.texi b/doc/ref/vcomponent/data-stores.texi
index ec3962da..ec3962da 100644
--- a/doc/ref/general/data-stores.texi
+++ b/doc/ref/vcomponent/data-stores.texi
diff --git a/doc/ref/general/webdav.texi b/doc/ref/webdav.texi
index a495c945..cc361e71 100644
--- a/doc/ref/general/webdav.texi
+++ b/doc/ref/webdav.texi
@@ -1,5 +1,5 @@
 @node WebDAV
-@section WebDAV
+@chapter WebDAV
 
 For a complete view of WebDAV, please see @cite{RFC4918 (HTTP
 Extensions for Web Distributed Authoring and Versioning (WebDAV))},
@@ -42,14 +42,14 @@ Live properties are handled through GOOPS methods.
 Dead properties are (by default) stored directly inside each resource.
 
 @node WebDAV Properties
-@subsection Properties
+@section Properties
 
 @itemize
 @item @code{(calp webdav property)}
 @item @code{(calp webdav propfind)}
 @end itemize
 
-@subsubsection Default Live Properties
+@subsection Default Live Properties
 
 @deftp {GOOPS method} creationdate
 @end deftp
@@ -83,7 +83,7 @@ Dead properties are (by default) stored directly inside each resource.
 
 
 @node WebDAV Resources
-@subsection Resources
+@section Resources
 
 @deftp {GOOPS class} <resource>
 Base type for all WebDAV resources.
@@ -242,15 +242,15 @@ The root resource is however guaranteed to be first.
 
 
 @node WebDAV Resource Types
-@subsection Resource Types
+@section Resource Types
 
-@subsubsection @code{(calp webdav resource base)}
+@subsection @code{(calp webdav resource base)}
 
 Implementation of @code{(calp webdav resource)}. Exists to possibly
 avoid dependency loops.
 
-@subsubsection @code{(calp webdav resource calendar)}
-@subsubsection @code{(calp webdav resource file)}
+@subsection @code{(calp webdav resource calendar)}
+@subsection @code{(calp webdav resource file)}
 
 Resources backed by the file system.
 
@@ -278,10 +278,10 @@ Data can be set either as a string or a bytevector. When a string is
 used Guile's current encoding will be used.
 @end deftp
 
-@subsubsection @code{(calp webdav resource virtual)}
+@subsection @code{(calp webdav resource virtual)}
 
 @node WebDAV Utilities
-@subsection Utilities
+@section Utilities
 @defun xml-element-hash-key xml-tag
 Given an xml tag object @ref{xml-tag}, return a suitable key for
 @code{hash-ref} and family.