Index: doc/reference/conglomerate-overrides.txt
===================================================================
RCS file: /cvs/gnome/conglomerate/doc/reference/conglomerate-overrides.txt,v
retrieving revision 1.3
diff -u -r1.3 conglomerate-overrides.txt
--- a/doc/reference/conglomerate-overrides.txt	23 Jun 2004 17:24:24 -0000	1.3
+++ b/doc/reference/conglomerate-overrides.txt	24 Jun 2004 17:44:56 -0000
@@ -199,3 +199,12 @@
 <STRUCT>
 <NAME>CongEditorNodeElementParagraph</NAME>
 </STRUCT>
+<STRUCT>
+<NAME>CongDocumentTraversal</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>CongTraversalNode</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>CongXPathExpression</NAME>
+</STRUCT>
Index: src/ChangeLog
===================================================================
RCS file: /cvs/gnome/conglomerate/src/ChangeLog,v
retrieving revision 1.637
diff -u -r1.637 ChangeLog
--- a/src/ChangeLog	24 Jun 2004 03:24:51 -0000	1.637
+++ b/src/ChangeLog	24 Jun 2004 17:45:00 -0000
@@ -1,3 +1,8 @@
+2004-06-24 Nickolay V. Shmyrev <nshmyrev@yandex.ru>
+
+	Changes in LOTS of files to cleanup gtk-doc usage and 
+	suppress gtk-doc warnings. Patch part two.
+
 2004-06-23  David Malcolm  <david@davemalcolm.demon.co.uk>
 
 	* plugin-random.c: Namespace fixes
Index: src/cong-debug-log-view.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-debug-log-view.c,v
retrieving revision 1.13
diff -u -r1.13 cong-debug-log-view.c
--- a/src/cong-debug-log-view.c	10 Jun 2004 01:30:45 -0000	1.13
+++ b/src/cong-debug-log-view.c	24 Jun 2004 17:45:03 -0000
@@ -523,6 +523,7 @@
  * @doc:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkWidget *
 cong_debug_message_log_view_new(CongDocument *doc)
@@ -774,6 +775,7 @@
  * @doc:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkWidget *
 cong_debug_signal_log_view_new(CongDocument *doc)
Index: src/cong-dispspec.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-dispspec.c,v
retrieving revision 1.47
diff -u -r1.47 cong-dispspec.c
--- a/src/cong-dispspec.c	23 Jun 2004 17:37:29 -0000	1.47
+++ b/src/cong-dispspec.c	24 Jun 2004 17:45:04 -0000
@@ -211,6 +211,7 @@
  * cong_dispspec_new:
  *
  * TODO: Write me
+ * Returns:
  */
 CongDispspec* 
 cong_dispspec_new(void)
@@ -233,6 +234,7 @@
  * @ds:
  *
  * TODO: Write me
+ * Returns:
  */
 GnomeVFSResult 
 cong_dispspec_new_from_xds_file(GnomeVFSURI *uri, CongDispspec** ds)
@@ -263,6 +265,7 @@
  * @size:
  *
  * TODO: Write me
+ * Returns:
  */
 CongDispspec* 
 cong_dispspec_new_from_xds_buffer(const char *buffer, size_t size)
@@ -292,6 +295,7 @@
  * @description:
  *
  * TODO: Write me
+ * Returns:
  */
 CongDispspec* 
 cong_dispspec_new_generate_from_dtd (xmlDtdPtr dtd, 
@@ -326,6 +330,7 @@
  * @extension:
  *
  * TODO: Write me
+ * Returns:
  */
 CongDispspec *
 cong_dispspec_new_generate_from_xml_file (xmlDocPtr doc,
@@ -389,6 +394,7 @@
  * @dispspec:
  *
  * TODO: Write me
+ * Returns:
  */
 xmlDocPtr 
 cong_dispspec_make_xml(CongDispspec *dispspec)
@@ -454,6 +460,7 @@
  * @ds:
  *
  * TODO: Write me
+ * Returns:
  */
 const gchar*
 cong_dispspec_get_name (const CongDispspec *ds)
@@ -473,6 +480,7 @@
  * @ds:
  *
  * TODO: Write me
+ * Returns:
  */
 const gchar*
 cong_dispspec_get_description (const CongDispspec *ds)
@@ -491,6 +499,7 @@
  * @ds:
  *
  * TODO: Write me
+ * Returns:
  */
 guint
 cong_dispspec_get_num_serialisation_formats (const CongDispspec *ds)
@@ -506,6 +515,7 @@
  * @index:
  *
  * TODO: Write me
+ * Returns:
  */
 const CongSerialisationFormat*
 cong_dispspec_get_serialisation_format (const CongDispspec *ds,
@@ -525,6 +535,7 @@
  * @extension:
  *
  * TODO: Write me
+ * Returns:
  */
 const CongSerialisationFormat*
 cong_dispspec_lookup_filename_extension (const CongDispspec *ds,
@@ -552,6 +563,7 @@
  * @extension:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean
 cong_dispspec_matches_filename_extension (const CongDispspec *ds,
@@ -569,6 +581,7 @@
  * @model_type:
  *
  * TODO: Write me
+ * Returns:
  */
 const CongExternalDocumentModel*
 cong_dispspec_get_external_document_model (const CongDispspec *ds,
@@ -585,6 +598,7 @@
  * @ds:
  *
  * TODO: Write me
+ * Returns:
  */
 GdkPixbuf*
 cong_dispspec_get_icon(const CongDispspec *ds)
@@ -605,6 +619,7 @@
  * @local_name:
  *
  * TODO: Write me
+ * Returns:
  */
 CongDispspecElement*
 cong_dispspec_lookup_element (const CongDispspec *ds, 
@@ -634,6 +649,7 @@
  * @node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongDispspecElement*
 cong_dispspec_lookup_node(const CongDispspec *ds, CongNodePtr node)
@@ -675,6 +691,7 @@
  * @ds:
  *
  * TODO: Write me
+ * Returns:
  */
 CongDispspecElement*
 cong_dispspec_get_first_element(CongDispspec *ds)
@@ -753,6 +770,7 @@
  * @ds:
  *
  * TODO: Write me
+ * Returns:
  */
 guint
 cong_dispspec_get_num_elements (CongDispspec *ds)
@@ -777,6 +795,7 @@
  * @index:
  *
  * TODO: Write me
+ * Returns:
  */
 CongDispspecElement*
 cong_dispspec_get_element (CongDispspec *ds,
@@ -822,6 +841,7 @@
  * @tog:
  *
  * TODO: Write me
+ * Returns:
  */
 GdkGC *
 cong_dispspec_name_gc_get(CongDispspec *ds, CongNodePtr t, int tog)
@@ -835,14 +855,6 @@
 	}
 }
 
-/**
- * cong_dispspec_gc_get:
- * @ds:
- * @x:
- * @tog:
- *
- * TODO: Write me
- */
 GdkGC *
 cong_dispspec_gc_get(CongDispspec *ds, CongNodePtr x, int tog)
 {
@@ -862,6 +874,7 @@
  * @node:
  *
  * TODO: Write me
+ * Returns:
  */
 const gchar*
 cong_dispspec_name_get (CongDispspec *ds, 
@@ -898,16 +911,17 @@
  * cong_dispspec_element_structural:
  * @ds:
  * @ns_uri:
- * @name:
+ * @local_name:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 cong_dispspec_element_structural (CongDispspec *ds, 
 				  const gchar *ns_uri, 
-				  const char *name)
+				  const char *local_name)
 {
-	CongDispspecElement* element = cong_dispspec_lookup_element (ds, ns_uri, name);
+	CongDispspecElement* element = cong_dispspec_lookup_element (ds, ns_uri, local_name);
 
 	if (NULL==element) {
 		return FALSE;
@@ -920,16 +934,17 @@
  * cong_dispspec_element_collapse:
  * @ds:
  * @ns_uri:
- * @name:
+ * @local_name:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 cong_dispspec_element_collapse (CongDispspec *ds, 
 				const gchar *ns_uri, 
-				const char *name)
+				const char *local_name)
 {
-	CongDispspecElement* element = cong_dispspec_lookup_element (ds, ns_uri, name);
+	CongDispspecElement* element = cong_dispspec_lookup_element (ds, ns_uri, local_name);
 
 	if (NULL==element) {
 		return FALSE;
@@ -965,16 +980,17 @@
  * cong_dispspec_element_insert:
  * @ds:
  * @ns_uri:
- * @name:
+ * @local_name:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 cong_dispspec_element_insert (CongDispspec *ds, 
 			      const gchar *ns_uri, 
-			      const char *name)
+			      const char *local_name)
 {
-	CongDispspecElement* element = cong_dispspec_lookup_element(ds, ns_uri, name);
+	CongDispspecElement* element = cong_dispspec_lookup_element(ds, ns_uri, local_name);
 
 	if (NULL==element) {
 		return FALSE;
@@ -1254,6 +1270,7 @@
  * @model:
  *
  * TODO: Write me
+ * Returns:
  */
 const gchar*
 cong_external_document_model_get_public_id (const CongExternalDocumentModel* model)
@@ -1268,6 +1285,7 @@
  * @model:
  *
  * TODO: Write me
+ * Returns:
  */
 const gchar*
 cong_external_document_model_get_system_id (const CongExternalDocumentModel* model)
@@ -1606,6 +1624,7 @@
  * @ds:
  *
  * TODO: Write me
+ * Returns:
  */
 xmlNodePtr
 cong_dispspec_get_template(const CongDispspec *ds)
@@ -1650,6 +1669,7 @@
  * @xml_doc:
  *
  * TODO: Write me
+ * Returns:
  */
 gdouble
 cong_dispspec_calculate_coverage (const CongDispspec *ds,
Index: src/cong-dispspec.h
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-dispspec.h,v
retrieving revision 1.21
diff -u -r1.21 cong-dispspec.h
--- a/src/cong-dispspec.h	23 Jun 2004 17:37:29 -0000	1.21
+++ b/src/cong-dispspec.h	24 Jun 2004 17:45:04 -0000
@@ -153,7 +153,7 @@
 #endif
 GdkGC *cong_dispspec_gc_get(CongDispspec *ds, CongNodePtr x, int tog);
 #endif
-const char *cong_dispspec_name_get(CongDispspec *ds, CongNodePtr x);
+const char *cong_dispspec_name_get(CongDispspec *ds, CongNodePtr node);
 
 #if 1
 gboolean cong_dispspec_element_structural(CongDispspec *ds, const gchar *ns_uri, const gchar *local_name);
Index: src/cong-document-traversal.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-document-traversal.c,v
retrieving revision 1.7
diff -u -r1.7 cong-document-traversal.c
--- a/src/cong-document-traversal.c	10 Jun 2004 01:30:45 -0000	1.7
+++ b/src/cong-document-traversal.c	24 Jun 2004 17:45:04 -0000
@@ -185,6 +185,7 @@
  * @doc:
  *
  * TODO: Write me
+ * Returns:
  */
 CongDocumentTraversal*
 cong_document_traversal_construct (CongDocumentTraversal *doc_traversal,
@@ -217,6 +218,7 @@
  * @doc:
  *
  * TODO: Write me
+ * Returns:
  */
 CongDocumentTraversal*
 cong_document_traversal_new (CongDocument *doc)
@@ -230,6 +232,7 @@
  * @doc_traversal:
  *
  * TODO: Write me
+ * Returns:
  */
 CongDocument*
 cong_document_traversal_get_document(CongDocumentTraversal *doc_traversal)
@@ -244,6 +247,7 @@
  * @doc_traversal:
  *
  * TODO: Write me
+ * Returns:
  */
 CongTraversalNode*
 cong_document_traversal_get_root_traversal_node (CongDocumentTraversal *doc_traversal)
@@ -296,6 +300,7 @@
  * @traversal_parent:
  *
  * TODO: Write me
+ * Returns:
  */
 CongTraversalNode*
 cong_document_traversal_get_traversal_node (CongDocumentTraversal *doc_traversal,
@@ -338,6 +343,7 @@
  * @xml_node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongTraversalNode*
 cong_document_traversal_get_a_traversal_node (CongDocumentTraversal *doc_traversal,
@@ -373,6 +379,7 @@
  * @xml_node:
  *
  * TODO: Write me
+ * Returns:
  */
 NodeMapping*
 cong_node_mapping_new (CongNodePtr xml_node)
@@ -782,6 +789,7 @@
  * @node:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean
 should_have_traversal_node (CongNodePtr node)
Index: src/cong-document.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-document.c,v
retrieving revision 1.97
diff -u -r1.97 cong-document.c
--- a/src/cong-document.c	18 Jun 2004 17:34:36 -0000	1.97
+++ b/src/cong-document.c	24 Jun 2004 17:45:04 -0000
@@ -355,6 +355,7 @@
  * @url:
  *
  * TODO: Write me
+ * Returns:
  */
 CongDocument*
 cong_document_construct (CongDocument *doc,
@@ -424,11 +425,14 @@
 
 /**
  * cong_document_new_from_xmldoc:
- * @xml_doc:
+ * @xml_doc:  The #xmlDocPtr which the #CongDocument is to wrap.  It takes ownership of it.
  * @ds:
  * @url:
  *
- * TODO: Write me
+ * The new #CongDocument is created with a reference count of 1; 
+ * any views constructed of the document will increment its reference count 
+ *
+ * Returns: the new #CongDocument
  */
 CongDocument*
 cong_document_new_from_xmldoc (xmlDocPtr xml_doc,
@@ -448,9 +452,12 @@
 
 /**
  * cong_document_get_xml:
- * @doc:
+ * @doc:  The #CongDocument.
  *
- * TODO: Write me
+ * Retrieve the #xmlDocPtr wrapped by a #CongDocument.  You should not attempt to modify it directly, but instead
+ * use methods of the #CongDocument
+ *
+ * Returns: the #xmlDocPtr wrapped by the #CongDocument
  */
 xmlDocPtr
 cong_document_get_xml(CongDocument *doc)
@@ -465,6 +472,7 @@
  * @doc:
  *
  * TODO: Write me
+ * Returns:
  */
 CongNodePtr
 cong_document_get_root(CongDocument *doc)
@@ -487,6 +495,7 @@
  * @doc:
  *
  * TODO: Write me
+ * Returns:
  */
 CongDocumentTraversal*
 cong_document_get_traversal (CongDocument *doc)
@@ -498,9 +507,12 @@
 
 /**
  * cong_document_get_root_traversal_node:
- * @doc:
+ * @doc:  The #CongDocument of interest
  *
- * TODO: Write me
+ * The #CongDocument maintains #CongDocumentTraversal corresponding to a depth-first traversal of its xml tree,
+ * but with the entity references having only the entity definition as their sole child.
+ *
+ * Returns: the #CongDocumentTraversal owned by the document
  */
 CongTraversalNode*
 cong_document_get_root_traversal_node (CongDocument *doc)
@@ -515,6 +527,7 @@
  * @doc:
  *
  * TODO: Write me
+ * Returns:
  */
 CongDispspec*
 cong_document_get_dispspec(CongDocument *doc)
@@ -530,6 +543,7 @@
  * @node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongDispspecElement*
 cong_document_get_dispspec_element_for_node(CongDocument *doc, CongNodePtr node)
@@ -545,6 +559,7 @@
  * @doc:
  *
  * TODO: Write me
+ * Returns:
  */
 gchar*
 cong_document_get_filename(CongDocument *doc)
@@ -574,6 +589,7 @@
  * @doc:
  *
  * TODO: Write me
+ * Returns:
  */
 gchar*
 cong_document_get_full_uri(CongDocument *doc) 
@@ -593,6 +609,7 @@
  * @doc:
  *
  * TODO: Write me
+ * Returns:
  */
 gchar*
 cong_document_get_parent_uri(CongDocument *doc)
@@ -622,6 +639,7 @@
  * @doc:
  *
  * TODO: Write me
+ * Returns:
  */
 const CongXMLChar*
 cong_document_get_dtd_public_identifier(CongDocument *doc)
@@ -639,10 +657,12 @@
 
 /**
  * cong_document_get_xml_ns:
- * @doc:
- * @ns_uri:
+ * @doc:  The #CongDocument of interest
+ * @ns_uri:  The URI of the namespace
  *
- * TODO: Write me
+ * Locates a namespace by URI within a CongDocument
+ *
+ * Returns: the #xmlNsPtr for the namespace, or NULL if not found
  */
 xmlNsPtr
 cong_document_get_xml_ns (CongDocument *doc, 
@@ -664,7 +684,7 @@
  * cong_document_save:
  * @doc:
  * @filename:
- * @toplevel_window:
+ * @parent_window:
  *
  * TODO: Write me
  */
@@ -722,6 +742,7 @@
  * @doc:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean
 cong_document_is_modified(CongDocument *doc)
@@ -759,6 +780,7 @@
  * @doc:
  *
  * TODO: Write me
+ * Returns:
  */
 CongPrimaryWindow*
 cong_document_get_primary_window(CongDocument *doc)
@@ -807,6 +829,7 @@
  * @doc:
  *
  * TODO: Write me
+ * Returns:
  */
 glong
 cong_document_get_seconds_since_last_save_or_load(const CongDocument *doc)
@@ -821,11 +844,13 @@
 }
 
 /**
- * cong_document_get_node_name:
- * @doc:
+ * cong_document_get_node_name
+ * @doc: 
  * @node:
- *
- * TODO: Write me
+ * 
+ * Generate a user-visible, translated string that is a name for this node.
+ * 
+ * Returns:  the node name, which must be deleted by the caller.
  */
 gchar*
 cong_document_get_node_name (CongDocument *doc, 
@@ -939,6 +964,7 @@
  * @doc:
  *
  * TODO: Write me
+ * Returns:
  */
 guint
 cong_document_get_num_nodes (CongDocument *doc)
@@ -961,8 +987,10 @@
  * cong_document_node_ref:
  * @doc:
  * @node:
+ * 
+ * Add an "external reference" to the node; it will not be deleted until it has been both removed from the tree
+ * AND has lost all external references.
  *
- * This function is not currently implemented
  */
 void 
 cong_document_node_ref (CongDocument *doc,
@@ -978,8 +1006,10 @@
  * cong_document_node_unref:
  * @doc:
  * @node:
+ * 
+ * Remove an "external reference" to the node; it will be deleted if it has been both removed from the tree
+ * AND this was its last external reference.
  *
- * This function is not currently implemented
  */
 void 
 cong_document_node_unref (CongDocument *doc,
@@ -994,10 +1024,11 @@
 /**
  * cong_document_set_with_ref:
  * @doc:
- * @node_ptr:
- * @node:
+ * @node_ptr: A pointer to a #CongNodePtr
+ * @node: a ptr to a node, or NULL
+ * 
+ * Sets @node_ptr to @node, doing any necessary reference count modifications to the old and new value
  *
- * TODO: Write me
  */
 void
 cong_document_set_with_ref (CongDocument *doc,
@@ -1023,11 +1054,16 @@
 
 /**
  * cong_document_begin_command:
- * @doc:
- * @description:
- * @consolidation_id:
+ * @doc: The #CongDocument upon which the command is to act.
+ * @description: Human-readable, translated name for this command, as it will appear in the undo/redo history
+ * widget
+ * @consolidation_id: A string ID (or NULL) for this command to allow multiple similar commands to be consolidated into 
+ * a single command.  For example, multiple characters being typed at the keboard can be merged into a single "Typing" command.
+ * 
+ * Begins creating a named command which will act upon the document.  You can then add modifications to this command,
+ * and then finish with a call to cong_document_end_command()
  *
- * TODO: Write me
+ * Returns:  a #CongCommand to which modifications should be added
  */
 CongCommand*
 cong_document_begin_command (CongDocument *doc,
@@ -1080,10 +1116,12 @@
 
 /**
  * cong_document_end_command:
- * @doc:
- * @cmd:
+ * @doc: The #CongDocument upon which the command acted.
+ * @cmd: The #CongCommand which is now complete
+ * 
+ * Finish creating a command which has acted upon the document.  You should have created this command using a call
+ * to cong_document_begin_command()
  *
- * TODO: Write me
  */
 void
 cong_document_end_command (CongDocument *doc,
@@ -1117,6 +1155,13 @@
 	g_object_unref (G_OBJECT (cmd));
 }
 
+/**
+ * cong_document_abort_command:
+ * @doc: The #CongDocument upon which the command acted.
+ * @cmd: The #CongCommand which should be aborted
+ * 
+ * Finish command without applying it to document
+ */
 void
 cong_document_abort_command (CongDocument *doc,
 		     	      CongCommand *cmd)
@@ -1188,6 +1233,7 @@
  * @doc:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 cong_document_is_within_edit(CongDocument *doc)
@@ -1544,6 +1590,7 @@
  * @doc:
  *
  * TODO: Write me
+ * Returns:
  */
 CongCursor* 
 cong_document_get_cursor(CongDocument *doc)
@@ -1558,6 +1605,7 @@
  * @doc:
  *
  * TODO: Write me
+ * Returns:
  */
 CongSelection* 
 cong_document_get_selection(CongDocument *doc)
@@ -1567,11 +1615,13 @@
 	return PRIVATE(doc)->selection;
 }
 
-/**
- * cong_document_get_selected_node:
- * @doc:
- *
- * TODO: Write me
+/** 
+ * cong_document_get_selected_node
+ * @doc: the document
+ * 
+ * Convenience wrapper around CongSelection for dealing with selection of specific nodes (as opposed to text ranges).
+ * 
+ * Returns: If a specific node is selected, returns that node.  If a text range is selected instead, or there is no selection, NULL is returned.
  */
 CongNodePtr
 cong_document_get_selected_node (CongDocument *doc)
@@ -1593,12 +1643,17 @@
 }
 
 
-/**
- * cong_document_get_language_for_node:
+/** 
+ * cong_document_get_language_for_node
  * @doc:
  * @node:
- *
- * TODO: Write me
+ * 
+ * Every node within a document has an implied language, although the logic to determine 
+ * this may depend on the dispspec, on attributes of the nodes, and perhaps even on user prefererences (and hence the value may change unexpectedly).
+ * 
+ * FIXME: what are the ownership/ref count semantics of this function?
+ * 
+ * Returns:
  */
 PangoLanguage*
 cong_document_get_language_for_node(CongDocument *doc, 
@@ -1643,9 +1698,10 @@
  * cong_document_for_each_node:
  * @doc:
  * @callback:
- * @user_data:
+ * @callback_data:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean
 cong_document_for_each_node (CongDocument *doc, 
@@ -1670,6 +1726,7 @@
  * @callback_data:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean
 cong_document_for_each_child_of_node (CongDocument *doc, 
@@ -1698,6 +1755,7 @@
  * @source_fragment:
  *
  * TODO: Write me
+ * Returns:
  */
 CongNodePtr
 cong_document_make_nodes_from_source_fragment (CongDocument *doc, 
@@ -1739,11 +1797,16 @@
 }
 
 /**
- * cong_document_get_dtd_element:
+ * cong_document_get_dtd_element
  * @cong_doc:
  * @node:
- *
- * TODO: Write me
+ * 
+ * Helper function to get the xmlElementPtr within the DTD for a node
+ * Currently only looks at the actual DTD, but in future might attempt
+ * to use the dispspec to infer an DTD and return that
+ * So don't store the return value; it might get deleted etc
+ * 
+ * Returns:
  */
 xmlElementPtr 
 cong_document_get_dtd_element (CongDocument *cong_doc, 
@@ -1822,6 +1885,7 @@
  * @doc:
  *
  * TODO: Write me
+ * Returns:
  */
 CongCommandHistory*
 cong_document_get_command_history (CongDocument *doc)
@@ -1928,21 +1992,26 @@
  * cong_document_node_can_be_deleted:
  * @doc:
  * @node:
+ * 
+ * Helper function  that determines if a node can safely be deleted.
+ * It will fail if the node or its subtree contains the cursor or the start/end of the selection,
+ * to avoid these containing dangling pointers to dead memory.
+ * Used to fix bug #108530, to ensure that the cursor and selection are always moved out of the way.
  *
- * TODO: Write me
+ * Returns: TRUE if the node can be safely deleted, FALSE otherwise
  */
 gboolean
-cong_document_node_can_be_deleted (CongDocument *doc,
+cong_document_node_can_be_deleted (CongDocument *cong_doc,
 				   CongNodePtr node)
 {
 	CongCursor* cursor;
 	CongSelection* selection;
 
-	g_return_val_if_fail (IS_CONG_DOCUMENT (doc), FALSE);
+	g_return_val_if_fail (IS_CONG_DOCUMENT (cong_doc), FALSE);
 	g_return_val_if_fail (node, FALSE);
 
-	cursor = cong_document_get_cursor (doc);
-	selection = cong_document_get_selection (doc);
+	cursor = cong_document_get_cursor (cong_doc);
+	selection = cong_document_get_selection (cong_doc);
 
 	/* Is the cursor's node within the subtree of the test node?  If so, return FALSE: */
 	if (is_location_in_node_subtree (&cursor->location, node)) {
Index: src/cong-document.h
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-document.h,v
retrieving revision 1.45
diff -u -r1.45 cong-document.h
--- a/src/cong-document.h	23 Jun 2004 17:37:29 -0000	1.45
+++ b/src/cong-document.h	24 Jun 2004 17:45:04 -0000
@@ -122,59 +122,21 @@
 			 CongDispspec *ds, 
 			 const gchar *url);
 
-/**
- * cong_document_new_from_xmldoc:
- * @xmldoc:  The #xmlDocPtr which the #CongDocument is to wrap.  It takes ownership of it.
- * @ds:
- * @url:
- *
- * The new #CongDocument is created with a reference count of 1; 
- * any views constructed of the document will increment its reference count 
- *
- * Returns: the new #CongDocument
- */
 CongDocument*
 cong_document_new_from_xmldoc (xmlDocPtr xml_doc, 
 			       CongDispspec *ds, 
 			       const gchar *url);
 
-/**
- * cong_document_get_xml:
- * @doc:  The #CongDocument.
- *
- * Retrieve the #xmlDocPtr wrapped by a #CongDocument.  You should not attempt to modify it directly, but instead
- * use methods of the #CongDocument
- *
- * Returns: the #xmlDocPtr wrapped by the #CongDocument
- */
 xmlDocPtr
 cong_document_get_xml(CongDocument *doc);
 
 CongNodePtr
 cong_document_get_root(CongDocument *doc);
 
-/**
- * cong_document_get_root_traversal_node:
- * @doc:  The #CongDocument of interest
- *
- * The #CongDocument maintains #CongDocumentTraversal corresponding to a depth-first traversal of its xml tree,
- * but with the entity references having only the entity definition as their sole child.
- *
- * Returns: the #CongDocumentTraversal owned by the document
- */
 CongDocumentTraversal*
 cong_document_get_traversal (CongDocument *doc);
 
 
-/**
- * cong_document_get_root_traversal_node:
- * @doc:  The #CongDocument of interest
- *
- * The #CongDocument maintains a tree of #CongTraversalNode objects corresponding to a depth-first traversal of its xml tree,
- * but with the entity references having only the entity definition as their sole child.
- *
- * Returns: the #CongTraversalNode corresponding to the root xml node of the document
- */
 CongTraversalNode*
 cong_document_get_root_traversal_node (CongDocument *doc);
 
@@ -203,15 +165,6 @@
 cong_document_get_dtd_public_identifier(CongDocument *doc);
 /* NULL if not present */
 
-/**
- * cong_document_get_xml_ns:
- * @doc:  The #CongDocument of interest
- * @ns_uri:  The URI of the namespace
- *
- * Locates a namespace by URI within a CongDocument
- *
- * Returns: the #xmlNsPtr for the namespace, or NULL if not found
- */
 xmlNsPtr
 cong_document_get_xml_ns (CongDocument *doc, 
 			  const gchar* ns_uri);
@@ -244,15 +197,6 @@
 glong
 cong_document_get_seconds_since_last_save_or_load(const CongDocument *doc);
 
-/**
- * cong_document_get_node_name
- * @doc: 
- * @node:
- * 
- * Generate a user-visible, translated string that is a name for this node.
- * 
- * Returns:  the node name, which must be deleted by the caller.
- */
 gchar*
 cong_document_get_node_name (CongDocument *doc, 
 			     CongNodePtr node);
@@ -261,85 +205,28 @@
 guint
 cong_document_get_num_nodes (CongDocument *doc);
 
-/**
- * cong_document_node_ref:
- * @doc:
- * @node:
- * 
- * Add an "external reference" to the node; it will not be deleted until it has been both removed from the tree
- * AND has lost all external references.
- *
- */
 void 
 cong_document_node_ref (CongDocument *doc,
 			CongNodePtr node);
 
-/**
- * cong_document_node_unref:
- * @doc:
- * @node:
- * 
- * Remove an "external reference" to the node; it will be deleted if it has been both removed from the tree
- * AND this was its last external reference.
- *
- */
 void 
 cong_document_node_unref (CongDocument *doc,
 			  CongNodePtr node);
 
-/**
- * cong_document_set_with_ref:
- * @doc:
- * @node_ptr: A pointer to a #CongNodePtr
- * @node: a ptr to a node, or NULL
- * 
- * Sets @node_ptr to @node, doing any necessary reference count modifications to the old and new value
- *
- */
 void
 cong_document_set_with_ref (CongDocument *doc,
 			    CongNodePtr *node_ptr,
 			    CongNodePtr node);
 
-/**
- * cong_document_begin_command:
- * @doc: The #CongDocument upon which the command is to act.
- * @description: Human-readable, translated name for this command, as it will appear in the undo/redo history
- * widget
- * @consolidation_id: A string ID (or NULL) for this command to allow multiple similar commands to be consolidated into 
- * a single command.  For example, multiple characters being typed at the keboard can be merged into a single "Typing" command.
- * 
- * Begins creating a named command which will act upon the document.  You can then add modifications to this command,
- * and then finish with a call to cong_document_end_command()
- *
- * Returns:  a #CongCommand to which modifications should be added
- *
- */
 CongCommand*
 cong_document_begin_command (CongDocument *doc,
 			     const gchar *description,
 			     const gchar *consolidation_id);
 
-/**
- * cong_document_end_command:
- * @doc: The #CongDocument upon which the command acted.
- * @cmd: The #CongCommand which is now complete
- * 
- * Finish creating a command which has acted upon the document.  You should have created this command using a call
- * to cong_document_begin_command()
- *
- */
 void
 cong_document_end_command (CongDocument *doc,
 			   CongCommand *cmd);
 
-/**
- * cong_document_abort_command:
- * @doc: The #CongDocument upon which the command acted.
- * @cmd: The #CongCommand which should be aborted
- * 
- * Finish command without applying it to document
- */
 void
 cong_document_abort_command (CongDocument *doc,
 		     	      CongCommand *cmd);
@@ -352,6 +239,7 @@
  * Begin/End edits can be nested; the document keeps track of the depth.
  * Views are notified when editing actually begins/ends; they are only notified on the outermost level of nesting.
  */
+ 
 void cong_document_begin_edit(CongDocument *doc);
 void cong_document_end_edit(CongDocument *doc);
 gboolean cong_document_is_within_edit(CongDocument *doc);
@@ -383,31 +271,10 @@
 CongSelection* cong_document_get_selection(CongDocument *doc);
 
 
-/** 
- * cong_document_get_selected_node
- * @doc: the document
- * 
- * Convenience wrapper around CongSelection for dealing with selection of specific nodes (as opposed to text ranges).
- * 
- * Returns: If a specific node is selected, returns that node.  If a text range is selected instead, or there is no selection, NULL is returned.
- * 
- */
 CongNodePtr
 cong_document_get_selected_node (CongDocument *doc);
 
 
-/** 
- * cong_document_get_language_for_node
- * @doc:
- * @node:
- * 
- * Every node within a document has an implied language, although the logic to determine 
- * this may depend on the dispspec, on attributes of the nodes, and perhaps even on user prefererences (and hence the value may change unexpectedly).
- * 
- * FIXME: what are the ownership/ref count semantics of this function?
- * 
- * Returns:
- */
 PangoLanguage*
 cong_document_get_language_for_node(CongDocument *doc, 
 				    CongNodePtr node);
@@ -492,18 +359,6 @@
 					       const gchar *source_fragment);
 
 
-/**
- * cong_document_get_dtd_element
- * @cong_doc:
- * @node:
- * 
- * Helper function to get the xmlElementPtr within the DTD for a node
- * Currently only looks at the actual DTD, but in future might attempt
- * to use the dispspec to infer an DTD and return that
- * So don't store the return value; it might get deleted etc
- * 
- * Returns:
- */
 xmlElementPtr
 cong_document_get_dtd_element (CongDocument *cong_doc, 
 			       CongNodePtr node);
@@ -522,19 +377,6 @@
 						   CongNodePtr node, 
 						   CongElementType tag_type);
 
-/**
- * cong_document_node_can_be_deleted:
- * @cong_doc:
- * @node:
- * 
- * Helper function  that determines if a node can safely be deleted.
- * It will fail if the node or its subtree contains the cursor or the start/end of the selection,
- * to avoid these containing dangling pointers to dead memory.
- * Used to fix bug #108530, to ensure that the cursor and selection are always moved out of the way.
- *
- * Returns: TRUE if the node can be safely deleted, FALSE otherwise
- * 
- */
 gboolean
 cong_document_node_can_be_deleted (CongDocument *doc,
 				   CongNodePtr node);
Index: src/cong-dom-view.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-dom-view.c,v
retrieving revision 1.13
diff -u -r1.13 cong-dom-view.c
--- a/src/cong-dom-view.c	23 Jun 2004 17:37:29 -0000	1.13
+++ b/src/cong-dom-view.c	24 Jun 2004 17:45:04 -0000
@@ -55,6 +55,7 @@
  * @doc:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkWidget *
 cong_dom_view_new (CongDocument *doc)
@@ -147,6 +148,7 @@
  * @type:
  *
  * TODO: Write me
+ * Returns:
  */
 const gchar*
 cong_ui_get_colour_string(CongNodeType type)
Index: src/cong-dtd.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-dtd.c,v
retrieving revision 1.9
diff -u -r1.9 cong-dtd.c
--- a/src/cong-dtd.c	23 Jun 2004 17:37:29 -0000	1.9
+++ b/src/cong-dtd.c	24 Jun 2004 17:45:04 -0000
@@ -92,10 +92,13 @@
 }
 
 /**
- * cong_dtd_element_guess_dispspec_type:
+ * cong_dtd_element_guess_dispspec_type
  * @element:
- *
- * TODO: Write me
+ * 
+ * Given a DTD element, make a guess as to an appropriate xds element type.
+ * Useful when autogenerating CongDispspec from DTD files
+ * 
+ * Returns: 
  */
 CongElementType
 cong_dtd_element_guess_dispspec_type (xmlElementPtr element)
@@ -117,6 +120,7 @@
  * @content:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean
 cong_dtd_element_content_can_contain_pcdata (xmlElementContentPtr content)
@@ -146,11 +150,13 @@
 }
 
 /**
- * cong_dtd_element_get_element_for_node:
- * @dtd:
- * @xml_node:
- *
- * TODO: Write me
+ * cong_dtd_get_element_for_node
+ * @dtd: the DTD
+ * @node: an xml node
+ * 
+ * Given a DTD and an XML node, try to find the #xmlElementPtr for that node in the DTD
+ * 
+ * Returns: the #xmlElementPtr if found, or NULL otherwise
  */
 xmlElementPtr
 cong_dtd_element_get_element_for_node (xmlDtdPtr dtd,
@@ -168,10 +174,13 @@
 
 /**
  * cong_dtd_content_model_node_is_element:
- * @content:
- * @dtd_element:
+ * @content: a node in the content model tree for one of the elements in a DTD
+ * @dtd_element: one of the elements in a DTD (usually a different one)
  *
- * TODO: Write me
+ * Determine if this node in the content model is a direct cross-reference
+ * to the given element.  Useful for determining recursion, nesting of elements, etc
+ * 
+ * Returns: TRUE if it is the element, FALSE if it's another element, PCDATA, etc
  */
 gboolean
 cong_dtd_content_model_node_is_element (xmlElementContentPtr content,
@@ -225,7 +234,9 @@
  * @dtd:
  * @content:
  *
- * TODO: Write me
+ * Get the element in the DTD corresponding to a node in the content model (if any)
+ *
+ * Returns:
  */
 xmlElementPtr 
 cong_dtd_get_element_for_content (xmlDtdPtr dtd,
@@ -314,7 +325,11 @@
  * @callback:
  * @user_data:
  *
- * TODO: Write me
+ * Function to search through the content models in the DTD, calling the callback for any reference to the given element.
+ *
+ * Handles the case where the element is part of a recursive content model (which would allow arbitrary
+ * numbers of that element to be added) by treating each as a single cross-reference.
+ *
  */
 void
 cong_dtd_for_each_reference_to_element (xmlDtdPtr dtd,
@@ -349,13 +364,6 @@
 	(*count)++;
 }
 
-/**
- * cong_dtd_count_references_to_element:
- * @dtd:
- * @dtd_element:
- *
- * TODO: Write me
- */
 guint
 cong_dtd_count_references_to_element (xmlDtdPtr dtd,
 				      xmlElementPtr dtd_element)
@@ -383,11 +391,13 @@
 	}
 }
 
-/**
+/*
  * cong_dtd_guess_start_elements:
- * @dtd:
  *
- * TODO: Write me
+ * Try to guess the most likely root elements of the DTD.
+ * Currently implemented by finding those that aren't cross-referenced elsewhere in the DTD.
+ *
+ * Returns: a freshly allocated GList of xmlElementPtr
  */
 GList*
 cong_dtd_guess_start_elements (xmlDtdPtr dtd)
Index: src/cong-dtd.h
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-dtd.h,v
retrieving revision 1.7
diff -u -r1.7 cong-dtd.h
--- a/src/cong-dtd.h	23 Jun 2004 17:37:29 -0000	1.7
+++ b/src/cong-dtd.h	24 Jun 2004 17:45:04 -0000
@@ -49,15 +49,6 @@
 			     CongDtdAttributeCallback callback,
 			     gpointer user_data);
 
-/**
- * cong_dtd_element_guess_dispspec_type
- * @element:
- * 
- * Given a DTD element, make a guess as to an appropriate xds element type.
- * Useful when autogenerating CongDispspec from DTD files
- * 
- * Returns: 
- */
 CongElementType
 cong_dtd_element_guess_dispspec_type (xmlElementPtr element);
 
@@ -67,41 +58,15 @@
 gboolean
 cong_dtd_element_content_can_contain_pcdata (xmlElementContentPtr content);
 
-/**
- * cong_dtd_get_element_for_node
- * @dtd: the DTD
- * @node: an xml node
- * 
- * Given a DTD and an XML node, try to find the #xmlElementPtr for that node in the DTD
- * 
- * Returns: the #xmlElementPtr if found, or NULL otherwise
- */
 xmlElementPtr
 cong_dtd_element_get_element_for_node (xmlDtdPtr dtd,
 				       xmlNodePtr xml_node);
 
-/**
- * cong_dtd_content_model_node_is_element:
- *
- * @content: a node in the content model tree for one of the elements in a DTD
- * @dtd_element: one of the elements in a DTD (usually a different one)
- *
- * Determine if this node in the content model is a direct cross-reference
- * to the given element.  Useful for determining recursion, nesting of elements, etc
- * 
- * Returns: TRUE if it is the element, FALSE if it's another element, PCDATA, etc
- *
- */
 gboolean
 cong_dtd_content_model_node_is_element (xmlElementContentPtr content,
 					xmlElementPtr dtd_element);
 
-/**
- * cong_dtd_get_element_for_content:
- *
- * Get the element in the DTD corresponding to a node in the content model (if any)
- *
- */
+ 
 xmlElementPtr 
 cong_dtd_get_element_for_content (xmlDtdPtr dtd,
 				  xmlElementContentPtr content);
@@ -112,15 +77,6 @@
 				    xmlElementContentPtr content,
 				    gpointer user_data);
 
-/**
- * cong_dtd_for_each_reference_to_element:
- *
- * Function to search through the content models in the DTD, calling the callback for any reference to the given element.
- *
- * Handles the case where the element is part of a recursive content model (which would allow arbitrary
- * numbers of that element to be added) by treating each as a single cross-reference.
- *
- */
 void
 cong_dtd_for_each_reference_to_element (xmlDtdPtr dtd,
 					xmlElementPtr dtd_element,
@@ -131,14 +87,6 @@
 cong_dtd_count_references_to_element (xmlDtdPtr dtd,
 				      xmlElementPtr dtd_element);
 
-/*
- * cong_dtd_guess_start_elements:
- *
- * Try to guess the most likely root elements of the DTD.
- * Currently implemented by finding those that aren't cross-referenced elsewhere in the DTD.
- *
- * Returns: a freshly allocated GList of xmlElementPtr
- */
 GList*
 cong_dtd_guess_start_elements (xmlDtdPtr dtd);
 
Index: src/cong-edit-find-and-replace.h
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-edit-find-and-replace.h,v
retrieving revision 1.2
diff -u -r1.2 cong-edit-find-and-replace.h
--- a/src/cong-edit-find-and-replace.h	26 Apr 2004 20:39:07 -0000	1.2
+++ b/src/cong-edit-find-and-replace.h	24 Jun 2004 17:45:05 -0000
@@ -41,7 +41,6 @@
 
 /**
  * cong_document_find:
- *
  * @doc: the #CongDocument for which the find dialog is to be run
  *
  * Presents the Find dialog for this #CongDocument
@@ -52,7 +51,6 @@
 
 /**
  * cong_document_find_next:
- *
  * @doc: the #CongDocument
  *
  * Perform an "Edit->Find Next" for this #CongDocument
@@ -63,7 +61,6 @@
 
 /**
  * cong_document_find_prev:
- *
  * @doc: the #CongDocument
  *
  * Perform an "Edit->Find Next" for this #CongDocument
@@ -74,7 +71,6 @@
 
 /**
  * cong_document_replace:
- *
  * @doc: the #CongDocument for which the dialog is to be run
  *
  * Presents the Replace dialog for this #CongDocument
Index: src/cong-editor-area-bin.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-editor-area-bin.c,v
retrieving revision 1.10
diff -u -r1.10 cong-editor-area-bin.c
--- a/src/cong-editor-area-bin.c	18 Apr 2004 05:32:29 -0000	1.10
+++ b/src/cong-editor-area-bin.c	24 Jun 2004 17:45:05 -0000
@@ -92,6 +92,7 @@
  * @editor_widget:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorArea*
 cong_editor_area_bin_construct (CongEditorAreaBin *area_bin,
@@ -108,6 +109,7 @@
  * @editor_widget:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorArea*
 cong_editor_area_bin_new (CongEditorWidget3 *editor_widget)
@@ -126,6 +128,7 @@
  * @area_bin:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorArea*
 cong_editor_area_bin_get_child  (CongEditorAreaBin *area_bin)
Index: src/cong-editor-area-border.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-editor-area-border.c,v
retrieving revision 1.6
diff -u -r1.6 cong-editor-area-border.c
--- a/src/cong-editor-area-border.c	18 Apr 2004 05:32:29 -0000	1.6
+++ b/src/cong-editor-area-border.c	24 Jun 2004 17:45:05 -0000
@@ -77,6 +77,7 @@
  * @bottom_pixels:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorArea*
 cong_editor_area_border_construct (CongEditorAreaBorder *area_border,
@@ -106,6 +107,7 @@
  * @bottom_pixels:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorArea*
 cong_editor_area_border_new (CongEditorWidget3 *editor_widget,
Index: src/cong-editor-area-composer.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-editor-area-composer.c,v
retrieving revision 1.13
diff -u -r1.13 cong-editor-area-composer.c
--- a/src/cong-editor-area-composer.c	18 Apr 2004 05:32:29 -0000	1.13
+++ b/src/cong-editor-area-composer.c	24 Jun 2004 17:45:05 -0000
@@ -116,6 +116,7 @@
  * @spacing:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorArea*
 cong_editor_area_composer_construct (CongEditorAreaComposer *area_composer,
@@ -139,6 +140,7 @@
  * @spacing:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorArea*
 cong_editor_area_composer_new (CongEditorWidget3 *editor_widget,
@@ -266,7 +268,7 @@
  * cong_editor_area_composer_pack_after:
  * @area_composer:
  * @new_child:
- * @ooh_relative_to:
+ * @relative_to:
  * @expand:
  * @fill:
  * @extra_padding:
Index: src/cong-editor-area-container.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-editor-area-container.c,v
retrieving revision 1.8
diff -u -r1.8 cong-editor-area-container.c
--- a/src/cong-editor-area-container.c	18 Apr 2004 05:32:29 -0000	1.8
+++ b/src/cong-editor-area-container.c	24 Jun 2004 17:45:05 -0000
@@ -115,6 +115,7 @@
  * @editor_widget:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorArea*
 cong_editor_area_container_construct (CongEditorAreaContainer *area_container,
Index: src/cong-editor-area-entity-decl.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-editor-area-entity-decl.c,v
retrieving revision 1.5
diff -u -r1.5 cong-editor-area-entity-decl.c
--- a/src/cong-editor-area-entity-decl.c	18 Apr 2004 05:32:29 -0000	1.5
+++ b/src/cong-editor-area-entity-decl.c	24 Jun 2004 17:45:05 -0000
@@ -104,6 +104,7 @@
  * @text:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorArea*
 cong_editor_area_entity_decl_construct (CongEditorAreaEntityDecl *area_entity_decl,
@@ -162,6 +163,7 @@
  * @text:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorArea*
 cong_editor_area_entity_decl_new (CongEditorWidget3 *editor_widget,
Index: src/cong-editor-area-entity-ref.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-editor-area-entity-ref.c,v
retrieving revision 1.5
diff -u -r1.5 cong-editor-area-entity-ref.c
--- a/src/cong-editor-area-entity-ref.c	18 Apr 2004 05:32:29 -0000	1.5
+++ b/src/cong-editor-area-entity-ref.c	24 Jun 2004 17:45:05 -0000
@@ -104,6 +104,7 @@
  * @text:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorArea*
 cong_editor_area_entity_ref_construct (CongEditorAreaEntityRef *area_entity_ref,
@@ -162,6 +163,7 @@
  * @text:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorArea*
 cong_editor_area_entity_ref_new (CongEditorWidget3 *editor_widget,
Index: src/cong-editor-area-expander.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-editor-area-expander.c,v
retrieving revision 1.5
diff -u -r1.5 cong-editor-area-expander.c
--- a/src/cong-editor-area-expander.c	18 Apr 2004 05:32:29 -0000	1.5
+++ b/src/cong-editor-area-expander.c	24 Jun 2004 17:45:05 -0000
@@ -134,6 +134,7 @@
  * @expanded:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorArea*
 cong_editor_area_expander_construct (CongEditorAreaExpander *area_expander,
@@ -163,6 +164,7 @@
  * @expanded:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorArea*
 cong_editor_area_expander_new (CongEditorWidget3 *editor_widget,
@@ -179,6 +181,7 @@
  * @area_expander:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean
 cong_editor_area_expander_get_state (CongEditorAreaExpander *area_expander)
@@ -265,6 +268,7 @@
  * @user_data:
  *
  * TODO: Write me
+ * Returns:
  */
 gint
 on_timeout (gpointer user_data)
Index: src/cong-editor-area-flow-holder-blocks.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-editor-area-flow-holder-blocks.c,v
retrieving revision 1.16
diff -u -r1.16 cong-editor-area-flow-holder-blocks.c
--- a/src/cong-editor-area-flow-holder-blocks.c	23 Jun 2004 17:37:29 -0000	1.16
+++ b/src/cong-editor-area-flow-holder-blocks.c	24 Jun 2004 17:45:05 -0000
@@ -99,6 +99,7 @@
  * @editor_widget:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorArea*
 cong_editor_area_flow_holder_blocks_construct (CongEditorAreaFlowHolderBlocks *area_flow_holder_blocks,
@@ -127,6 +128,7 @@
  * @editor_widget:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorArea*
 cong_editor_area_flow_holder_blocks_new (CongEditorWidget3 *editor_widget)
@@ -146,6 +148,7 @@
  * @doc_node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorAreaFlowHolder*
 cong_editor_area_flow_holder_get_child_flow_holder_for_node (CongEditorAreaFlowHolderBlocks *area_flow_holder_blocks,
Index: src/cong-editor-area-flow-holder-inlines.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-editor-area-flow-holder-inlines.c,v
retrieving revision 1.14
diff -u -r1.14 cong-editor-area-flow-holder-inlines.c
--- a/src/cong-editor-area-flow-holder-inlines.c	18 Apr 2004 05:32:29 -0000	1.14
+++ b/src/cong-editor-area-flow-holder-inlines.c	24 Jun 2004 17:45:05 -0000
@@ -123,6 +123,7 @@
  * @editor_widget:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorArea*
 cong_editor_area_flow_holder_inlines_construct (CongEditorAreaFlowHolderInlines *area_flow_holder_inlines,
@@ -154,6 +155,7 @@
  * @editor_widget:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorArea*
 cong_editor_area_flow_holder_inlines_new (CongEditorWidget3 *editor_widget)
@@ -172,6 +174,7 @@
  * @area_flow_holder_inlines:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorAreaLine*
 cong_editor_area_flow_holder_inlines_get_current_line (CongEditorAreaFlowHolderInlines *area_flow_holder_inlines)
@@ -184,6 +187,7 @@
  * @area_flow_holder_inlines:
  *
  * TODO: Write me
+ * Returns:
  */
 gint
 cong_editor_area_flow_holder_inlines_get_line_width (CongEditorAreaFlowHolderInlines *area_flow_holder_inlines)
@@ -196,6 +200,7 @@
  * @area_flow_holder_inlines:
  *
  * TODO: Write me
+ * Returns:
  */
 gint
 cong_editor_area_flow_holder_inlines_get_current_indent (CongEditorAreaFlowHolderInlines *area_flow_holder_inlines)
@@ -230,6 +235,7 @@
  * @area_flow_holder_inlines:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorAreaLine*
 cong_editor_area_flow_holder_inlines_insert_line (CongEditorAreaFlowHolderInlines *area_flow_holder_inlines)
@@ -305,6 +311,7 @@
  * @area_flow_holder_inlines:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorNode*
 cong_editor_area_flow_holder_inlines_get_first_node (CongEditorAreaFlowHolderInlines *area_flow_holder_inlines)
@@ -323,6 +330,7 @@
  * @area_flow_holder_inlines:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorNode*
 cong_editor_area_flow_holder_inlines_get_final_node (CongEditorAreaFlowHolderInlines *area_flow_holder_inlines)
Index: src/cong-editor-area-flow-holder-single.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-editor-area-flow-holder-single.c,v
retrieving revision 1.7
diff -u -r1.7 cong-editor-area-flow-holder-single.c
--- a/src/cong-editor-area-flow-holder-single.c	23 Jun 2004 17:37:29 -0000	1.7
+++ b/src/cong-editor-area-flow-holder-single.c	24 Jun 2004 17:45:05 -0000
@@ -98,6 +98,7 @@
  * @editor_widget:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorArea*
 cong_editor_area_flow_holder_single_construct (CongEditorAreaFlowHolderSingle *area_flow_holder_single,
@@ -122,6 +123,7 @@
  * @editor_widget:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorArea*
 cong_editor_area_flow_holder_single_new (CongEditorWidget3 *editor_widget)
@@ -230,6 +232,7 @@
  * @editor_area:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorChildPolicy*
 cong_editor_widget_create_child_policy_for_node_with_single_area(CongEditorNode *editor_node,
Index: src/cong-editor-area-flow-holder.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-editor-area-flow-holder.c,v
retrieving revision 1.6
diff -u -r1.6 cong-editor-area-flow-holder.c
--- a/src/cong-editor-area-flow-holder.c	23 Jun 2004 17:37:29 -0000	1.6
+++ b/src/cong-editor-area-flow-holder.c	24 Jun 2004 17:45:06 -0000
@@ -78,6 +78,7 @@
  * @editor_widget:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorArea*
 cong_editor_area_flow_holder_construct (CongEditorAreaFlowHolder *area_flow_holder,
@@ -92,9 +93,10 @@
 /**
  * cong_editor_area_flow_holder_insert_areas_for_node:
  * @area_flow_holder:
- * @editor_widget:
+ * @node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorChildPolicy*
 cong_editor_area_flow_holder_insert_areas_for_node (CongEditorAreaFlowHolder *area_flow_holder,
@@ -110,7 +112,7 @@
 /**
  * cong_editor_area_flow_holder_remove_areas_for_node:
  * @area_flow_holder:
- * @editor_widget:
+ * @node:
  *
  * TODO: Write me
  */
@@ -126,10 +128,11 @@
 
 /**
  * cong_editor_area_flow_holder_manufacture:
- * @area_flow_holder:
+ * @editor_widget:
  * @flow_type:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorAreaFlowHolder*
 cong_editor_area_flow_holder_manufacture (CongEditorWidget3 *editor_widget,
Index: src/cong-editor-area-labelled.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-editor-area-labelled.c,v
retrieving revision 1.5
diff -u -r1.5 cong-editor-area-labelled.c
--- a/src/cong-editor-area-labelled.c	18 Apr 2004 05:32:29 -0000	1.5
+++ b/src/cong-editor-area-labelled.c	24 Jun 2004 17:45:06 -0000
@@ -99,6 +99,7 @@
  * @label:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorArea*
 cong_editor_area_labelled_construct (CongEditorAreaLabelled *area_labelled,
@@ -144,6 +145,7 @@
  * @label:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorArea*
 cong_editor_area_labelled_new (CongEditorWidget3 *editor_widget,
Index: src/cong-editor-area-line.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-editor-area-line.c,v
retrieving revision 1.7
diff -u -r1.7 cong-editor-area-line.c
--- a/src/cong-editor-area-line.c	18 Apr 2004 05:32:29 -0000	1.7
+++ b/src/cong-editor-area-line.c	24 Jun 2004 17:45:06 -0000
@@ -90,11 +90,12 @@
 /* Exported function definitions: */
 /**
  * cong_editor_area_line_construct:
- * @line:
+ * @area_line:
  * @editor_widget:
  * @width_limit:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorArea*
 cong_editor_area_line_construct (CongEditorAreaLine *line,
@@ -123,6 +124,7 @@
  * @width_limit:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorArea*
 cong_editor_area_line_new (CongEditorWidget3 *editor_widget,
@@ -144,6 +146,7 @@
  * @area_line:
  *
  * TODO: Write me
+ * Returns:
  */
 gint
 cong_editor_area_line_get_width_limit (CongEditorAreaLine *area_line)
@@ -158,6 +161,7 @@
  * @area_line:
  *
  * TODO: Write me
+ * Returns:
  */
 gint
 cong_editor_area_line_get_width_used (CongEditorAreaLine *area_line)
@@ -174,6 +178,7 @@
  * @area_line:
  *
  * TODO: Write me
+ * Returns:
  */
 gint
 cong_editor_area_line_get_width_free (CongEditorAreaLine *area_line)
Index: src/cong-editor-area-pixbuf.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-editor-area-pixbuf.c,v
retrieving revision 1.8
diff -u -r1.8 cong-editor-area-pixbuf.c
--- a/src/cong-editor-area-pixbuf.c	18 Apr 2004 05:32:29 -0000	1.8
+++ b/src/cong-editor-area-pixbuf.c	24 Jun 2004 17:45:06 -0000
@@ -83,6 +83,7 @@
  * @pixbuf:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorArea*
 cong_editor_area_pixbuf_construct (CongEditorAreaPixbuf *area_pixbuf,
@@ -109,6 +110,7 @@
  * @pixbuf:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorArea*
 cong_editor_area_pixbuf_new (CongEditorWidget3 *editor_widget,
@@ -160,6 +162,7 @@
  * @area_pixbuf:
  *
  * TODO: Write me
+ * Returns:
  */
 GdkPixbuf*
 get_pixbuf (CongEditorAreaPixbuf *area_pixbuf)
@@ -181,6 +184,7 @@
  * @state:
  *
  * TODO: Write me
+ * Returns:
  */
 GdkPixbuf*
 generate_pixbuf_for_state (GdkPixbuf *normal_pixbuf,
Index: src/cong-editor-area-spacer.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-editor-area-spacer.c,v
retrieving revision 1.5
diff -u -r1.5 cong-editor-area-spacer.c
--- a/src/cong-editor-area-spacer.c	18 Apr 2004 05:32:29 -0000	1.5
+++ b/src/cong-editor-area-spacer.c	24 Jun 2004 17:45:06 -0000
@@ -109,6 +109,7 @@
  * @width_hint:
  *
  * TODO: Write me
+ * Returns:
  */
 static gint
 calc_requisition (CongEditorArea *area, 
Index: src/cong-editor-area-span-tag.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-editor-area-span-tag.c,v
retrieving revision 1.18
diff -u -r1.18 cong-editor-area-span-tag.c
--- a/src/cong-editor-area-span-tag.c	23 Jun 2004 17:37:29 -0000	1.18
+++ b/src/cong-editor-area-span-tag.c	24 Jun 2004 17:45:06 -0000
@@ -116,6 +116,7 @@
  * @is_at_end:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorArea*
 cong_editor_area_span_tag_construct (CongEditorAreaSpanTag *area_span_tag,
@@ -177,6 +178,7 @@
  * @is_at_end:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorArea*
 cong_editor_area_span_tag_new (CongEditorWidget3 *editor_widget,
@@ -312,7 +314,7 @@
  * @area: CongEditorArea for parent span element
  *
  * Given area allocated for span element, allocate two subareas (its inner_bin and its title).
- * 
+ *
  */
 static void
 allocate_child_space (CongEditorArea *area)
Index: src/cong-editor-area-structural-tag.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-editor-area-structural-tag.c,v
retrieving revision 1.12
diff -u -r1.12 cong-editor-area-structural-tag.c
--- a/src/cong-editor-area-structural-tag.c	18 Apr 2004 05:32:29 -0000	1.12
+++ b/src/cong-editor-area-structural-tag.c	24 Jun 2004 17:45:06 -0000
@@ -130,6 +130,7 @@
  * @text:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorArea*
 cong_editor_area_structural_tag_construct (CongEditorAreaStructuralTag *area_structural_tag,
@@ -163,6 +164,7 @@
  * @text:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorArea*
 cong_editor_area_structural_tag_new (CongEditorWidget3 *editor_widget,
Index: src/cong-editor-area-structural.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-editor-area-structural.c,v
retrieving revision 1.8
diff -u -r1.8 cong-editor-area-structural.c
--- a/src/cong-editor-area-structural.c	18 Apr 2004 05:32:29 -0000	1.8
+++ b/src/cong-editor-area-structural.c	24 Jun 2004 17:45:07 -0000
@@ -130,6 +130,7 @@
  * @col_text:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorArea*
 cong_editor_area_structural_construct (CongEditorAreaStructural *area_structural,
@@ -277,6 +278,7 @@
  * @col_text:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorArea*
 cong_editor_area_structural_new (CongEditorWidget3 *editor_widget,
Index: src/cong-editor-area-text-comment.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-editor-area-text-comment.c,v
retrieving revision 1.4
diff -u -r1.4 cong-editor-area-text-comment.c
--- a/src/cong-editor-area-text-comment.c	18 Apr 2004 05:32:29 -0000	1.4
+++ b/src/cong-editor-area-text-comment.c	24 Jun 2004 17:45:07 -0000
@@ -96,6 +96,7 @@
  * @use_markup:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorArea*
 cong_editor_area_text_comment_construct (CongEditorAreaTextComment *area_text_comment,
@@ -140,6 +141,7 @@
  * @use_markup:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorArea*
 cong_editor_area_text_comment_new (CongEditorWidget3 *editor_widget,
Index: src/cong-editor-area-text-fragment.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-editor-area-text-fragment.c,v
retrieving revision 1.10
diff -u -r1.10 cong-editor-area-text-fragment.c
--- a/src/cong-editor-area-text-fragment.c	18 Apr 2004 05:32:29 -0000	1.10
+++ b/src/cong-editor-area-text-fragment.c	24 Jun 2004 17:45:07 -0000
@@ -92,6 +92,7 @@
  * @baseline:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorArea*
 cong_editor_area_text_fragment_construct (CongEditorAreaTextFragment *area_text_fragment,
@@ -129,6 +130,7 @@
  * @baseline:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorArea*
 cong_editor_area_text_fragment_new (CongEditorWidget3 *editor_widget,
@@ -155,6 +157,7 @@
  * @area_text_fragment:
  *
  * TODO: Write me
+ * Returns:
  */
 PangoLayoutLine*
 cong_editor_area_text_get_pango_layout_line (CongEditorAreaTextFragment *area_text_fragment)
@@ -174,6 +177,7 @@
  * @area_text_fragment:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean
 cong_editor_area_text_fragment_is_final_line (CongEditorAreaTextFragment *area_text_fragment)
@@ -191,6 +195,7 @@
  * @trailing:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean
 cong_editor_area_text_fragment_x_to_index (CongEditorAreaTextFragment *area_text_fragment,
Index: src/cong-editor-area-text.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-editor-area-text.c,v
retrieving revision 1.12
diff -u -r1.12 cong-editor-area-text.c
--- a/src/cong-editor-area-text.c	18 Apr 2004 05:32:29 -0000	1.12
+++ b/src/cong-editor-area-text.c	24 Jun 2004 17:45:07 -0000
@@ -86,6 +86,7 @@
  * @use_markup:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorArea*
 cong_editor_area_text_construct (CongEditorAreaText *area_text,
@@ -141,6 +142,7 @@
  * @use_markup:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorArea*
 cong_editor_area_text_new (CongEditorWidget3 *editor_widget,
@@ -214,6 +216,7 @@
  * @orientation:
  *
  * TODO: Write me
+ * Returns:
  */
 gint 
 cong_editor_area_text_get_single_line_requisition (CongEditorAreaText *area_text,
@@ -234,6 +237,7 @@
  * @trailing:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean
 cong_editor_area_text_xy_to_index (CongEditorAreaText *area_text,
Index: src/cong-editor-area-underline.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-editor-area-underline.c,v
retrieving revision 1.7
diff -u -r1.7 cong-editor-area-underline.c
--- a/src/cong-editor-area-underline.c	23 Jun 2004 17:37:29 -0000	1.7
+++ b/src/cong-editor-area-underline.c	24 Jun 2004 17:45:07 -0000
@@ -76,6 +76,7 @@
  * @style:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorArea*
 cong_editor_area_underline_construct (CongEditorAreaUnderline *area_underline,
@@ -99,6 +100,7 @@
  * @style:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorArea*
 cong_editor_area_underline_new (CongEditorWidget3 *editor_widget,
Index: src/cong-editor-area-unknown-tag.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-editor-area-unknown-tag.c,v
retrieving revision 1.12
diff -u -r1.12 cong-editor-area-unknown-tag.c
--- a/src/cong-editor-area-unknown-tag.c	23 Jun 2004 17:37:29 -0000	1.12
+++ b/src/cong-editor-area-unknown-tag.c	24 Jun 2004 17:45:07 -0000
@@ -100,6 +100,7 @@
  * @tagname:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorArea*
 cong_editor_area_unknown_tag_construct (CongEditorAreaUnknownTag *area_unknown_tag,
@@ -179,6 +180,7 @@
  * @tagname:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorArea*
 cong_editor_area_unknown_tag_new (CongEditorWidget3 *editor_widget,
Index: src/cong-editor-area.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-editor-area.c,v
retrieving revision 1.23
diff -u -r1.23 cong-editor-area.c
--- a/src/cong-editor-area.c	18 Apr 2004 05:32:29 -0000	1.23
+++ b/src/cong-editor-area.c	24 Jun 2004 17:45:08 -0000
@@ -213,6 +213,7 @@
  * @editor_widget:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorArea*
 cong_editor_area_construct (CongEditorArea *area,
@@ -242,6 +243,7 @@
  * @area:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorWidget3*
 cong_editor_area_get_widget (CongEditorArea *area)
@@ -256,6 +258,7 @@
  * @area:
  *
  * TODO: Write me
+ * Returns:
  */
 CongDocument*
 cong_editor_area_get_document (CongEditorArea *area)
@@ -270,6 +273,7 @@
  * @area:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 cong_editor_area_is_hidden (CongEditorArea *area)
@@ -305,9 +309,10 @@
 
 /**
  * cong_editor_area_get_state:
- * @area:
+ * @editor_area:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkStateType
 cong_editor_area_get_state (CongEditorArea *area)
@@ -319,7 +324,7 @@
 
 /**
  * cong_editor_area_set_state:
- * @area:
+ * @editor_area:
  * @state:
  *
  * TODO: Write me
@@ -343,6 +348,7 @@
  * @area:
  *
  * TODO: Write me
+ * Returns:
  */
 GdkCursor*
 cong_editor_area_get_cursor (CongEditorArea *area)
@@ -385,6 +391,7 @@
  * @area:
  *
  * TODO: Write me
+ * Returns:
  */
 const GdkRectangle*
 cong_editor_area_get_window_coords (CongEditorArea *area)
@@ -402,6 +409,7 @@
  * @width_hint:
  *
  * TODO: Write me
+ * Returns:
  */
 guint
 cong_editor_area_get_requisition (CongEditorArea *area,
@@ -454,6 +462,7 @@
  * @width_hint:
  *
  * TODO: Write me
+ * Returns:
  */
 gint
 cong_editor_area_get_requisition_width (CongEditorArea *area,
@@ -471,6 +480,7 @@
  * @width_hint:
  *
  * TODO: Write me
+ * Returns:
  */
 gint
 cong_editor_area_get_requisition_height (CongEditorArea *area,
@@ -487,6 +497,7 @@
  * @orientation:
  *
  * TODO: Write me
+ * Returns:
  */
 gint
 cong_editor_area_get_cached_requisition (CongEditorArea *area,
@@ -582,6 +593,7 @@
  * @area:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorArea*
 cong_editor_area_get_parent (CongEditorArea *area)
@@ -663,6 +675,7 @@
  * @event:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean
 cong_editor_area_on_button_press (CongEditorArea *editor_area, 
@@ -687,6 +700,7 @@
  * @event:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean
 cong_editor_area_on_motion_notify (CongEditorArea *editor_area, 
@@ -711,6 +725,7 @@
  * @event:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean
 cong_editor_area_on_key_press (CongEditorArea *editor_area, 
@@ -736,6 +751,7 @@
  * @width_hint:
  *
  * TODO: Write me
+ * Returns:
  */
 guint
 cong_editor_area_calc_requisition (CongEditorArea *editor_area, 
@@ -874,6 +890,7 @@
  * @user_data:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorArea*
 cong_editor_area_for_all (CongEditorArea *editor_area, 
@@ -961,6 +978,7 @@
  * @y:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean
 cong_editor_area_covers_xy (CongEditorArea *editor_area, 
@@ -996,6 +1014,7 @@
  * @y:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorArea*
 cong_editor_area_get_immediate_child_at (CongEditorArea *area,
@@ -1019,6 +1038,7 @@
  * @y:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorArea*
 cong_editor_area_get_deepest_child_at (CongEditorArea *area,
@@ -1056,6 +1076,7 @@
  * @editor_area:
  *
  * TODO: Write me
+ * Returns:
  */
 GdkWindow*
 cong_editor_area_get_gdk_window(CongEditorArea *editor_area)
Index: src/cong-editor-child-policy-flow-holder.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-editor-child-policy-flow-holder.c,v
retrieving revision 1.2
diff -u -r1.2 cong-editor-child-policy-flow-holder.c
--- a/src/cong-editor-child-policy-flow-holder.c	18 Apr 2004 05:32:29 -0000	1.2
+++ b/src/cong-editor-child-policy-flow-holder.c	24 Jun 2004 17:45:09 -0000
@@ -72,6 +72,7 @@
  * @flow_holder:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorChildPolicy*
 cong_editor_child_policy_flow_holder_construct (CongEditorChildPolicyFlowHolder *child_policy_flow_holder,
@@ -92,6 +93,7 @@
  * @flow_holder:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorChildPolicy*
 cong_editor_child_policy_flow_holder_new (CongEditorNode *editor_node,
Index: src/cong-editor-child-policy-inline.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-editor-child-policy-inline.c,v
retrieving revision 1.2
diff -u -r1.2 cong-editor-child-policy-inline.c
--- a/src/cong-editor-child-policy-inline.c	18 Apr 2004 05:32:29 -0000	1.2
+++ b/src/cong-editor-child-policy-inline.c	24 Jun 2004 17:45:09 -0000
@@ -72,6 +72,7 @@
  * @inlines:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorChildPolicy*
 cong_editor_child_policy_inline_construct (CongEditorChildPolicyInline *child_policy_inline,
@@ -92,6 +93,7 @@
  * @inlines:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorChildPolicy*
 cong_editor_child_policy_inline_new (CongEditorNode *editor_node,
@@ -120,6 +122,7 @@
  * @editor_node:
  *
  * TODO: Write me
+ * Returns:
  */
 static CongEditorChildPolicy* 
 insert_areas_for_node (CongEditorChildPolicy *child_policy,
Index: src/cong-editor-child-policy.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-editor-child-policy.c,v
retrieving revision 1.4
diff -u -r1.4 cong-editor-child-policy.c
--- a/src/cong-editor-child-policy.c	18 Apr 2004 05:32:29 -0000	1.4
+++ b/src/cong-editor-child-policy.c	24 Jun 2004 17:45:09 -0000
@@ -76,6 +76,7 @@
  * @child_policy:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorNode*
 cong_editor_child_policy_get_node (CongEditorChildPolicy *child_policy)
@@ -101,6 +102,7 @@
  * @node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorChildPolicy* 
 cong_editor_child_policy_insert_areas_for_node (CongEditorChildPolicy *child_policy,
Index: src/cong-editor-line-fragments.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-editor-line-fragments.c,v
retrieving revision 1.2
diff -u -r1.2 cong-editor-line-fragments.c
--- a/src/cong-editor-line-fragments.c	18 Apr 2004 05:32:29 -0000	1.2
+++ b/src/cong-editor-line-fragments.c	24 Jun 2004 17:45:10 -0000
@@ -74,6 +74,7 @@
  * @line_fragments:
  *
  * TODO: Write me
+ * Returns:
  */
 GList*
 cong_editor_line_fragments_get_area_list (CongEditorLineFragments *line_fragments)
Index: src/cong-editor-node-comment.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-editor-node-comment.c,v
retrieving revision 1.9
diff -u -r1.9 cong-editor-node-comment.c
--- a/src/cong-editor-node-comment.c	18 Apr 2004 05:32:29 -0000	1.9
+++ b/src/cong-editor-node-comment.c	24 Jun 2004 17:45:10 -0000
@@ -94,10 +94,11 @@
 /**
  * cong_editor_node_comment_construct:
  * @editor_node_comment:
- * @editor_widget:
+ * @widget:
  * @traversal_node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorNodeComment*
 cong_editor_node_comment_construct (CongEditorNodeComment *editor_node_comment,
@@ -121,6 +122,7 @@
  * @traversal_node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorNode*
 cong_editor_node_comment_new (CongEditorWidget3 *widget,
Index: src/cong-editor-node-document.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-editor-node-document.c,v
retrieving revision 1.8
diff -u -r1.8 cong-editor-node-document.c
--- a/src/cong-editor-node-document.c	18 Apr 2004 05:32:29 -0000	1.8
+++ b/src/cong-editor-node-document.c	24 Jun 2004 17:45:10 -0000
@@ -63,10 +63,11 @@
 /**
  * cong_editor_node_document_construct:
  * @editor_node_document:
- * @editor_widget:
+ * @widget:
  * @traversal_node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorNodeDocument*
 cong_editor_node_document_construct (CongEditorNodeDocument *editor_node_document,
@@ -85,6 +86,7 @@
  * @traversal_node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorNode*
 cong_editor_node_document_new (CongEditorWidget3 *widget,
@@ -104,6 +106,7 @@
  * @editor_node:
  *
  * TODO: Write me
+ * Returns:
  */
 static CongEditorArea*
 generate_block_area (CongEditorNode *editor_node)
Index: src/cong-editor-node-dtd.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-editor-node-dtd.c,v
retrieving revision 1.4
diff -u -r1.4 cong-editor-node-dtd.c
--- a/src/cong-editor-node-dtd.c	18 Apr 2004 05:32:29 -0000	1.4
+++ b/src/cong-editor-node-dtd.c	24 Jun 2004 17:45:10 -0000
@@ -63,10 +63,11 @@
 /**
  * cong_editor_node_dtd_construct:
  * @editor_node_dtd:
- * @editor_widget:
+ * @widget:
  * @traversal_node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorNodeDtd*
 cong_editor_node_dtd_construct (CongEditorNodeDtd *editor_node_dtd,
@@ -85,6 +86,7 @@
  * @traversal_node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorNode*
 cong_editor_node_dtd_new (CongEditorWidget3 *widget,
@@ -104,6 +106,7 @@
  * @editor_node:
  *
  * TODO: Write me
+ * Returns:
  */
 static CongEditorArea*
 generate_block_area (CongEditorNode *editor_node)
Index: src/cong-editor-node-element-span.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-editor-node-element-span.c,v
retrieving revision 1.15
diff -u -r1.15 cong-editor-node-element-span.c
--- a/src/cong-editor-node-element-span.c	23 Jun 2004 17:37:29 -0000	1.15
+++ b/src/cong-editor-node-element-span.c	24 Jun 2004 17:45:10 -0000
@@ -82,10 +82,11 @@
 /**
  * cong_editor_node_element_span_construct:
  * @editor_node_element_span:
- * @editor_widget:
+ * @widget:
  * @traversal_node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorNodeElementSpan*
 cong_editor_node_element_span_construct (CongEditorNodeElementSpan *editor_node_element_span,
@@ -105,6 +106,7 @@
  * @traversal_node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorNode*
 cong_editor_node_element_span_new (CongEditorWidget3* widget,
Index: src/cong-editor-node-element-structural.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-editor-node-element-structural.c,v
retrieving revision 1.11
diff -u -r1.11 cong-editor-node-element-structural.c
--- a/src/cong-editor-node-element-structural.c	18 Apr 2004 05:32:29 -0000	1.11
+++ b/src/cong-editor-node-element-structural.c	24 Jun 2004 17:45:10 -0000
@@ -66,10 +66,11 @@
 /**
  * cong_editor_node_element_structural_construct:
  * @editor_node_element_structural:
- * @editor_widget:
+ * @widget:
  * @traversal_node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorNodeElementStructural*
 cong_editor_node_element_structural_construct (CongEditorNodeElementStructural *editor_node_element_structural,
@@ -89,6 +90,7 @@
  * @traversal_node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorNode*
 cong_editor_node_element_structural_new (CongEditorWidget3* widget,
Index: src/cong-editor-node-element-unknown.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-editor-node-element-unknown.c,v
retrieving revision 1.9
diff -u -r1.9 cong-editor-node-element-unknown.c
--- a/src/cong-editor-node-element-unknown.c	18 Apr 2004 05:32:29 -0000	1.9
+++ b/src/cong-editor-node-element-unknown.c	24 Jun 2004 17:45:10 -0000
@@ -62,10 +62,11 @@
 /**
  * cong_editor_node_element_unknown_construct:
  * @editor_node_element_unknown:
- * @editor_widget:
+ * @widget:
  * @traversal_node:
  * 
  * TODO: Write me
+ * Returns:
  */
 CongEditorNodeElementUnknown*
 cong_editor_node_element_unknown_construct (CongEditorNodeElementUnknown *editor_node_element_unknown,
@@ -85,6 +86,7 @@
  * @traversal_node:
  * 
  * TODO: Write me
+ * Returns:
  */
 CongEditorNode*
 cong_editor_node_element_unknown_new (CongEditorWidget3* widget,
@@ -105,6 +107,7 @@
  * @editor_node:
  * 
  * TODO: Write me
+ * Returns:
  */
 static CongEditorArea*
 generate_block_area (CongEditorNode *editor_node)
Index: src/cong-editor-node-element.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-editor-node-element.c,v
retrieving revision 1.4
diff -u -r1.4 cong-editor-node-element.c
--- a/src/cong-editor-node-element.c	18 Apr 2004 05:32:29 -0000	1.4
+++ b/src/cong-editor-node-element.c	24 Jun 2004 17:45:10 -0000
@@ -55,10 +55,11 @@
 /**
  * cong_editor_node_element_construct:
  * @editor_node_element:
- * @editor_widget:
+ * @widget:
  * @traversal_node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorNodeElement*
 cong_editor_node_element_construct (CongEditorNodeElement *editor_node_element,
@@ -77,6 +78,7 @@
  * @editor_node_element:
  *
  * TODO: Write me
+ * Returns:
  */
 CongDispspecElement*
 cong_editor_node_element_get_dispspec_element (CongEditorNodeElement *editor_node_element)
Index: src/cong-editor-node-entity-decl.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-editor-node-entity-decl.c,v
retrieving revision 1.5
diff -u -r1.5 cong-editor-node-entity-decl.c
--- a/src/cong-editor-node-entity-decl.c	18 Apr 2004 05:32:29 -0000	1.5
+++ b/src/cong-editor-node-entity-decl.c	24 Jun 2004 17:45:11 -0000
@@ -64,10 +64,11 @@
 /**
  * cong_editor_node_entity_decl_construct:
  * @editor_node_entity_decl:
- * @editor_widget:
+ * @widget:
  * @traversal_node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorNodeEntityDecl*
 cong_editor_node_entity_decl_construct (CongEditorNodeEntityDecl *editor_node_entity_decl,
@@ -86,6 +87,7 @@
  * @traversal_node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorNode*
 cong_editor_node_entity_decl_new (CongEditorWidget3 *widget,
@@ -105,6 +107,7 @@
  * @editor_node:
  *
  * TODO: Write me
+ * Returns:
  */
 static CongEditorArea*
 generate_block_area (CongEditorNode *editor_node)
Index: src/cong-editor-node-entity-ref.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-editor-node-entity-ref.c,v
retrieving revision 1.4
diff -u -r1.4 cong-editor-node-entity-ref.c
--- a/src/cong-editor-node-entity-ref.c	18 Apr 2004 05:32:29 -0000	1.4
+++ b/src/cong-editor-node-entity-ref.c	24 Jun 2004 17:45:11 -0000
@@ -64,10 +64,11 @@
 /**
  * cong_editor_node_entity_ref_construct:
  * @editor_node_entity_ref:
- * @editor_widget:
+ * @widget:
  * @traversal_node:
  * 
  * TODO: Write me
+ * Returns:
  */
 CongEditorNodeEntityRef*
 cong_editor_node_entity_ref_construct (CongEditorNodeEntityRef *editor_node_entity_ref,
@@ -86,6 +87,7 @@
  * @traversal_node:
  * 
  * TODO: Write me
+ * Returns:
  */
 CongEditorNode*
 cong_editor_node_entity_ref_new (CongEditorWidget3 *widget,
@@ -105,6 +107,7 @@
  * @editor_node:
  * 
  * TODO: Write me
+ * Returns:
  */
 static CongEditorArea*
 generate_block_area (CongEditorNode *editor_node)
Index: src/cong-editor-node-text.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-editor-node-text.c,v
retrieving revision 1.44
diff -u -r1.44 cong-editor-node-text.c
--- a/src/cong-editor-node-text.c	23 Jun 2004 17:37:29 -0000	1.44
+++ b/src/cong-editor-node-text.c	24 Jun 2004 17:45:12 -0000
@@ -202,10 +202,11 @@
 /**
  * cong_editor_node_text_construct:
  * @editor_node_text:
- * @editor_widget:
+ * @widget:
  * @traversal_node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorNodeText*
 cong_editor_node_text_construct (CongEditorNodeText *editor_node_text,
@@ -281,6 +282,7 @@
  * @traversal_node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorNode*
 cong_editor_node_text_new (CongEditorWidget3 *widget,
@@ -303,6 +305,7 @@
  * @stripped_byte_offset:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean
 cong_editor_node_text_convert_original_byte_offset_to_stripped (CongEditorNodeText *editor_node_text,
@@ -321,6 +324,7 @@
  * @output_index:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean
 cong_eel_pango_layout_calc_up (PangoLayout *layout,
@@ -370,6 +374,7 @@
  * @output_index:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean
 cong_eel_pango_layout_calc_down (PangoLayout *layout,
@@ -416,6 +421,7 @@
  * @output_byte_offset:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean
 cong_editor_node_text_calc_up (CongEditorNodeText *editor_node_text,
@@ -454,6 +460,7 @@
  * @output_byte_offset:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean
 cong_editor_node_text_calc_down (CongEditorNodeText *editor_node_text,
@@ -542,6 +549,7 @@
  * @output:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean
 cong_selection_get_start_byte_offset (CongSelection *selection, 
@@ -601,6 +609,7 @@
  * @output:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean
 cong_selection_get_end_byte_offset (CongSelection *selection, 
@@ -662,6 +671,7 @@
  * @initial_indent:
  *
  * TODO: Write me
+ * Returns:
  */
 static CongEditorLineFragments*
 generate_line_areas_recursive (CongEditorNode *editor_node,
Index: src/cong-editor-node-unimplemented.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-editor-node-unimplemented.c,v
retrieving revision 1.11
diff -u -r1.11 cong-editor-node-unimplemented.c
--- a/src/cong-editor-node-unimplemented.c	18 Apr 2004 05:32:29 -0000	1.11
+++ b/src/cong-editor-node-unimplemented.c	24 Jun 2004 17:45:12 -0000
@@ -63,11 +63,12 @@
 /**
  * cong_editor_node_unimplemented_construct:
  * @editor_node_unimplemented:
- * @editor_widget:
+ * @widget:
  * @traversal_node:
  * @description:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorNodeUnimplemented*
 cong_editor_node_unimplemented_construct (CongEditorNodeUnimplemented *editor_node_unimplemented,
@@ -86,11 +87,12 @@
 
 /**
  * cong_editor_node_unimplemented_new:
- * @editor_widget:
+ * @widget:
  * @traversal_node:
  * @description:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorNode*
 cong_editor_node_unimplemented_new (CongEditorWidget3 *widget,
@@ -112,6 +114,7 @@
  * @editor_node:
  *
  * TODO: Write me
+ * Returns:
  */
 static CongEditorArea*
 generate_block_area (CongEditorNode *editor_node)
Index: src/cong-editor-node.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-editor-node.c,v
retrieving revision 1.26
diff -u -r1.26 cong-editor-node.c
--- a/src/cong-editor-node.c	23 Jun 2004 17:37:29 -0000	1.26
+++ b/src/cong-editor-node.c	24 Jun 2004 17:45:14 -0000
@@ -125,10 +125,11 @@
 /**
  * cong_editor_node_construct:
  * @editor_node:
- * @editor_widget:
+ * @widget:
  * @traversal_node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorNode*
 cong_editor_node_construct (CongEditorNode *editor_node,
@@ -147,6 +148,7 @@
  * @traversal_node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorNode*
 cong_editor_node_manufacture (CongEditorWidget3* widget,
@@ -306,6 +308,7 @@
  * @editor_node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorWidget3*
 cong_editor_node_get_widget (CongEditorNode *editor_node)
@@ -320,6 +323,7 @@
  * @editor_node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongDocument*
 cong_editor_node_get_document (CongEditorNode *editor_node)
@@ -334,6 +338,7 @@
  * @editor_node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongNodePtr
 cong_editor_node_get_node (CongEditorNode *editor_node)
@@ -348,6 +353,7 @@
  * @editor_node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongTraversalNode*
 cong_editor_node_get_traversal_node (CongEditorNode *editor_node)
@@ -362,6 +368,7 @@
  * @editor_node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorNode*
 cong_editor_node_get_traversal_parent (CongEditorNode *editor_node)
@@ -381,6 +388,7 @@
  * @editor_node:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean
 cong_editor_node_is_selected (CongEditorNode *editor_node)
@@ -416,6 +424,7 @@
  * @editor_node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorArea*
 cong_editor_node_generate_block_area (CongEditorNode *editor_node)
@@ -437,6 +446,7 @@
  * @initial_indent:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorLineFragments*
 cong_editor_node_generate_line_areas_recursive (CongEditorNode *editor_node,
@@ -478,6 +488,7 @@
  * @editor_node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongFlowType
 cong_editor_node_get_flow_type (CongEditorNode *editor_node)
@@ -511,6 +522,7 @@
  * @editor_node:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean
 cong_editor_node_is_referenced_entity_decl (CongEditorNode *editor_node)
@@ -529,6 +541,7 @@
  * @editor_node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorNode*
 cong_editor_node_get_prev (CongEditorNode *editor_node)
@@ -568,6 +581,7 @@
  * @editor_node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorNode*
 cong_editor_node_get_next (CongEditorNode *editor_node)
@@ -606,6 +620,7 @@
  * @editor_node:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean
 cong_editor_node_is_referenced_entity_decl (CongEditorNode *editor_node)
@@ -627,6 +642,7 @@
  * @editor_node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorNode*
 cong_editor_node_get_prev (CongEditorNode *editor_node)
@@ -657,6 +673,7 @@
  * @editor_node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorNode*
 cong_editor_node_get_next (CongEditorNode *editor_node)
@@ -687,6 +704,7 @@
  * @editor_node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorChildPolicy*
 cong_editor_node_get_child_policy (CongEditorNode *editor_node)
@@ -717,6 +735,7 @@
  * @editor_node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorChildPolicy*
 cong_editor_node_get_parents_child_policy (CongEditorNode *editor_node)
Index: src/cong-editor-widget3.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-editor-widget3.c,v
retrieving revision 1.59
diff -u -r1.59 cong-editor-widget3.c
--- a/src/cong-editor-widget3.c	23 Jun 2004 17:37:29 -0000	1.59
+++ b/src/cong-editor-widget3.c	24 Jun 2004 17:45:15 -0000
@@ -309,6 +309,7 @@
  * @doc:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorWidget3*
 cong_editor_widget3_construct (CongEditorWidget3 *editor_widget,
@@ -432,6 +433,7 @@
  * @doc:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkWidget* 
 cong_editor_widget3_new(CongDocument *doc)
@@ -448,6 +450,7 @@
  * @editor_widget:
  *
  * TODO: Write me
+ * Returns:
  */
 CongDocument *
 cong_editor_widget3_get_document(CongEditorWidget3 *editor_widget)
@@ -462,6 +465,7 @@
  * @editor_widget:
  *
  * TODO: Write me
+ * Returns:
  */
 CongDispspec *
 cong_editor_widget_get_dispspec(CongEditorWidget3 *editor_widget)
@@ -503,6 +507,7 @@
  * @traversal_node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorNode*
 cong_editor_widget3_get_editor_node_for_traversal_node (CongEditorWidget3 *editor_widget,
@@ -545,7 +550,7 @@
 
 /**
  * cong_editor_widget3_for_each_editor_node:
- * @editor_widget:
+ * @widget:
  * @xml_node:
  * @editor_node_callback:
  * @user_data:
@@ -577,9 +582,10 @@
 /**
  * cong_editor_widget3_get_an_editor_node:
  * @editor_widget:
- * @xml_node:
+ * @node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorNode*
 cong_editor_widget3_get_an_editor_node (CongEditorWidget3 *editor_widget,
@@ -606,6 +612,7 @@
  * @editor_widget:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorArea*
 cong_editor_widget3_get_prehighlight_editor_area (CongEditorWidget3 *editor_widget)
@@ -668,6 +675,7 @@
  * @editor_widget:
  *
  * TODO: Write me
+ * Returns:
  */
 GdkGC*
 cong_editor_widget3_get_test_gc (CongEditorWidget3 *editor_widget)
@@ -684,6 +692,7 @@
  * @y:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorArea*
 cong_editor_widget3_get_area_at (CongEditorWidget3 *editor_widget,
@@ -700,6 +709,7 @@
  * @flow_type:
  *
  * TODO: Write me
+ * Returns:
  */
 const gchar*
 cong_flow_type_get_debug_string(CongFlowType flow_type)
@@ -1811,6 +1821,7 @@
  * @editor_node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorChildPolicy*
 cong_editor_widget3_get_parents_child_policy_for_editor_node (CongEditorWidget3 *widget,
@@ -1835,6 +1846,7 @@
  * @editor_node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorArea*
 cong_editor_widget3_get_primary_area_for_editor_node (CongEditorWidget3 *widget,
@@ -1853,6 +1865,7 @@
  * @editor_node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorAreaFlowHolder*
 cong_editor_widget3_get_parent_flow_holder_for_editor_node (CongEditorWidget3 *widget,
@@ -1871,6 +1884,7 @@
  * @editor_node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorAreaFlowHolder*
 cong_editor_widget3_get_child_flow_holder_for_editor_node (CongEditorWidget3 *widget,
Index: src/cong-eel-graphic-effects.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-eel-graphic-effects.c,v
retrieving revision 1.3
diff -u -r1.3 cong-eel-graphic-effects.c
--- a/src/cong-eel-graphic-effects.c	18 Apr 2004 05:32:29 -0000	1.3
+++ b/src/cong-eel-graphic-effects.c	24 Jun 2004 17:45:15 -0000
@@ -80,9 +80,10 @@
 
 /**
  * eel_create_spotlight_pixbuf:
- * @src:
+ * @source_pixbuf:
  *
  * TODO: Write me
+ * Returns:
  */
 GdkPixbuf *
 eel_create_spotlight_pixbuf (GdkPixbuf* src)
@@ -132,11 +133,12 @@
 
 /**
  * eel_create_darkened_pixbuf:
- * @src:
+ * @source_pixbuf:
  * @saturation:
  * @darken:
  *
  * TODO: Write me
+ * Returns:
  */
 GdkPixbuf *
 eel_create_darkened_pixbuf (GdkPixbuf *src, int saturation, int darken)
@@ -193,12 +195,13 @@
 /* this routine colorizes the passed-in pixbuf by multiplying each pixel with the passed in color */
 /**
  * eel_create_colorized_pixbuf:
- * @src:
+ * @source_pixbuf:
  * @red_value:
  * @green_value:
  * @blue_value:
  *
  * TODO: Write me
+ * Returns:
  */
 GdkPixbuf *
 eel_create_colorized_pixbuf (GdkPixbuf *src,
@@ -291,6 +294,7 @@
  * @fill_flag:
  *
  * TODO: Write me
+ * Returns:
  */
 GdkPixbuf *
 eel_stretch_frame_image (GdkPixbuf *frame_image, int left_offset, int top_offset, int right_offset, int bottom_offset,
@@ -358,6 +362,7 @@
  * @bottom_offset:
  *
  * TODO: Write me
+ * Returns:
  */
 GdkPixbuf *
 eel_embed_image_in_frame (GdkPixbuf *source_image, GdkPixbuf *frame_image, int left_offset, int top_offset, int right_offset, int bottom_offset)
@@ -388,9 +393,10 @@
    gdkpixmap and mask for the actual dragging */
 /**
  * eel_make_semi_transparent:
- * @src:
+ * @source_pixbuf:
  *
  * TODO: Write me
+ * Returns:
  */
 GdkPixbuf *
 eel_make_semi_transparent (GdkPixbuf *src)
Index: src/cong-eel.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-eel.c,v
retrieving revision 1.12
diff -u -r1.12 cong-eel.c
--- a/src/cong-eel.c	18 Apr 2004 05:32:29 -0000	1.12
+++ b/src/cong-eel.c	24 Jun 2004 17:45:16 -0000
@@ -59,6 +59,7 @@
  * @layout_line:
  *
  * TODO: Write me
+ * Returns:
  */
 gchar*
 cong_eel_pango_layout_line_get_text (PangoLayoutLine *layout_line)
@@ -125,6 +126,7 @@
  * @b:
  *
  * TODO: Write me
+ * Returns:
  */
 guint32
 cong_eel_rgb16_to_rgb (gushort r, gushort g, gushort b)
@@ -173,6 +175,7 @@
  * @option_menu:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkMenuItem* 
 cong_eel_option_menu_get_selected_menu_item(GtkOptionMenu *option_menu)
@@ -247,6 +250,7 @@
  * @xml_name:
  *
  * TODO: Write me
+ * Returns:
  */
 gchar *
 cong_eel_prettify_xml_name_with_header_capitalisation(const gchar *xml_name)
@@ -276,6 +280,7 @@
  * @xml_name:
  *
  * TODO: Write me
+ * Returns:
  */
 gchar *
 cong_eel_prettify_xml_name_with_sentence_capitalisation(const gchar *xml_name)
Index: src/cong-enum-mapping.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-enum-mapping.c,v
retrieving revision 1.3
diff -u -r1.3 cong-enum-mapping.c
--- a/src/cong-enum-mapping.c	18 Apr 2004 05:32:29 -0000	1.3
+++ b/src/cong-enum-mapping.c	24 Jun 2004 17:45:17 -0000
@@ -33,6 +33,7 @@
  * @default_value:
  *
  * TODO: Write me
+ * Returns:
  */
 guint
 cong_enum_mapping_lookup (const CongEnumMapping *enum_mapping,
@@ -65,6 +66,7 @@
  * @value:
  *
  * TODO: Write me
+ * Returns:
  */
 const gchar*
 cong_enum_mapping_lookup_string (const CongEnumMapping *enum_mapping,
Index: src/cong-error-dialog.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-error-dialog.c,v
retrieving revision 1.13
diff -u -r1.13 cong-error-dialog.c
--- a/src/cong-error-dialog.c	4 Jun 2004 01:49:02 -0000	1.13
+++ b/src/cong-error-dialog.c	24 Jun 2004 17:45:17 -0000
@@ -71,6 +71,7 @@
  * @suggestions:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkDialog* 
 cong_error_dialog_new(GtkWindow *parent_window,
@@ -124,7 +125,6 @@
 
 /**
  * cong_error_dialog_new_with_convenience:
- *
  * @parent_window: Parent window for dialog.
  * @what_failed: The description of what failed
  * @why_failed: The reasons of failture
@@ -218,6 +218,7 @@
  * @linenum:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkDialog*
 cong_error_dialog_new_from_unimplemented_feature(GtkWindow *parent_window,
@@ -249,6 +250,7 @@
  * @bugzilla_id:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkDialog*
 cong_error_dialog_new_from_unimplemented_feature_with_bugzilla_id(GtkWindow *parent_window,
@@ -298,6 +300,7 @@
  * @error:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkDialog*
 cong_error_dialog_new_from_gerror(GtkWindow *toplevel_window,
@@ -350,6 +353,7 @@
  * @command_line:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkDialog*
 cong_error_dialog_new_from_shell_command_failure_with_command_line(GtkWindow *parent_window,
@@ -425,7 +429,10 @@
  * @standard_error:
  * @argv:
  *
- * TODO: Write me
+ * Routine to manufacture an error dialog for when some shell operation fails, when you have access to the stderr output in the form of a string.
+ * argv is a NULL terminated array of strings.
+ *
+ * Returns:
  */
 GtkDialog*
 cong_error_dialog_new_from_shell_command_failure_with_argv(GtkWindow *parent_window,
Index: src/cong-error-dialog.h
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-error-dialog.h,v
retrieving revision 1.8
diff -u -r1.8 cong-error-dialog.h
--- a/src/cong-error-dialog.h	4 Jun 2004 01:49:02 -0000	1.8
+++ b/src/cong-error-dialog.h	24 Jun 2004 17:45:17 -0000
@@ -108,19 +108,6 @@
 								   const gchar *standard_error,
 								   const gchar *command_line);
 
-/**
- * cong_error_dialog_new_from_shell_command_failure_with_argv
- * @parent_window:
- * @what_failed:
- * @exit_status:
- * @standard_error:
- * @argv
- * 
- * Routine to manufacture an error dialog for when some shell operation fails, when you have access to the stderr output in the form of a string.
- * argv is a NULL terminated array of strings.
- * 
- * Returns: 
- */
 GtkDialog*
 cong_error_dialog_new_from_shell_command_failure_with_argv(GtkWindow *parent_window,
 							   const gchar *what_failed,
@@ -185,19 +172,6 @@
 					     GnomeVFSResult vfs_result, 
 					     const GnomeVFSFileSize* file_size);
 
-/**
- * cong_error_dialog_new_from_file_operation_failure
- * @parent_window:
- * @what_failed:
- * @string_uri: the URI from which you tried to access file.
- * @vfs_result:
- * @technical_details:
- * 
- * Routine to manufacture an error dialog for when some file operation fails that doesn't fall into one of the categories above.
- * Displays what operation has failed, with a convenience button to get more techical information.
- * 
- * Returns:
- */
 GtkDialog*
 cong_error_dialog_new_from_file_operation_failure(GtkWindow *parent_window,
 						  const gchar *what_failed,
Index: src/cong-error-file-open.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-error-file-open.c,v
retrieving revision 1.14
diff -u -r1.14 cong-error-file-open.c
--- a/src/cong-error-file-open.c	4 Jun 2004 01:49:02 -0000	1.14
+++ b/src/cong-error-file-open.c	24 Jun 2004 17:45:17 -0000
@@ -76,6 +76,7 @@
  * @transient:
  *
  * TODO: Write me
+ * Returns:
  */
 gchar*
 cong_error_what_failed_on_file_open_failure (const gchar *string_uri, 
@@ -121,6 +122,7 @@
  * @suggestions:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkDialog*
 cong_error_dialog_new_from_file_open_failure(GtkWindow *parent_window,
@@ -162,6 +164,7 @@
  * @convenience_data:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkDialog*
 cong_error_dialog_new_from_file_open_failure_with_convenience(GtkWindow *parent_window,
@@ -205,6 +208,7 @@
  * @vfs_result:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkDialog*
 cong_error_dialog_new_from_file_open_failure_with_vfs_result(GtkWindow *parent_window,
@@ -474,11 +478,14 @@
  * cong_error_dialog_new_from_file_operation_failure:
  * @parent_window:
  * @what_failed:
- * @string_uri:
+ * @string_uri: the URI from which you tried to access file.
  * @vfs_result:
  * @technical_details:
- *
- * TODO: Write me
+ * 
+ * Routine to manufacture an error dialog for when some file operation fails that doesn't fall into one of the categories above.
+ * Displays what operation has failed, with a convenience button to get more techical information.
+ * 
+ * Returns:
  */
 GtkDialog*
 cong_error_dialog_new_from_file_operation_failure(GtkWindow *parent_window,
Index: src/cong-error-file-save.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-error-file-save.c,v
retrieving revision 1.12
diff -u -r1.12 cong-error-file-save.c
--- a/src/cong-error-file-save.c	18 Apr 2004 05:32:29 -0000	1.12
+++ b/src/cong-error-file-save.c	24 Jun 2004 17:45:17 -0000
@@ -26,6 +26,7 @@
  * @file_size:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkDialog*
 cong_error_dialog_new_from_file_save_failure(GtkWindow *parent_window, 
Index: src/cong-file-new.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-file-new.c,v
retrieving revision 1.15
diff -u -r1.15 cong-file-new.c
--- a/src/cong-file-new.c	18 Apr 2004 05:32:29 -0000	1.15
+++ b/src/cong-file-new.c	24 Jun 2004 17:45:18 -0000
@@ -107,6 +107,7 @@
  * @user_data:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 first_page_of_factory_back(GnomeDruidPage *druidpage,
@@ -127,6 +128,7 @@
  * @user_data:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 last_page_of_factory_next(GnomeDruidPage *druidpage,
@@ -150,6 +152,7 @@
  * @is_last_of_factory:
  *
  * TODO: Write me
+ * Returns:
  */
 GnomeDruidPageStandard *
 cong_new_file_assistant_new_page(CongNewFileAssistant *assistant, 
@@ -214,6 +217,7 @@
  * @assistant:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkWindow *
 cong_new_file_assistant_get_toplevel(CongNewFileAssistant *assistant)
@@ -266,6 +270,7 @@
  * @document_factory:
  *
  * TODO: Write me
+ * Returns:
  */
 gpointer
 cong_new_file_assistant_get_data_for_factory (CongNewFileAssistant *assistant,
@@ -306,6 +311,7 @@
  * @assistant:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkWidget *
 make_type_selection_widget(CongNewFileAssistant *assistant)
@@ -407,6 +413,7 @@
  * @user_data:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 second_page_next(GnomeDruidPage *druidpage,
@@ -476,6 +483,7 @@
  * @user_data:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 final_page_back(GnomeDruidPage *druidpage,
@@ -497,6 +505,7 @@
  * @user_data:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 final_page_finish(GnomeDruidPage *druidpage,
@@ -663,10 +672,11 @@
 
 /**
  * toolbar_callback_new:
- * @widget:
+ * @w:
  * @data:
  *
  * TODO: Write me
+ * Returns:
  */
 gint 
 toolbar_callback_new(GtkWidget *widget, gpointer data)
Index: src/cong-file-open.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-file-open.c,v
retrieving revision 1.20
diff -u -r1.20 cong-file-open.c
--- a/src/cong-file-open.c	20 Jun 2004 21:39:23 -0000	1.20
+++ b/src/cong-file-open.c	24 Jun 2004 17:45:18 -0000
@@ -52,6 +52,7 @@
  * @filename_extension:
  *
  * TODO: Write me
+ * Returns:
  */
 CongDispspec* 
 query_for_forced_dispspec (gchar *what_failed, 
@@ -93,6 +94,7 @@
  * @uri:
  *
  * TODO: Write me
+ * Returns:
  */
 gchar*
 get_filename_extension (const GnomeVFSURI *uri)
@@ -225,6 +227,7 @@
  * @data:
  *
  * TODO: Write me
+ * Returns:
  */
 gint 
 toolbar_callback_open(GtkWidget *widget, gpointer data)
Index: src/cong-file-properties.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-file-properties.c,v
retrieving revision 1.21
diff -u -r1.21 cong-file-properties.c
--- a/src/cong-file-properties.c	22 Jun 2004 03:05:35 -0000	1.21
+++ b/src/cong-file-properties.c	24 Jun 2004 17:45:18 -0000
@@ -209,6 +209,7 @@
  * @parent_window:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkWidget*
 cong_file_properties_dialog_new (CongDocument *doc, 
Index: src/cong-file-save.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-file-save.c,v
retrieving revision 1.8
diff -u -r1.8 cong-file-save.c
--- a/src/cong-file-save.c	20 Jun 2004 21:39:23 -0000	1.8
+++ b/src/cong-file-save.c	24 Jun 2004 17:45:18 -0000
@@ -38,6 +38,7 @@
  * @data:
  *
  * TODO: Write me
+ * Returns:
  */
 gint 
 toolbar_callback_save(GtkWidget *w, gpointer data)
@@ -54,6 +55,7 @@
  * @parent_window:
  *
  * TODO: Write me
+ * Returns:
  */
 gint 
 save_document_as(CongDocument *doc, GtkWindow *parent_window)
@@ -92,6 +94,7 @@
  * @parent_window:
  *
  * TODO: Write me
+ * Returns:
  */
 gint 
 save_document(CongDocument *doc, GtkWindow *parent_window) 
Index: src/cong-font.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-font.c,v
retrieving revision 1.11
diff -u -r1.11 cong-font.c
--- a/src/cong-font.c	23 Jun 2004 17:37:29 -0000	1.11
+++ b/src/cong-font.c	24 Jun 2004 17:45:18 -0000
@@ -132,6 +132,7 @@
  * @text: a string
  * @x: a #gint
  * @y: a #gint
+ * @y_pos:
  *
  * TODO: Write me
  */
Index: src/cong-graph.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-graph.c,v
retrieving revision 1.2
diff -u -r1.2 cong-graph.c
--- a/src/cong-graph.c	18 Apr 2004 05:32:29 -0000	1.2
+++ b/src/cong-graph.c	24 Jun 2004 17:45:19 -0000
@@ -38,7 +38,7 @@
 /**
  * construct_dependency_node_from_file:
  * @node:
- * @klass
+ * @klass:
  * @uri:
  * 
  * TODO: Write me
Index: src/cong-location.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-location.c,v
retrieving revision 1.42
diff -u -r1.42 cong-location.c
--- a/src/cong-location.c	23 Jun 2004 17:37:29 -0000	1.42
+++ b/src/cong-location.c	24 Jun 2004 17:45:21 -0000
@@ -16,6 +16,7 @@
  * @loc:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean
 cong_location_is_valid(const CongLocation *loc)
@@ -128,7 +129,7 @@
  * cong_location_set_node_and_byte_offset:
  * @loc:
  * @node:
- * @offset:
+ * @byte_offset:
  *
  * TODO: Write me
  */
@@ -187,6 +188,7 @@
  * @loc:
  * 
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 cong_location_exists(const CongLocation *loc)
@@ -202,6 +204,7 @@
  * @loc1:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean
 cong_location_equals(const CongLocation *loc0, const CongLocation *loc1)
@@ -226,6 +229,7 @@
  * @loc:
  *
  * TODO: Write me
+ * Returns:
  */
 CongNodeType
 cong_location_node_type(const CongLocation *loc)
@@ -241,6 +245,7 @@
  * @loc:
  *
  * TODO: Write me
+ * Returns:
  */
 gunichar 
 cong_location_get_unichar(const CongLocation *loc)
@@ -257,6 +262,7 @@
  * @loc:
  *
  * TODO: Write me
+ * Returns:
  */
 gchar*
 cong_location_get_utf8_pointer(const CongLocation *loc)
@@ -494,6 +500,7 @@
  * @loc: a #CongLocation
  *
  * TODO: Write me
+ * Returns:
  */
 CongNodePtr
 cong_location_xml_frag_prev(const CongLocation *loc)
@@ -506,6 +513,7 @@
  * @loc:
  *
  * TODO: Write me
+ * Returns:
  */
 CongNodePtr
 cong_location_xml_frag_next(const CongLocation *loc)
@@ -518,6 +526,7 @@
  * @loc:
  * 
  * TODO: Write me
+ * Returns:
  */
 CongNodePtr
 cong_location_node(const CongLocation *loc)
@@ -530,6 +539,7 @@
  * @loc:
  *
  * TODO: Write me
+ * Returns:
  */
 CongNodePtr
 cong_location_parent(const CongLocation *loc)
@@ -562,6 +572,7 @@
  * @user_data:
  *
  * TODO: Write me
+ * Returns:
  */
 static gboolean
 is_valid_cursor_node (CongNodePtr node,
@@ -575,11 +586,13 @@
 
 /**
  * cong_location_calc_prev_char:
- * @input_loc:
- * @dispspec:
- * @output_loc:
+ * @input_loc: the current #CongLocation
+ * @dispspec: the #CongDispspec in use
+ * @output_loc: the #CongLocation that is computed
  *
- * TODO: Write me
+ * Calculates a new #CongLocation when the left key is pressed
+ * 
+ * Returns: %TRUE if succeeded
  */
 gboolean 
 cong_location_calc_prev_char(const CongLocation *input_loc, 
@@ -633,11 +646,13 @@
 
 /**
  * cong_location_calc_next_char:
- * @input_loc:
- * @dispspec:
- * @output_loc:
+ * @input_loc: the current #CongLocation
+ * @dispspec: the #CongDispspec in use
+ * @output_loc: the #CongLocation that is computed
  *
- * TODO: Write me
+ * Calculates a new #CongLocation when the right key is pressed
+ * 
+ * Returns: %TRUE if succeeded
  */
 gboolean 
 cong_location_calc_next_char(const CongLocation *input_loc,
@@ -736,6 +751,7 @@
  * @output_loc:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 cong_location_calc_prev_word(const CongLocation *input_loc, 
@@ -796,6 +812,7 @@
  * @output_loc:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 cong_location_calc_next_word(const CongLocation *input_loc, 
@@ -851,6 +868,7 @@
  * @node:
  *
  * TODO: Write me
+ * Returns:
  */
 static CongNodePtr
 get_root_node (CongNodePtr node)
@@ -870,6 +888,7 @@
  * @dispspec:
  *
  * TODO: Write me
+ * Returns:
  */
 static CongNodePtr
 get_enclosing_structural_element (CongNodePtr node,
@@ -912,6 +931,7 @@
  * @output_loc:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 cong_location_calc_document_start(const CongLocation *input_loc, 
@@ -945,6 +965,7 @@
  * @output_loc:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 cong_location_calc_line_start(const CongLocation *input_loc, 
@@ -982,6 +1003,7 @@
  * @output_loc:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 cong_location_calc_document_end(const CongLocation *input_loc, 
@@ -1015,6 +1037,7 @@
  * @output_loc:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 cong_location_calc_line_end(const CongLocation *input_loc, 
@@ -1052,6 +1075,7 @@
  * @output_loc:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 cong_location_calc_prev_page(const CongLocation *input_loc, 
@@ -1074,6 +1098,7 @@
  * @output_loc:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 cong_location_calc_next_page(const CongLocation *input_loc, 
@@ -1097,6 +1122,7 @@
  * @output_end_of_word:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean
 cong_location_calc_word_extent(const CongLocation *input_loc, 
Index: src/cong-location.h
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-location.h,v
retrieving revision 1.10
diff -u -r1.10 cong-location.h
--- a/src/cong-location.h	23 Jun 2004 17:37:29 -0000	1.10
+++ b/src/cong-location.h	24 Jun 2004 17:45:21 -0000
@@ -97,30 +97,10 @@
 void
 cong_location_copy(CongLocation *dst, const CongLocation *src);
 
-/**
- * cong_location_calc_prev_char:
- * @input_loc: the current #CongLocation
- * @dispspec: the #CongDispspec in use
- * @output_loc: the #CongLocation that is computed
- *
- * Calculates a new #CongLocation when the left key is pressed
- * 
- * Returns: %TRUE if succeeded
- */
 gboolean
 cong_location_calc_prev_char(const CongLocation *input_loc, 
 			     CongDispspec *dispspec,
 			     CongLocation *output_loc);
-/**
- * cong_location_calc_next_char:
- * @input_loc: the current #CongLocation
- * @dispspec: the #CongDispspec in use
- * @output_loc: the #CongLocation that is computed
- *
- * Calculates a new #CongLocation when the right key is pressed
- * 
- * Returns: %TRUE if succeeded
- */
 gboolean
 cong_location_calc_next_char(const CongLocation *input_loc,
 			     CongDispspec *dispspec,
Index: src/cong-menus.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-menus.c,v
retrieving revision 1.61
diff -u -r1.61 cong-menus.c
--- a/src/cong-menus.c	19 Jun 2004 22:54:26 -0000	1.61
+++ b/src/cong-menus.c	24 Jun 2004 17:45:23 -0000
@@ -75,6 +75,7 @@
  * @text:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkWidget* 
 make_uneditable_text(const gchar* text)
Index: src/cong-modification-cursor-change.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-modification-cursor-change.c,v
retrieving revision 1.5
diff -u -r1.5 cong-modification-cursor-change.c
--- a/src/cong-modification-cursor-change.c	18 Apr 2004 05:32:30 -0000	1.5
+++ b/src/cong-modification-cursor-change.c	24 Jun 2004 17:45:23 -0000
@@ -82,6 +82,7 @@
  * @new_location:
  *
  * TODO: Write me
+ * Returns:
  */
 CongModificationCursorChange*
 cong_modification_cursor_change_construct (CongModificationCursorChange *modification_cursor_change,
@@ -108,6 +109,7 @@
  * @new_location:
  *
  * TODO: Write me
+ * Returns:
  */
 CongModification*
 cong_modification_cursor_change_new (CongDocument *doc,
Index: src/cong-modification-selection-change.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-modification-selection-change.c,v
retrieving revision 1.5
diff -u -r1.5 cong-modification-selection-change.c
--- a/src/cong-modification-selection-change.c	18 Apr 2004 05:32:30 -0000	1.5
+++ b/src/cong-modification-selection-change.c	24 Jun 2004 17:45:23 -0000
@@ -85,6 +85,7 @@
  * @new_logical_end:
  *
  * TODO: Write me
+ * Returns:
  */
 CongModificationSelectionChange*
 cong_modification_selection_change_construct (CongModificationSelectionChange *modification_selection_change,
@@ -116,6 +117,7 @@
  * @new_logical_end:
  *
  * TODO: Write me
+ * Returns:
  */
 CongModification*
 cong_modification_selection_change_new (CongDocument *doc,
Index: src/cong-modification-set-dtd-ptr.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-modification-set-dtd-ptr.c,v
retrieving revision 1.5
diff -u -r1.5 cong-modification-set-dtd-ptr.c
--- a/src/cong-modification-set-dtd-ptr.c	18 Apr 2004 05:32:30 -0000	1.5
+++ b/src/cong-modification-set-dtd-ptr.c	24 Jun 2004 17:45:23 -0000
@@ -81,6 +81,7 @@
  * @dtd_ptr:
  *
  * TODO: Write me
+ * Returns:
  */
 CongModificationSetDtdPtr*
 cong_modification_set_dtd_ptr_construct (CongModificationSetDtdPtr *modification_set_dtd_ptr,
@@ -106,6 +107,7 @@
  * @dtd_ptr:
  *
  * TODO: Write me
+ * Returns:
  */
 CongModification*
 cong_modification_set_dtd_ptr_new (CongDocument *doc,
Index: src/cong-modification.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-modification.c,v
retrieving revision 1.3
diff -u -r1.3 cong-modification.c
--- a/src/cong-modification.c	18 Apr 2004 05:32:30 -0000	1.3
+++ b/src/cong-modification.c	24 Jun 2004 17:45:23 -0000
@@ -70,6 +70,7 @@
  * @modification:
  * 
  * TODO: Write me
+ * Returns:
  */
 CongDocument*
 cong_modification_get_document (CongModification *modification)
Index: src/cong-node-modification-add-after.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-node-modification-add-after.c,v
retrieving revision 1.6
diff -u -r1.6 cong-node-modification-add-after.c
--- a/src/cong-node-modification-add-after.c	10 Jun 2004 01:30:45 -0000	1.6
+++ b/src/cong-node-modification-add-after.c	24 Jun 2004 17:45:23 -0000
@@ -83,6 +83,7 @@
  * @older_sibling:
  *
  * TODO: Write me
+ * Returns:
  */
 CongNodeModificationAddAfter*
 cong_node_modification_add_after_construct (CongNodeModificationAddAfter *node_modification_add_after,
@@ -121,6 +122,7 @@
  * @older_sibling:
  *
  * TODO: Write me
+ * Returns:
  */
 CongModification*
 cong_node_modification_add_after_new (CongDocument *doc,
Index: src/cong-node-modification-add-before.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-node-modification-add-before.c,v
retrieving revision 1.6
diff -u -r1.6 cong-node-modification-add-before.c
--- a/src/cong-node-modification-add-before.c	10 Jun 2004 01:30:45 -0000	1.6
+++ b/src/cong-node-modification-add-before.c	24 Jun 2004 17:45:23 -0000
@@ -83,6 +83,7 @@
  * @younger_sibling:
  *
  * TODO: Write me
+ * Returns:
  */
 CongNodeModificationAddBefore*
 cong_node_modification_add_before_construct (CongNodeModificationAddBefore *node_modification_add_before,
@@ -121,6 +122,7 @@
  * @younger_sibling:
  *
  * TODO: Write me
+ * Returns:
  */
 CongModification*
 cong_node_modification_add_before_new (CongDocument *doc,
Index: src/cong-node-modification-make-orphan.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-node-modification-make-orphan.c,v
retrieving revision 1.6
diff -u -r1.6 cong-node-modification-make-orphan.c
--- a/src/cong-node-modification-make-orphan.c	10 Jun 2004 01:30:45 -0000	1.6
+++ b/src/cong-node-modification-make-orphan.c	24 Jun 2004 17:45:23 -0000
@@ -78,6 +78,7 @@
  * @node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongNodeModificationMakeOrphan*
 cong_node_modification_make_orphan_construct (CongNodeModificationMakeOrphan *node_modification_make_orphan,
@@ -111,6 +112,7 @@
  * @node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongModification*
 cong_node_modification_make_orphan_new (CongDocument *doc,
Index: src/cong-node-modification-remove-attribute.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-node-modification-remove-attribute.c,v
retrieving revision 1.5
diff -u -r1.5 cong-node-modification-remove-attribute.c
--- a/src/cong-node-modification-remove-attribute.c	18 Apr 2004 05:32:30 -0000	1.5
+++ b/src/cong-node-modification-remove-attribute.c	24 Jun 2004 17:45:24 -0000
@@ -80,6 +80,7 @@
  * @name:
  *
  * TODO: Write me
+ * Returns:
  */
 CongNodeModificationRemoveAttribute*
 cong_node_modification_remove_attribute_construct (CongNodeModificationRemoveAttribute *node_modification_remove_attribute,
@@ -114,6 +115,7 @@
  * @name:
  *
  * TODO: Write me
+ * Returns:
  */
 CongModification*
 cong_node_modification_remove_attribute_new (CongDocument *doc,
Index: src/cong-node-modification-set-attribute.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-node-modification-set-attribute.c,v
retrieving revision 1.5
diff -u -r1.5 cong-node-modification-set-attribute.c
--- a/src/cong-node-modification-set-attribute.c	18 Apr 2004 05:32:30 -0000	1.5
+++ b/src/cong-node-modification-set-attribute.c	24 Jun 2004 17:45:24 -0000
@@ -82,6 +82,7 @@
  * @value:
  *
  * TODO: Write me
+ * Returns:
  */
 CongNodeModificationSetAttribute*
 cong_node_modification_set_attribute_construct (CongNodeModificationSetAttribute *node_modification_set_attribute,
@@ -120,6 +121,7 @@
  * @value:
  *
  * TODO: Write me
+ * Returns:
  */
 CongModification*
 cong_node_modification_set_attribute_new (CongDocument *doc,
Index: src/cong-node-modification-set-parent.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-node-modification-set-parent.c,v
retrieving revision 1.6
diff -u -r1.6 cong-node-modification-set-parent.c
--- a/src/cong-node-modification-set-parent.c	10 Jun 2004 01:30:45 -0000	1.6
+++ b/src/cong-node-modification-set-parent.c	24 Jun 2004 17:45:24 -0000
@@ -79,9 +79,10 @@
  * @node_modification_set_parent:
  * @doc:
  * @node:
- * @new_parent:
+ * @adoptive_parent:
  *
  * TODO: Write me
+ * Returns:
  */
 CongNodeModificationSetParent*
 cong_node_modification_set_parent_construct (CongNodeModificationSetParent *node_modification_set_parent,
@@ -112,9 +113,10 @@
  * cong_node_modification_set_parent_new:
  * @doc:
  * @node:
- * @new_parent:
+ * @adoptive_parent:
  *
  * TODO: Write me
+ * Returns:
  */
 CongModification*
 cong_node_modification_set_parent_new (CongDocument *doc,
Index: src/cong-node-modification-set-text.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-node-modification-set-text.c,v
retrieving revision 1.4
diff -u -r1.4 cong-node-modification-set-text.c
--- a/src/cong-node-modification-set-text.c	18 Apr 2004 05:32:30 -0000	1.4
+++ b/src/cong-node-modification-set-text.c	24 Jun 2004 17:45:25 -0000
@@ -81,6 +81,7 @@
  * @new_content:
  *
  * TODO: Write me
+ * Returns:
  */
 CongNodeModificationSetText*
 cong_node_modification_set_text_construct (CongNodeModificationSetText *node_modification_set_text,
@@ -105,6 +106,7 @@
  * @new_content:
  *
  * TODO: Write me
+ * Returns:
  */
 CongModification*
 cong_node_modification_set_text_new (CongDocument *doc,
Index: src/cong-node-modification.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-node-modification.c,v
retrieving revision 1.2
diff -u -r1.2 cong-node-modification.c
--- a/src/cong-node-modification.c	18 Apr 2004 05:32:30 -0000	1.2
+++ b/src/cong-node-modification.c	24 Jun 2004 17:45:25 -0000
@@ -58,6 +58,7 @@
  * @node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongNodeModification*
 cong_node_modification_construct (CongNodeModification *node_modification,
@@ -80,6 +81,7 @@
  * @node_modification:
  *
  * TODO: Write me
+ * Returns:
  */
 CongNodePtr 
 cong_node_modification_get_node (CongNodeModification *node_modification)
Index: src/cong-node-properties-dialog.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-node-properties-dialog.c,v
retrieving revision 1.26
diff -u -r1.26 cong-node-properties-dialog.c
--- a/src/cong-node-properties-dialog.c	12 Jun 2004 03:44:47 -0000	1.26
+++ b/src/cong-node-properties-dialog.c	24 Jun 2004 17:45:25 -0000
@@ -1201,6 +1201,7 @@
  * @parent_window:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkWidget*
 cong_node_properties_dialog_new (CongDocument *doc, 
Index: src/cong-node.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-node.c,v
retrieving revision 1.26
diff -u -r1.26 cong-node.c
--- a/src/cong-node.c	23 Jun 2004 17:37:29 -0000	1.26
+++ b/src/cong-node.c	24 Jun 2004 17:45:26 -0000
@@ -49,6 +49,7 @@
  * @node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongNodePtr 
 cong_node_prev(CongNodePtr node)
@@ -63,6 +64,7 @@
  * @node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongNodePtr 
 cong_node_next(CongNodePtr node)
@@ -78,6 +80,7 @@
  * @node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongNodePtr 
 cong_node_first_child(CongNodePtr node)
@@ -92,6 +95,7 @@
  * @node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongNodePtr 
 cong_node_parent(CongNodePtr node)
@@ -106,6 +110,7 @@
  * @node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongNodeType 
 cong_node_type(CongNodePtr node)
@@ -164,13 +169,15 @@
 
 }
 
-/**
+/** 
  * cong_node_is_element:
  * @node:
  * @ns_uri:
  * @local_name:
  *
- * TODO: Write me
+ * Handy method for deciding if you've found a element with the given name, as opposed to text nodes, comments, elements with other names etc.
+ *
+ * Returns: TRUE if the node is an element with the correct name, FALSE otherwise
  */
 gboolean 
 cong_node_is_element (CongNodePtr node, 
@@ -193,15 +200,17 @@
 	return FALSE;
 }
 
-/**
+/** 
  * cong_node_is_element_from_set:
  * @node:
- * @ns_uri:
- * @local_name_array:
- * @num_local_names:
- * @output_index:
+ * @ns_uri: URI of the namespace shared by all the element in the search set
+ * @local_name_array: array of element local names within the namespace
+ * @num_local_names: size of search array
+ * @output_index: pointer to write index of result to, or NULL if you don't care
  *
- * TODO: Write me
+ * Handy method for deciding if you've found a element with one of the given names in the set, as opposed to text nodes, comments, elements with other names etc.
+ *
+ * Returns: TRUE if the node is an element with the correct name, FALSE otherwise
  */
 gboolean 
 cong_node_is_element_from_set (CongNodePtr node, 
@@ -244,6 +253,7 @@
  * @node:
  *
  * TODO: Write me
+ * Returns:
  */
 xmlNsPtr
 cong_node_get_ns (CongNodePtr node)
@@ -258,6 +268,7 @@
  * @node:
  *
  * TODO: Write me
+ * Returns:
  */
 const gchar*
 cong_node_get_ns_uri (CongNodePtr node)
@@ -276,6 +287,7 @@
  * @node:
  *
  * TODO: Write me
+ * Returns:
  */
 const gchar*
 cong_node_get_ns_prefix (CongNodePtr node)
@@ -294,6 +306,7 @@
  * @node:
  *
  * TODO: Write me
+ * Returns:
  */
 const gchar* 
 cong_node_get_local_name (CongNodePtr node)
@@ -306,9 +319,12 @@
 
 /**
  * cong_node_get_qualified_name:
- * @node:
+ * @node: an XML element
  *
- * TODO: Write me
+ * Builds a string of the form "ns_prefix:local_name" for an element inside a namespace
+ * or simply "local_name" for the rest.
+ *
+ * Returns: a freshly-allocated string which the caller must g_free
  */
 gchar*
 cong_node_get_qualified_name (CongNodePtr node)
@@ -325,12 +341,15 @@
 	}	
 }
 
-/**
+/*
  * cong_node_get_ns_for_uri:
- * @node:
- * @ns_uri:
+ * @node:  the context in which to look for the prefix
+ * @ns_uri: the namespace URI
  *
- * TODO: Write me
+ * Lookup a namespace URI; find the appropriate xmlNsPtr defined, 
+ * or NULL if not found.
+ *
+ * Returns:  the #xmlNsPtr if found, or NULL if not found.
  */
 xmlNsPtr
 cong_node_get_ns_for_uri (CongNodePtr node, 
@@ -341,12 +360,15 @@
 				  ns_uri);
 }
 
-/**
+/*
  * cong_node_get_ns_for_prefix:
- * @node:
- * @prefix:
+ * @node:  the context in which to look for the prefix
+ * @prefix: the prefix
  *
- * TODO: Write me
+ * Lookup a namespace prefix; find the appropriate xmlNsPtr defined
+ * for that prefix, or NULL if not found.
+ *
+ * Returns:  the #xmlNsPtr if found, or NULL if not found.
  */
 xmlNsPtr
 cong_node_get_ns_for_prefix (CongNodePtr node, 
@@ -361,12 +383,17 @@
 }
 
 /**
- * cong_node_get_attr_ns:
- * @node:
- * @qualified_name:
- * @output_name:
+ * conf_node_get_attr_ns:
+ * @node: an XML element
+ * @qualified_attr_name: An qualified attribute name with an optional namespace prefix.
+ * @output_attr_name: Stores the location of the local_name in @qualified_name.
+ *
+ * Splits the qualified name into the prefix and the local name,
+ * and searches the namespace of the prefix. All namespaces of the
+ * @node are searched. If no prefix is availible NULL is returned.
+ * see: Namespaces in XML / 5.3 Uniqueness of Attributes.
  *
- * TODO: Write me
+ * Returns: A pointer to the namespace, can be NULL.
  */
 xmlNsPtr 
 cong_node_get_attr_ns(CongNodePtr node, 
@@ -406,9 +433,11 @@
 /* Method for getting an XPath to the node: */
 /**
  * cong_node_get_path:
- * @node:
+ * @node: an XML node
  *
- * TODO: Write me
+ * Method for getting an XPath to the node.
+ *
+ * Returns: the XPath as a freshly allocated string, which must be freed using g_free
  */
 gchar *
 cong_node_get_path(CongNodePtr node)
@@ -423,6 +452,7 @@
  * @node:
  *
  * TODO: Write me
+ * Returns:
  */
 gchar *
 cong_node_debug_description(CongNodePtr node)
@@ -532,6 +562,7 @@
  * @node_type:
  *
  * TODO: Write me
+ * Returns:
  */
 const gchar *
 cong_node_type_description(CongNodeType node_type)
@@ -545,11 +576,17 @@
 /* Methods for accessing attribute values: */
 /**
  * cong_node_get_attribute:
- * @node:
- * @ns_ptr:
- * @local_attribute_name:
+ * @node: XML node which has the attribute.
+ * @ns_ptr: Attribute's namespace, can be NULL
+ *          (if it is the default namespace it MUST NOT be NULL but the coresponding
+ *          xmlNs).
+ * @local_attribute_name: Name of the attribute, without namespace prefix.
  *
- * TODO: Write me
+ * Returns the content of the attribute specified through @local_attribute_name and
+ * @ns_ptr.
+ *
+ * Returns: The content of the attribute, to be freed by the caller.
+ *          Will be NULL if not found in node and no default in DTD available
  */
 CongXMLChar* 
 cong_node_get_attribute(CongNodePtr node,
@@ -568,11 +605,14 @@
 
 /**
  * cong_node_has_attribute:
- * @node:
- * @ns_ptr:
- * @local_attribute_name:
+ * @node: XML node which has the attribute.
+ * @ns_ptr: Attribute's namespace, can be NULL
+ *             (if it is the default namespace it MUST NOT be NULL but the coresponding
+ *              xmlNs).
+ * @local_attribute_name: Name of the attribute, without namespace prefix.
  *
- * TODO: Write me
+ * Returns: Returns TRUE if the attribute specified through @local_attribute_name and
+ *          @ns_ptr is found in the node or as default in the DTD.
  */
 gboolean 
 cong_node_has_attribute(CongNodePtr node,
@@ -739,6 +779,7 @@
  * @node:
  *
  * TODO: Write me
+ * Returns:
  */
 int 
 cong_node_get_length(CongNodePtr node)
@@ -755,6 +796,7 @@
  * @node:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 cong_node_should_recurse(CongNodePtr node)
@@ -797,11 +839,12 @@
 /* Construction: */
 /**
  * cong_node_new_element:
- * @xml_ns:
- * @local_name:
+ * @ns:
+ * @tagname:
  * @doc:
  *
  * TODO: Write me
+ * Returns:
  */
 CongNodePtr 
 cong_node_new_element (xmlNsPtr xml_ns, 
@@ -824,6 +867,7 @@
  * @doc:
  *
  * TODO: Write me
+ * Returns:
  */
 CongNodePtr
 cong_node_new_element_from_dispspec (CongDispspecElement *element, 
@@ -849,6 +893,7 @@
  * @doc:
  *
  * TODO: Write me
+ * Returns:
  */
 CongNodePtr 
 cong_node_new_text (const char *text, 
@@ -864,6 +909,7 @@
  * @doc:
  *
  * TODO: Write me
+ * Returns:
  */
 CongNodePtr 
 cong_node_new_text_len (const char *text, 
@@ -904,9 +950,11 @@
 
 /**
  * cong_node_generate_source:
- * @node:
+ * @node:  The node for which the XML source is to be generated
+ * 
+ * Generate XML source for the node 
  *
- * TODO: Write me
+ * Returns: the XML source for the node as a UTF8 string.  The caller is responsible for freeing this with g_free
  */
 gchar*
 cong_node_generate_source (CongNodePtr node)
@@ -943,9 +991,12 @@
 
 /**
  * cong_node_generate_child_source:
- * @node:
+ * @node:  The parent node
+ * 
+ * Generate XML source for the node's children, concatenated together as a UTF8 string.  Should handle entity references correctly.
+ * The result does not include the XML source for the node itself.
  *
- * TODO: Write me
+ * Returns: the XML source for the node's children as a UTF8 string.  The caller is responsible for freeing this with g_free
  */
 gchar*
 cong_node_generate_child_source (CongNodePtr node)
@@ -996,9 +1047,10 @@
 /**
  * cong_node_generate_source_from_byte_offset:
  * @node:
- * @start_byte_offset:
+ * @byte_offset:
  *
  * TODO: Write me
+ * Returns:
  */
 gchar*
 cong_node_generate_source_from_byte_offset (CongNodePtr node,
@@ -1022,9 +1074,10 @@
 /**
  * cong_node_generate_source_up_to_byte_offset:
  * @node:
- * @end_byte_offset:
+ * @byte_offset:
  *
  * TODO: Write me
+ * Returns:
  */
 gchar*
 cong_node_generate_source_up_to_byte_offset (CongNodePtr node,
@@ -1052,6 +1105,7 @@
  * @end_byte_offset:
  *
  * TODO: Write me
+ * Returns:
  */
 gchar*
 cong_node_generate_source_between_byte_offsets (CongNodePtr node,
@@ -1121,6 +1175,7 @@
  * @node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongNodePtr 
 cong_node_recursive_dup(CongNodePtr node)
@@ -1141,6 +1196,7 @@
  * @potential_ancestor:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean
 cong_node_is_descendant_of (CongNodePtr node,
@@ -1433,6 +1489,7 @@
  * cong_node_private_set_parent:
  * @node:
  * @adoptive_parent:
+ * @add_to_end:
  *
  * TODO: Write me
  */
@@ -1573,11 +1630,13 @@
 /* Utilities: */
 /**
  * cong_node_get_child_by_name:
- * @node:
- * @ns_uri:
- * @local_name:
+ * @node:  the parent node
+ * @ns_uri: URI of namespace to search for, or NULL
+ * @local_name: the local name within any namespace of the element to search for
  *
- * TODO: Write me
+ * This function searches the children of @node looking for elements of the given name.
+ *
+ * Returns: the first child element matching the given name, or NULL if there are none
  */
 CongNodePtr 
 cong_node_get_child_by_name (CongNodePtr node, 
@@ -1603,6 +1662,7 @@
  * @node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongNodePtr 
 cong_node_get_first_text_node_descendant (CongNodePtr node)
@@ -1632,6 +1692,7 @@
  * @text_node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongWhitespaceHandling
 cong_node_get_whitespace_handling (CongDocument *doc,
@@ -1654,9 +1715,15 @@
 
 /**
  * cong_node_should_be_visible_in_editor:
- * @node:
+ * @node:  a node to be tested
  *
- * TODO: Write me
+ * The function detemines if the node ought to be visible in the main editor view.
+ *
+ * As described in bug #123367, TEXT nodes that are either empty or purely whitespace
+ * should only appear in the main editor view if the DTD allows PCDATA at the location in the
+ * document.  Otherwise the text is probably merely formatting to prettify the source view. *
+ *
+ * Returns: a #gboolean which is TRUE iff the node ought to be visible in the main editor view
  */
 gboolean
 cong_node_should_be_visible_in_editor (CongNodePtr node)
@@ -1697,9 +1764,14 @@
 
 /**
  * cong_node_is_valid_cursor_location:
- * @node:
+ * @node:  a node to be tested
  *
- * TODO: Write me
+ * The function detemines if the node is a suitable location for the cursor.
+ *
+ * It currently only tests for TEXT nodes, but will eventually be expanded to
+ * allow COMMENT nodes as well.
+ *
+ * Returns: a #gboolean which is TRUE iff it is safe to put the cursor inside this node
  */
 gboolean
 cong_node_is_valid_cursor_location (CongNodePtr node)
@@ -1740,6 +1812,7 @@
  * @node:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean
 cong_node_can_be_cut (CongNodePtr node)
@@ -1772,6 +1845,7 @@
  * @node:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean
 cong_node_can_be_copied (CongNodePtr node)
@@ -1786,6 +1860,7 @@
  * @n1:
  *
  * TODO: Write me
+ * Returns:
  */
 CongNodePtr 
 cong_node_get_deepest_common_parent (CongNodePtr n0, 
@@ -1817,7 +1892,6 @@
  * their locations in a depth-first traversal.
  *
  * Returns: negative if n0 is reached before n1, zero if they are the same node, positive if n0 is reached after n1
- * 
  */
 int 
 cong_node_get_ordering (CongNodePtr n0,
@@ -1884,7 +1958,6 @@
 
 /**
  * cong_node_calc_first_node_in_subtree_satisfying:
- *
  * @node: the top of the subtree
  * @predicate: the #CongNodePredicate to test nodes for
  * @user_data: user-supplied data passed to the predicate
@@ -1895,7 +1968,6 @@
  * Note that @node is the initial node of the tree (and hence is tested first)
  *
  * Returns: the appropriate node satisfying @predicate, or NULL if there are none
- *
  */
 CongNodePtr
 cong_node_calc_first_node_in_subtree_satisfying (CongNodePtr node,
@@ -1929,7 +2001,6 @@
 
 /**
  * cong_node_calc_final_node_in_subtree_satisfying:
- *
  * @node: the top of the subtree
  * @predicate: the #CongNodePredicate to test nodes for
  * @user_data: user-supplied data passed to the predicate
@@ -1940,7 +2011,6 @@
  * Note that @node is the initial node of the tree (and hence is tested last)
  *
  * Returns: the appropriate node satisfying @predicate, or NULL if there are none
- *
  */
 CongNodePtr
 cong_node_calc_final_node_in_subtree_satisfying (CongNodePtr node, 
@@ -1974,7 +2044,6 @@
 
 /**
  * cong_node_calc_prev_node_satisfying:
- *
  * @node: the start of the search
  * @predicate: the #CongNodePredicate to test nodes for
  * @user_data: user-supplied data passed to the predicate
@@ -1983,7 +2052,6 @@
  * in an imagined depth-first traversal of the document.  Includes ancestors.
  *
  * Returns: the appropriate node satisfying @predicate, or NULL if there are none
- *
  */
 CongNodePtr
 cong_node_calc_prev_node_satisfying (CongNodePtr node, 
@@ -2024,7 +2092,6 @@
 
 /**
  * cong_node_calc_next_node_satisfying:
- *
  * @node: the start of the search
  * @predicate: the #CongNodePredicate to test nodes for
  * @user_data: user-supplied data passed to the predicate
@@ -2033,7 +2100,6 @@
  * in an imagined depth-first traversal of the document.   Includes ancestors.
  *
  * Returns: the appropriate node satisfying @predicate, or NULL if there are none
- *
  */
 CongNodePtr
 cong_node_calc_next_node_satisfying (CongNodePtr node,
Index: src/cong-node.h
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-node.h,v
retrieving revision 1.29
diff -u -r1.29 cong-node.h
--- a/src/cong-node.h	23 Jun 2004 17:37:29 -0000	1.29
+++ b/src/cong-node.h	24 Jun 2004 17:45:26 -0000
@@ -92,30 +92,11 @@
 
 CongNodeType cong_node_type(CongNodePtr node);
 
-/** 
- * cong_node_is_element:
- *
- * Handy method for deciding if you've found a element with the given name, as opposed to text nodes, comments, elements with other names etc.
- *
- * Returns: TRUE if the node is an element with the correct name, FALSE otherwise
- */
 gboolean 
 cong_node_is_element (CongNodePtr node, 
 		      const gchar *ns_uri, 
 		      const gchar *local_name);
 
-/** 
- * cong_node_is_element_from_set:
- *
- * @ns_uri: URI of the namespace shared by all the element in the search set
- * @local_name_array: array of element local names within the namespace
- * @num_local_names: size of search array
- * @output_index: pointer to write index of result to, or NULL if you don't care
- *
- * Handy method for deciding if you've found a element with one of the given names in the set, as opposed to text nodes, comments, elements with other names etc.
- *
- * Returns: TRUE if the node is an element with the correct name, FALSE otherwise
- */
 gboolean 
 cong_node_is_element_from_set (CongNodePtr node, 
 			       const gchar *ns_uri,
@@ -135,81 +116,22 @@
 const gchar*
 cong_node_get_local_name (CongNodePtr node);
 
-/**
- * cong_node_get_qualified_name:
- *
- * @node: an XML element
- *
- * Builds a string of the form "ns_prefix:local_name" for an element inside a namespace
- * or simply "local_name" for the rest.
- *
- * Returns: a freshly-allocated string which the caller must g_free
- *
- */
 gchar*
 cong_node_get_qualified_name (CongNodePtr node);
 
-/*
- * cong_node_get_ns_for_uri:
- *
- * @node:  the context in which to look for the prefix
- * @ns_uri: the namespace URI
- *
- * Lookup a namespace URI; find the appropriate xmlNsPtr defined, 
- * or NULL if not found.
- *
- * Returns:  the #xmlNsPtr if found, or NULL if not found.
- *
- */
 xmlNsPtr
 cong_node_get_ns_for_uri (CongNodePtr node, 
 			  const gchar *ns_uri);
 
-/*
- * cong_node_get_ns_for_prefix:
- *
- * @node:  the context in which to look for the prefix
- * @prefix: the prefix
- *
- * Lookup a namespace prefix; find the appropriate xmlNsPtr defined
- * for that prefix, or NULL if not found.
- *
- * Returns:  the #xmlNsPtr if found, or NULL if not found.
- *
- */
 xmlNsPtr
 cong_node_get_ns_for_prefix (CongNodePtr node, 
 			     const gchar *prefix);
 
-/**
- * conf_node_get_attr_ns:
- *
- * @node: an XML element
- * @qualified_attr_name: An qualified attribute name with an optional namespace prefix.
- * @output_attr_name: Stores the location of the local_name in @qualified_name.
- *
- * Splits the qualified name into the prefix and the local name,
- * and searches the namespace of the prefix. All namespaces of the
- * @node are searched. If no prefix is availible NULL is returned.
- * see: Namespaces in XML / 5.3 Uniqueness of Attributes.
- *
- * Returns: A pointer to the namespace, can be NULL.
- */
 xmlNsPtr
 cong_node_get_attr_ns(CongNodePtr node, 
 		      const char *qualified_name, 
 		      const char **output_name);
 
-/**
- * cong_node_get_path:
- *
- * @node: an XML node
- *
- * Method for getting an XPath to the node.
- *
- * Returns: the XPath as a freshly allocated string, which must be freed using g_free
- * 
- */
 gchar*
 cong_node_get_path (CongNodePtr node);
 
@@ -220,36 +142,9 @@
 
 /* Methods for accessing attribute values: */
 
-/**
- * cong_node_get_attribute
- *
- * @node: XML node which has the attribute.
- * @ns_ptr: Attribute's namespace, can be NULL
- *          (if it is the default namespace it MUST NOT be NULL but the coresponding
- *          xmlNs).
- * @local_attribute_name: Name of the attribute, without namespace prefix.
- *
- * Returns the content of the attribute specified through @local_attribute_name and
- * @ns_ptr.
- *
- * Returns: The content of the attribute, to be freed by the caller.
- *          Will be NULL if not found in node and no default in DTD available
- */
 CongXMLChar* cong_node_get_attribute(CongNodePtr node,
 				     xmlNs* ns_ptr, 
 				     const CongXMLChar* local_attribute_name);
-/**
- * cong_node_has_attribute
- *
- * @node: XML node which has the attribute.
- * @ns_ptr: Attribute's namespace, can be NULL
- *             (if it is the default namespace it MUST NOT be NULL but the coresponding
- *              xmlNs).
- * @local_attribute_name: Name of the attribute, without namespace prefix.
- *
- * Returns: Returns TRUE if the attribute specified through @local_attribute_name and
- *          @ns_ptr is found in the node or as default in the DTD.
- */
 gboolean cong_node_has_attribute(CongNodePtr node,
 				 xmlNs* ns_ptr, 
 				 const CongXMLChar* local_attribute_name);
@@ -283,7 +178,6 @@
 int 
 cong_node_get_length (CongNodePtr node); /* get length of content; does not include the zero terminator (to correspond to the TTREE size field) */
 
-/* Construction: */
 CongNodePtr
 cong_node_new_element (xmlNsPtr ns,
 		       const gchar *tagname, 
@@ -308,26 +202,9 @@
 cong_node_free (CongNodePtr node);
 
 
-/**
- * cong_node_generate_source:
- * @node:  The node for which the XML source is to be generated
- * 
- * Generate XML source for the node 
- *
- * Returns: the XML source for the node as a UTF8 string.  The caller is responsible for freeing this with g_free
- */
 gchar*
 cong_node_generate_source (CongNodePtr node);
 
-/**
- * cong_node_generate_child_source:
- * @node:  The parent node
- * 
- * Generate XML source for the node's children, concatenated together as a UTF8 string.  Should handle entity references correctly.
- * The result does not include the XML source for the node itself.
- *
- * Returns: the XML source for the node's children as a UTF8 string.  The caller is responsible for freeing this with g_free
- */
 gchar*
 cong_node_generate_child_source (CongNodePtr node);
 
@@ -376,16 +253,6 @@
 
 /* Utilities: */
 
-/**
- * cong_node_get_child_by_name:
- * @node:  the parent node
- * @ns_uri: URI of namespace to search for, or NULL
- * @tagname: the local name within any namespace of the element to search for
- *
- * This function searches the children of @node looking for elements of the given name.
- *
- * Returns: the first child element matching the given name, or NULL if there are none
- */
 CongNodePtr 
 cong_node_get_child_by_name (CongNodePtr node, 
 			     const gchar *ns_uri, 
@@ -398,32 +265,9 @@
 cong_node_get_whitespace_handling (CongDocument *doc,
 				   CongNodePtr text_node);
 
-/**
- * cong_node_should_be_visible_in_editor:
- * @node:  a node to be tested
- *
- * The function detemines if the node ought to be visible in the main editor view.
- *
- * As described in bug #123367, TEXT nodes that are either empty or purely whitespace
- * should only appear in the main editor view if the DTD allows PCDATA at the location in the
- * document.  Otherwise the text is probably merely formatting to prettify the source view. *
- *
- * Returns: a #gboolean which is TRUE iff the node ought to be visible in the main editor view
- */
 gboolean
 cong_node_should_be_visible_in_editor (CongNodePtr node);
 
-/**
- * cong_node_is_valid_cursor_location:
- * @node:  a node to be tested
- *
- * The function detemines if the node is a suitable location for the cursor.
- *
- * It currently only tests for TEXT nodes, but will eventually be expanded to
- * allow COMMENT nodes as well.
- *
- * Returns: a #gboolean which is TRUE iff it is safe to put the cursor inside this node
- */
 gboolean
 cong_node_is_valid_cursor_location (CongNodePtr node);
 
Index: src/cong-overview-view.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-overview-view.c,v
retrieving revision 1.10
diff -u -r1.10 cong-overview-view.c
--- a/src/cong-overview-view.c	23 Jun 2004 17:37:29 -0000	1.10
+++ b/src/cong-overview-view.c	24 Jun 2004 17:45:26 -0000
@@ -70,6 +70,7 @@
  * @doc:
  *
  * TODO: Write me
+ * Returns:
  */
 CongTreeView*
 cong_overview_view_new (CongDocument *doc)
@@ -284,6 +285,7 @@
  * @user_data:
  *
  * TODO: Write me
+ * Returns:
  */
 GdkPixbuf* pixbuf_callback (CongTreeView *cong_tree_view,
 			    CongNodePtr node,
Index: src/cong-parser-error.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-parser-error.c,v
retrieving revision 1.10
diff -u -r1.10 cong-parser-error.c
--- a/src/cong-parser-error.c	23 Jun 2004 17:37:29 -0000	1.10
+++ b/src/cong-parser-error.c	24 Jun 2004 17:45:27 -0000
@@ -201,6 +201,7 @@
  * @parser_result:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkDialog *
 cong_parser_result_dialog_new(CongParserResult *parser_result)
@@ -384,6 +385,7 @@
  * @parser_result:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkDialog*
 cong_error_dialog_new_file_open_failed_from_parser_error (const gchar* string_uri, 
@@ -420,6 +422,7 @@
  * @parent_window:
  *
  * TODO: Write me
+ * Returns:
  */
 xmlDocPtr 
 cong_ui_parse_buffer (const char* buffer,
@@ -482,6 +485,7 @@
  * @parser_result:
  *
  * TODO: Write me
+ * Returns:
  */
 xmlParserCtxtPtr
 cong_parse_from_filename (const gchar* string_uri,
@@ -520,6 +524,7 @@
  * @parser_result:
  *
  * TODO: Write me
+ * Returns:
  */
 xmlParserCtxtPtr
 cong_parse_from_memory (const char* buffer, 
Index: src/cong-plugin-manager.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-plugin-manager.c,v
retrieving revision 1.3
diff -u -r1.3 cong-plugin-manager.c
--- a/src/cong-plugin-manager.c	18 Apr 2004 05:32:30 -0000	1.3
+++ b/src/cong-plugin-manager.c	24 Jun 2004 17:45:27 -0000
@@ -50,11 +50,12 @@
 /**
  * cong_plugin_manager_register:
  * @plugin_manager:
- * @plugin_id:
+ * @id:
  * @register_callback:
  * @configure_callback:
  *
  * TODO: Write me
+ * Returns:
  */
 CongPlugin*
 cong_plugin_manager_register (CongPluginManager *plugin_manager,
@@ -249,9 +250,10 @@
 /**
  * cong_plugin_manager_locate_custom_property_dialog_by_id:
  * @plugin_manager:
- * @service_id:
+ * @plugin_id:
  *
  * TODO: Write me
+ * Returns:
  */
 CongServiceNodePropertyDialog*
 cong_plugin_manager_locate_custom_property_dialog_by_id (CongPluginManager *plugin_manager, 
@@ -276,9 +278,10 @@
 /**
  * cong_plugin_manager_locate_editor_node_factory_by_id:
  * @plugin_manager:
- * @service_id:
+ * @plugin_id:
  *
  * TODO: Write me
+ * Returns:
  */
 CongServiceEditorNodeFactory*
 cong_plugin_manager_locate_editor_node_factory_by_id (CongPluginManager *plugin_manager,
Index: src/cong-plugin.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-plugin.c,v
retrieving revision 1.43
diff -u -r1.43 cong-plugin.c
--- a/src/cong-plugin.c	21 Jun 2004 04:49:38 -0000	1.43
+++ b/src/cong-plugin.c	24 Jun 2004 17:45:27 -0000
@@ -95,6 +95,7 @@
  * @configure_callback:
  *
  * TODO: Write me
+ * Returns:
  */
 CongPlugin*
 cong_plugin_construct (CongPlugin *plugin,
@@ -193,6 +194,7 @@
  * @service_id:
  *
  * TODO: Write me
+ * Returns:
  */
 CongService*
 cong_plugin_locate_service_by_id (CongPlugin *plugin, 
@@ -377,6 +379,7 @@
  * @service_id:
  *
  * TODO: Write me
+ * Returns:
  */
 CongServiceNodePropertyDialog*
 cong_plugin_locate_custom_property_dialog_by_id (CongPlugin *plugin, 
@@ -404,6 +407,7 @@
  * @service_id:
  *
  * TODO: Write me
+ * Returns:
  */
 CongServiceEditorNodeFactory*
 cong_plugin_locate_editor_node_factory_by_id (CongPlugin *plugin,
@@ -432,6 +436,7 @@
  * @service_id:
  *
  * TODO: Write me
+ * Returns:
  */
 CongServiceNodePropertyDialog*
 cong_plugin_locate_custom_property_dialog_by_id (CongPlugin *plugin, 
@@ -459,6 +464,7 @@
  * @service_id:
  *
  * TODO: Write me
+ * Returns:
  */
 CongServiceEditorNodeFactory*
 cong_plugin_locate_editor_node_factory_by_id (CongPlugin *plugin,
@@ -486,6 +492,7 @@
  * @plugin:
  *
  * TODO: Write me
+ * Returns:
  */
 const gchar* 
 cong_plugin_get_id (CongPlugin *plugin)
@@ -500,6 +507,7 @@
  * @plugin:
  *
  * TODO: Write me
+ * Returns:
  */
 gchar* 
 cong_plugin_get_gconf_namespace(CongPlugin *plugin)
@@ -511,13 +519,6 @@
 	return g_strdup_printf( (CONG_GCONF_PATH "plugins/%s"), PRIVATE (plugin)->plugin_id);
 }
 
-/**
- * cong_plugin_get_gconf_key:
- * @plugin:
- * @local_part:
- *
- * TODO: Write me
- */
 gchar* 
 cong_plugin_get_gconf_key(CongPlugin *plugin, const gchar *local_part)
 {
@@ -535,6 +536,7 @@
  * @parent_window:
  *
  * TODO: Write me
+ * Returns:
  */
 CongDocument*
 cong_ui_new_document_from_manufactured_xml(xmlDocPtr xml_doc,
@@ -579,6 +581,7 @@
  * @parent_window:
  *
  * TODO: Write me
+ * Returns:
  */
 CongDocument*
 cong_ui_new_document_from_imported_xml(xmlDocPtr xml_doc,
@@ -623,6 +626,7 @@
  * @toplevel_window:
  *
  * TODO: Write me
+ * Returns:
  */
 xmlDocPtr 
 cong_ui_transform_doc(CongDocument *doc,
@@ -684,7 +688,7 @@
  * cong_ui_transform_doc_to_uri:
  * @doc:
  * @stylesheet_filename:
- * @string_uri:
+ * @uri:
  * @toplevel_window:
  *
  * TODO: Write me
@@ -736,12 +740,13 @@
 /* Handy methods for "Import" methods; doing the necessary UI hooks: */
 /**
  * cong_ui_load_imported_file_content:
- * @string_uri:
+ * @uri:
  * @buffer:
  * @size:
  * @parent_window:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 cong_ui_load_imported_file_content(const gchar *string_uri,
@@ -786,6 +791,7 @@
  * @user_data:
  *
  * TODO: Write me
+ * Returns:
  */
 CongServiceDocumentFactory*
 cong_plugin_register_document_factory (CongPlugin *plugin, 
@@ -836,6 +842,7 @@
  * @user_data:
  *
  * TODO: Write me
+ * Returns:
  */
 CongServiceDocTool*
 cong_plugin_register_doc_tool (CongPlugin *plugin,
@@ -888,6 +895,7 @@
  * @user_data:
  *
  * TODO: Write me
+ * Returns:
  */
 CongServiceNodeTool*
 cong_plugin_register_node_tool (CongPlugin *plugin,
@@ -931,11 +939,12 @@
  * @plugin:
  * @name:
  * @description:
- * @service_id:
+ * @plugin_id:
  * @factory_method:
  * @user_data:
  *
  * TODO: Write me
+ * Returns:
  */
 CongServiceEditorNodeFactory *
 cong_plugin_register_editor_node_factory(CongPlugin *plugin, 
@@ -971,12 +980,13 @@
  * @plugin:
  * @name:
  * @description:
- * @service_id:
+ * @id:
  * @doc_filter:
  * @action_callback:
  * @user_data:
  *
  * TODO: Write me
+ * Returns:
  */
 CongServiceExporter*
 cong_plugin_register_exporter (CongPlugin *plugin, 
@@ -1015,12 +1025,13 @@
  * @plugin:
  * @name:
  * @description:
- * @service_id:
- * @mime_filter:
+ * @id:
+ * @filter_factory_callback:
  * @action_callback:
  * @user_data:
  *
  * TODO: Write me
+ * Returns:
  */
 CongServiceImporter*
 cong_plugin_register_importer (CongPlugin *plugin, 
@@ -1064,6 +1075,7 @@
  * @user_data:
  *
  * TODO: Write me
+ * Returns:
  */
 CongServiceNodePropertyDialog*
 cong_plugin_register_custom_property_dialog (CongPlugin *plugin,
@@ -1103,6 +1115,7 @@
  * @user_data:
  *
  * TODO: Write me
+ * Returns:
  */
 CongServiceNodePropertyDialog*
 cong_plugin_register_custom_property_dialog_for_element (CongPlugin *plugin,
@@ -1143,12 +1156,13 @@
  * @plugin:
  * @name:
  * @description:
- * @service_id:
+ * @id:
  * @doc_filter:
  * @action_callback:
  * @user_data:
  *
  * TODO: Write me
+ * Returns:
  */
 CongServicePrintMethod*
 cong_plugin_register_print_method (CongPlugin *plugin, 
Index: src/cong-primary-window.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-primary-window.c,v
retrieving revision 1.56
diff -u -r1.56 cong-primary-window.c
--- a/src/cong-primary-window.c	10 Jun 2004 01:50:43 -0000	1.56
+++ b/src/cong-primary-window.c	24 Jun 2004 17:45:28 -0000
@@ -118,6 +118,7 @@
  * cong_gui_get_a_window:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkWidget* 
 cong_gui_get_a_window(void)
@@ -143,6 +144,7 @@
  * @gui:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkWidget* 
 cong_gui_get_window(struct cong_gui* gui)
@@ -157,6 +159,7 @@
  * @gui:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkWidget* 
 cong_gui_get_popup(struct cong_gui* gui)
@@ -186,6 +189,7 @@
  * @gui:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkWidget* 
 cong_gui_get_button_submit(struct cong_gui* gui)
@@ -200,6 +204,7 @@
  * @gui:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkTreeStore* 
 cong_gui_get_tree_store(struct cong_gui* gui)
@@ -214,6 +219,7 @@
  * @gui:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkWidget* 
 cong_gui_get_root(struct cong_gui* gui)
@@ -259,6 +265,7 @@
  * @xpm:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkPixmap* 
 cong_primary_window_create_pixmap(CongPrimaryWindow *primary_window, char** xpm)
@@ -283,6 +290,7 @@
  * @data:
  *
  * TODO: Write me
+ * Returns:
  */
 gint 
 toolbar_callback_undo(GtkWidget *w, gpointer data)
@@ -301,6 +309,7 @@
  * @data:
  *
  * TODO: Write me
+ * Returns:
  */
 gint 
 toolbar_callback_redo(GtkWidget *w, gpointer data)
@@ -319,6 +328,7 @@
  * @data:
  *
  * TODO: Write me
+ * Returns:
  */
 gint 
 toolbar_callback_cut(GtkWidget *w, gpointer data)
@@ -337,6 +347,7 @@
  * @data:
  *
  * TODO: Write me
+ * Returns:
  */
 gint 
 toolbar_callback_copy(GtkWidget *w, gpointer data)
@@ -355,6 +366,7 @@
  * @data:
  *
  * TODO: Write me
+ * Returns:
  */
 gint 
 toolbar_callback_paste(GtkWidget *w, gpointer data)
@@ -524,6 +536,7 @@
  * @primary_window:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 cong_primary_window_can_close(CongPrimaryWindow *primary_window)
@@ -582,6 +595,7 @@
  * @data:
  *
  * TODO: Write me
+ * Returns:
  */
 gint 
 delete_event( GtkWidget *widget,
@@ -699,8 +713,10 @@
  * cong_primary_window_add_doc:
  * @primary_window:
  * @doc:
+ * 
+ * Adds the #CongDocument @doc to a given window. This function is called from 
+ * cong_primary_window_new().
  *
- * TODO: Write me
  */
 void
 cong_primary_window_add_doc (CongPrimaryWindow *primary_window, CongDocument *doc)
@@ -872,6 +888,7 @@
  * @doc:
  *
  * TODO: Write me
+ * Returns:
  */
 CongPrimaryWindow *
 cong_primary_window_new(CongDocument *doc)
@@ -935,6 +952,7 @@
  * @primary_window:
  *
  * TODO: Write me
+ * Returns:
  */
 CongDocument *
 cong_primary_window_get_document(CongPrimaryWindow *primary_window)
@@ -985,6 +1003,7 @@
  * @primary_window:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkWindow *
 cong_primary_window_get_toplevel(CongPrimaryWindow *primary_window)
Index: src/cong-primary-window.h
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-primary-window.h,v
retrieving revision 1.3
diff -u -r1.3 cong-primary-window.h
--- a/src/cong-primary-window.h	9 Dec 2003 16:09:13 -0000	1.3
+++ b/src/cong-primary-window.h	24 Jun 2004 17:45:28 -0000
@@ -40,16 +40,6 @@
 CongPrimaryWindow*
 cong_primary_window_new (CongDocument *doc);
 
-/**
- * cong_primary_window_add_doc:
- * @primary_window:
- * @doc:
- * 
- * Adds the #CongDocument @doc to a given window. This function is called from 
- * cong_primary_window_new().
- * 
- * Returns: the window
- */
 
 void
 cong_primary_window_add_doc (CongPrimaryWindow *primary_window, CongDocument *doc);
Index: src/cong-progress-checklist.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-progress-checklist.c,v
retrieving revision 1.3
diff -u -r1.3 cong-progress-checklist.c
--- a/src/cong-progress-checklist.c	18 Apr 2004 05:32:30 -0000	1.3
+++ b/src/cong-progress-checklist.c	24 Jun 2004 17:45:28 -0000
@@ -122,6 +122,7 @@
  * cong_progress_checklist_new:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkWidget *
 cong_progress_checklist_new(void)
@@ -220,6 +221,7 @@
  * @parent_window:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkWidget *
 cong_progress_checklist_dialog_new(const gchar *title,
@@ -252,6 +254,7 @@
  * @progress_checklist_dialog:
  *
  * TODO: Write me
+ * Returns:
  */
 CongProgressChecklist *
 cong_progress_checklist_dialog_get_progress_checklist(CongProgressChecklistDialog *progress_checklist_dialog)
Index: src/cong-range.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-range.c,v
retrieving revision 1.10
diff -u -r1.10 cong-range.c
--- a/src/cong-range.c	18 Apr 2004 05:32:30 -0000	1.10
+++ b/src/cong-range.c	24 Jun 2004 17:45:28 -0000
@@ -61,6 +61,7 @@
  * @range:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean
 cong_range_is_valid (CongRange *range)
@@ -91,6 +92,7 @@
  * @range:
  *
  * TODO: Write me
+ * Returns:
  */
 gchar*
 cong_range_generate_source (CongRange *range)
@@ -151,6 +153,7 @@
  * @range:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean
 cong_range_exists (CongRange *range)
@@ -169,6 +172,7 @@
  * @range:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean
 cong_range_is_empty (CongRange *range)
@@ -191,6 +195,7 @@
  * @range:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean
 cong_range_is_ordered (CongRange *range)
@@ -221,6 +226,7 @@
  * @range:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean
 cong_range_can_be_cut (CongRange *range)
@@ -255,6 +261,7 @@
  * @range:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean
 cong_range_can_be_copied (CongRange *range)
@@ -317,6 +324,7 @@
  * @node:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean
 cong_range_is_node (CongRange *range,
Index: src/cong-service-doc-tool.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-service-doc-tool.c,v
retrieving revision 1.2
diff -u -r1.2 cong-service-doc-tool.c
--- a/src/cong-service-doc-tool.c	18 Apr 2004 05:32:30 -0000	1.2
+++ b/src/cong-service-doc-tool.c	24 Jun 2004 17:45:28 -0000
@@ -47,6 +47,7 @@
  * @user_data:
  *
  * TODO: Write me
+ * Returns:
  */
 CongServiceDocTool*
 cong_service_doc_tool_construct (CongServiceDocTool *tool,
@@ -82,10 +83,11 @@
 
 /**
  * cong_doc_tool_supports_document:
- * @tool:
+ * @doc_tool:
  * @doc:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 cong_doc_tool_supports_document (CongServiceDocTool *tool, 
@@ -103,7 +105,7 @@
 
 /**
  * cong_doc_tool_invoke:
- * @tool:
+ * @doc_tool:
  * @primary_window:
  *
  * TODO: Write me
Index: src/cong-service-document-factory.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-service-document-factory.c,v
retrieving revision 1.2
diff -u -r1.2 cong-service-document-factory.c
--- a/src/cong-service-document-factory.c	18 Apr 2004 05:32:30 -0000	1.2
+++ b/src/cong-service-document-factory.c	24 Jun 2004 17:45:28 -0000
@@ -51,6 +51,7 @@
  * @user_data:
  *
  * TODO: Write me
+ * Returns:
  */
 CongServiceDocumentFactory*
 cong_service_document_factory_construct (CongServiceDocumentFactory* factory,
@@ -137,6 +138,7 @@
  * @factory:
  *
  * TODO: Write me
+ * Returns:
  */
 GdkPixbuf *
 cong_document_factory_get_icon(CongServiceDocumentFactory *factory)
Index: src/cong-service-editor-node-factory.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-service-editor-node-factory.c,v
retrieving revision 1.2
diff -u -r1.2 cong-service-editor-node-factory.c
--- a/src/cong-service-editor-node-factory.c	18 Apr 2004 05:32:30 -0000	1.2
+++ b/src/cong-service-editor-node-factory.c	24 Jun 2004 17:45:29 -0000
@@ -44,6 +44,7 @@
  * @user_data:
  *
  * TODO: Write me
+ * Returns:
  */
 CongServiceEditorNodeFactory*
 cong_service_editor_node_factory_construct (CongServiceEditorNodeFactory *editor_node_factory,
@@ -71,11 +72,12 @@
 
 /**
  * cong_plugin_editor_node_factory_invoke:
- * @service_editor_node_factory:
+ * @plugin_editor_node_factory:
  * @editor_widget: 
  * @traversal_node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorNodeElement*
 cong_plugin_editor_node_factory_invoke (CongServiceEditorNodeFactory *service_editor_node_factory,
Index: src/cong-service-exporter.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-service-exporter.c,v
retrieving revision 1.2
diff -u -r1.2 cong-service-exporter.c
--- a/src/cong-service-exporter.c	18 Apr 2004 05:32:30 -0000	1.2
+++ b/src/cong-service-exporter.c	24 Jun 2004 17:45:29 -0000
@@ -46,6 +46,7 @@
  * @user_data:
  *
  * TODO: Write me
+ * Returns:
  */
 CongServiceExporter*
 cong_service_exporter_construct (CongServiceExporter *exporter,
@@ -81,6 +82,7 @@
  * @doc:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 cong_exporter_supports_document(CongServiceExporter *exporter, CongDocument *doc)
@@ -125,6 +127,7 @@
  * @exporter:
  *
  * TODO: Write me
+ * Returns:
  */
 gchar *
 cong_exporter_get_preferred_uri(CongServiceExporter *exporter)
Index: src/cong-service-importer.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-service-importer.c,v
retrieving revision 1.3
diff -u -r1.3 cong-service-importer.c
--- a/src/cong-service-importer.c	21 Jun 2004 01:33:23 -0000	1.3
+++ b/src/cong-service-importer.c	24 Jun 2004 17:45:30 -0000
@@ -40,11 +40,12 @@
  * @name:
  * @description:
  * @id:
- * @mime_filter:
+ * @filter_factory_callback:
  * @action_callback:
  * @user_data:
  *
  * TODO: Write me
+ * Returns:
  */
 CongServiceImporter*
 cong_service_importer_construct (CongServiceImporter *importer,
@@ -80,6 +81,7 @@
  * @importer: the importer
  *
  * Run this importer's callback to create a GtkFileFilter for the File->Importer dialog
+ * Returns:
  */
 GtkFileFilter*
 cong_importer_make_file_filter (CongServiceImporter *importer)
Index: src/cong-service-node-property-dialog.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-service-node-property-dialog.c,v
retrieving revision 1.2
diff -u -r1.2 cong-service-node-property-dialog.c
--- a/src/cong-service-node-property-dialog.c	18 Apr 2004 05:32:30 -0000	1.2
+++ b/src/cong-service-node-property-dialog.c	24 Jun 2004 17:45:30 -0000
@@ -43,6 +43,7 @@
  * @user_data:
  *
  * TODO: Write me
+ * Returns:
  */
 CongServiceNodePropertyDialog*
 cong_service_node_property_dialog_construct (CongServiceNodePropertyDialog* node_property_dialog,
@@ -69,11 +70,12 @@
 
 /**
  * cong_custom_property_dialog_make:
- * @node_property_dialog:
+ * @custom_property_dialog:
  * @doc:
  * @node:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkWidget *
 cong_custom_property_dialog_make(CongServiceNodePropertyDialog *node_property_dialog,
Index: src/cong-service-print-method.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-service-print-method.c,v
retrieving revision 1.2
diff -u -r1.2 cong-service-print-method.c
--- a/src/cong-service-print-method.c	18 Apr 2004 05:32:30 -0000	1.2
+++ b/src/cong-service-print-method.c	24 Jun 2004 17:45:30 -0000
@@ -45,6 +45,7 @@
  * @user_data:
  *
  * TODO: Write me
+ * Returns:
  */
 CongServicePrintMethod *
 cong_service_print_method_construct (CongServicePrintMethod *print_method,
@@ -80,6 +81,7 @@
  * @doc:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 cong_print_method_supports_document(CongServicePrintMethod *print_method, CongDocument *doc)
Index: src/cong-service-tool.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-service-tool.c,v
retrieving revision 1.2
diff -u -r1.2 cong-service-tool.c
--- a/src/cong-service-tool.c	18 Apr 2004 05:32:30 -0000	1.2
+++ b/src/cong-service-tool.c	24 Jun 2004 17:45:31 -0000
@@ -47,6 +47,7 @@
  * @user_data:
  *
  * TODO: Write me
+ * Returns:
  */
 CongServiceTool*
 cong_service_tool_construct (CongServiceTool *tool,
@@ -82,6 +83,7 @@
  * @tool:
  *
  * TODO: Write me
+ * Returns:
  */
 const gchar*
 cong_service_tool_get_menu_text (CongServiceTool *tool)
@@ -96,6 +98,7 @@
  * @tool:
  *
  * TODO: Write me
+ * Returns:
  */
 const gchar*
 cong_service_tool_get_tip_text (CongServiceTool *tool)
@@ -110,6 +113,7 @@
  * @tool:
  *
  * TODO: Write me
+ * Returns:
  */
 const gchar*
 cong_service_tool_get_tip_further_text (CongServiceTool *tool)
@@ -124,6 +128,7 @@
  * @tool:
  *
  * TODO: Write me
+ * Returns:
  */
 gpointer
 cong_service_tool_get_user_data (CongServiceTool *tool)
Index: src/cong-service.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-service.c,v
retrieving revision 1.2
diff -u -r1.2 cong-service.c
--- a/src/cong-service.c	18 Apr 2004 05:32:30 -0000	1.2
+++ b/src/cong-service.c	24 Jun 2004 17:45:31 -0000
@@ -47,6 +47,7 @@
  * @service_id:
  *
  * TODO: Write me
+ * Returns:
  */
 CongService*
 cong_service_construct (CongService* service,
@@ -71,6 +72,7 @@
  * @service:
  *
  * TODO: Write me
+ * Returns:
  */
 const gchar*
 cong_service_get_name (CongService *service)
@@ -85,6 +87,7 @@
  * @service:
  *
  * TODO: Write me
+ * Returns:
  */
 const gchar* 
 cong_service_get_description (CongService *service)
@@ -99,6 +102,7 @@
  * @service:
  *
  * TODO: Write me
+ * Returns:
  */
 const gchar* 
 cong_service_get_id (CongService *service)
@@ -113,6 +117,7 @@
  * @service:
  *
  * TODO: Write me
+ * Returns:
  */
 gchar* 
 cong_service_get_gconf_namespace (CongService* service)
@@ -128,8 +133,13 @@
  * cong_service_get_gconf_key:
  * @service:
  * @local_part:
- *
- * TODO: Write me
+ * 
+ * Convert a "local" GConf key for this plugin to a GConf key with a full-path.
+ * e.g. converts "enable-fubar" to "/apps/conglomerate/plugins/docbook/enable-fubar"
+ *   
+ * Caller must delete returned string.
+ * 
+ * Returns:
  */
 gchar* 
 cong_service_get_gconf_key (CongService *service, 
Index: src/cong-service.h
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-service.h,v
retrieving revision 1.1
diff -u -r1.1 cong-service.h
--- a/src/cong-service.h	11 Jan 2004 04:28:32 -0000	1.1
+++ b/src/cong-service.h	24 Jun 2004 17:45:31 -0000
@@ -54,18 +54,6 @@
 gchar* 
 cong_service_get_gconf_namespace (CongService* service);
 
-/**
- * cong_service_get_gconf_key:
- * @service:
- * @local_part:
- * 
- * Convert a "local" GConf key for this plugin to a GConf key with a full-path.
- * e.g. converts "enable-fubar" to "/apps/conglomerate/plugins/docbook/enable-fubar"
- *   
- * Caller must delete returned string.
- * 
- * Returns:
- */
 gchar* 
 cong_service_get_gconf_key (CongService *service, 
 			    const gchar *local_part);
Index: src/cong-source-view.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-source-view.c,v
retrieving revision 1.20
diff -u -r1.20 cong-source-view.c
--- a/src/cong-source-view.c	18 Jun 2004 03:49:02 -0000	1.20
+++ b/src/cong-source-view.c	24 Jun 2004 17:45:32 -0000
@@ -316,6 +316,17 @@
 	}
 }
 
+/* 
+ * cong_util_make_source_view:
+ * @source_mime_type:
+ * @output_text_view:
+ *
+ * Make a scrollable source view for a programming language, with syntax highlighting if available.
+ * The view is uneditable.
+ * The widget is already "shown".
+ *
+ * Returns:
+ */
 GtkWidget*
 cong_util_make_source_view (const gchar *source_mime_type,
 			    GtkTextView **output_text_view)
Index: src/cong-text-cache.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-text-cache.c,v
retrieving revision 1.10
diff -u -r1.10 cong-text-cache.c
--- a/src/cong-text-cache.c	18 Apr 2004 05:32:30 -0000	1.10
+++ b/src/cong-text-cache.c	24 Jun 2004 17:45:32 -0000
@@ -79,11 +79,13 @@
 /* Exported function definitions: */
 /**
  * cong_text_cache_new:
- * @strip_whitespace:
- * @string:
- * @attr_list:
+ * @strip_whitespace:  Should whitespace be stripped ("normalised") if TRUE, or preserved if FALSE
+ * @string: the UTF8 string, must be non-NULL
+ * @attr_list:  Pango attributes for the string; can be NULL if you don't care about them
  *
- * TODO: Write me
+ * Create a new #CongTextCache.
+ *
+ * Returns: the new #CongTextCache
  */
 CongTextCache*
 cong_text_cache_new (gboolean strip_whitespace,
@@ -130,9 +132,11 @@
 
 /**
  * cong_text_cache_get_output_text:
- * @text_cache:
+ * @text_cache: the text cache from which to get the result
  *
- * TODO: Write me
+ * Get the text from the cache, which will have had the appropriate operation performed on it.
+ *
+ * Returns: the result of the operation as a UTF-8 string (owned by the #CongTextCache)
  */
 const gchar*
 cong_text_cache_get_output_text (CongTextCache* text_cache)
@@ -151,7 +155,9 @@
  * cong_text_cache_get_output_attributes:
  * @text_cache:
  *
- * TODO: Write me
+ * Get the text attributes from the cache, which will have had the appropriate operation performed on it.
+ *
+ * Returns: the attributes, which you must unref when you are finished.
  */
 PangoAttrList*
 cong_text_cache_get_output_attributes (CongTextCache* text_cache)
@@ -226,6 +232,7 @@
  * @original_byte_offset:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean
 cong_text_cache_convert_stripped_byte_offset_to_original (CongTextCache *text_cache,
@@ -269,6 +276,7 @@
  * @stripped_byte_offset:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean
 cong_text_cache_convert_original_byte_offset_to_stripped (CongTextCache *text_cache,
Index: src/cong-text-cache.h
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-text-cache.h,v
retrieving revision 1.4
diff -u -r1.4 cong-text-cache.h
--- a/src/cong-text-cache.h	5 Nov 2003 14:06:39 -0000	1.4
+++ b/src/cong-text-cache.h	24 Jun 2004 17:45:32 -0000
@@ -64,17 +64,6 @@
 			  int byte_count);
 #endif
 
-/**
- * cong_text_cache_new:
- *
- * Create a new #CongTextCache.
- *
- * @strip_whitespace:  Should whitespace be stripped ("normalised") if TRUE, or preserved if FALSE
- * @string: the UTF8 string, must be non-NULL
- * @attr_list:  Pango attributes for the string; can be NULL if you don't care about them
- *
- * Returns: the new #CongTextCache
- */
 CongTextCache*
 cong_text_cache_new (gboolean strip_whitespace,
 		     const gchar *string,
@@ -84,25 +73,9 @@
 cong_text_cache_free (CongTextCache* text_cache);
 
 
-/**
- * cong_text_cache_get_output_text:
- *
- * Get the text from the cache, which will have had the appropriate operation performed on it.
- *
- * @text_cache: the text cache from which to get the result
- *
- * Returns: the result of the operation as a UTF-8 string (owned by the #CongTextCache)
- */
 const gchar*
 cong_text_cache_get_output_text (CongTextCache* text_cache);
 
-/**
- * cong_text_cache_get_output_attributes:
- *
- * Get the text attributes from the cache, which will have had the appropriate operation performed on it.
- *
- * Returns: the attributes, which you must unref when you are finished.
- */
 PangoAttrList*
 cong_text_cache_get_output_attributes (CongTextCache* text_cache);
 
Index: src/cong-traversal-node.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-traversal-node.c,v
retrieving revision 1.3
diff -u -r1.3 cong-traversal-node.c
--- a/src/cong-traversal-node.c	18 Apr 2004 05:32:30 -0000	1.3
+++ b/src/cong-traversal-node.c	24 Jun 2004 17:45:33 -0000
@@ -57,12 +57,13 @@
 
 /**
  * cong_traversal_node_construct:
- * @traversal_node:
+ * @area:
  * @doc_traversal:
  * @xml_node:
  * @traversal_parent:
  *
  * TODO: Write me
+ * Returns:
  */
 CongTraversalNode*
 cong_traversal_node_construct (CongTraversalNode *traversal_node,
@@ -88,6 +89,7 @@
  * @traversal_parent:
  *
  * TODO: Write me
+ * Returns:
  */
 CongTraversalNode*
 cong_traversal_node_new (CongDocumentTraversal *doc_traversal,
@@ -105,6 +107,7 @@
  * @traversal_node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongDocumentTraversal*
 cong_traversal_node_get_document_traversal (CongTraversalNode *traversal_node)
@@ -119,6 +122,7 @@
  * @traversal_node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongDocument*
 cong_traversal_node_get_document (CongTraversalNode *traversal_node)
@@ -133,6 +137,7 @@
  * @traversal_node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongNodePtr
 cong_traversal_node_get_node (CongTraversalNode *traversal_node)
@@ -147,6 +152,7 @@
  * @traversal_node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongTraversalNode*
 cong_traversal_node_get_parent (CongTraversalNode *traversal_node)
@@ -161,6 +167,7 @@
  * @traversal_node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongTraversalNode*
 cong_traversal_node_get_first_child (CongTraversalNode *traversal_node)
@@ -185,6 +192,7 @@
  * @traversal_node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongTraversalNode*
 cong_traversal_node_get_prev (CongTraversalNode *traversal_node)
@@ -214,6 +222,7 @@
  * @traversal_node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongTraversalNode*
 cong_traversal_node_get_next (CongTraversalNode *traversal_node)
@@ -243,6 +252,7 @@
  * @traversal_node:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean
 cong_traversal_node_is_referenced_entity_decl (CongTraversalNode *traversal_node)
Index: src/cong-tree-view.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-tree-view.c,v
retrieving revision 1.35
diff -u -r1.35 cong-tree-view.c
--- a/src/cong-tree-view.c	10 Jun 2004 01:35:00 -0000	1.35
+++ b/src/cong-tree-view.c	24 Jun 2004 17:45:33 -0000
@@ -144,6 +144,7 @@
  * @user_data:
  *
  * TODO: Write me
+ * Returns:
  */
 CongTreeView *
 cong_tree_view_new (CongDocument *doc,
@@ -301,6 +302,7 @@
  * @tree_view:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkWidget* 
 cong_tree_view_get_widget(CongTreeView *tree_view)
@@ -316,6 +318,7 @@
  * @node:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean
 cong_tree_view_should_show_node (CongTreeView *cong_tree_view,
@@ -336,6 +339,7 @@
  * @cong_tree_view:
  *
  * TODO: Write me
+ * Returns:
  */
 CongNodePtr
 cong_tree_view_get_selected_node (CongTreeView *cong_tree_view)
@@ -356,6 +360,7 @@
  * @tree_view:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkTreeStore* 
 cong_tree_view_protected_get_tree_store (CongTreeView *tree_view)
@@ -535,6 +540,7 @@
  * @user_data:
  *
  * TODO: Write me
+ * Returns:
  */
 gint 
 key_compare_func (gconstpointer a, 
@@ -549,6 +555,7 @@
  * @data:
  *
  * TODO: Write me
+ * Returns:
  */
 void 
 value_destroy_func (gpointer data)
Index: src/cong-util.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-util.c,v
retrieving revision 1.36
diff -u -r1.36 cong-util.c
--- a/src/cong-util.c	22 Jun 2004 03:05:35 -0000	1.36
+++ b/src/cong-util.c	24 Jun 2004 17:45:33 -0000
@@ -58,6 +58,7 @@
  * @doc:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 cong_util_is_docbook (CongDocument *doc) 
@@ -91,6 +92,7 @@
  * @utf8_text:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 cong_util_is_pure_whitespace (const gchar *utf8_text)
@@ -112,9 +114,11 @@
 
 /**
  * cong_util_cleanup_text:
- * @src_text:
+ * @text:  input UTF8 text
  *
- * TODO: Write me
+ * Handy function for taking UTF8 text and turning it into something you can see in a log: tabs and carriage returns etc are turned into visible characters.
+ *
+ * Returns: a freshly-allocated string, with all tabs and carriage returns turned into their printf equivalents
  */
 gchar* 
 cong_util_cleanup_text (const xmlChar *src_text) 
@@ -161,11 +165,14 @@
 }
 
 /**
- * cong_util_text_header:
- * @text:
+ * cong_util_text_header
+ * @text:  input UTF8 text
  * @truncation_length:
  *
- * TODO: Write me
+ * Handy function for taking UTF8 text and turning it into something you can use in short user-visible message: tabs and carriage returns etc are turned into spaces,
+ * and it is truncated with an ellipsis if above a certain length.
+ *
+ * Returns: a freshly-allocated string, cleaned up as described above
  */
 gchar* 
 cong_util_text_header (const xmlChar *text,
@@ -199,7 +206,9 @@
 /**
  * cong_utils_get_norman_walsh_stylesheet_path:
  *
- * TODO: Write me
+ *  Try to locate Norman Walsh's stylesheets for DocBook using the local catalog to find them.
+ *
+ * Returns:  a string containing the path (which the caller must delete), or NULL
  */
 gchar*
 cong_utils_get_norman_walsh_stylesheet_path(void)
@@ -219,6 +228,7 @@
  * @stylesheet_relative_path:
  *
  * TODO: Write me
+ * Returns:
  */
 gchar*
 cong_utils_get_norman_walsh_stylesheet(const gchar *stylesheet_relative_path)
@@ -242,6 +252,7 @@
  * @icon_basename:
  *
  * TODO: Write me
+ * Returns:
  */
 GdkPixbuf*
 cong_util_load_icon (const gchar *icon_basename)
@@ -412,17 +423,16 @@
 #endif
 
 /**
-   Make DTD declaration, and assigns it to the given document.  Doesn't add it to doc tree.
- */
-/**
  * cong_util_make_dtd:
  * @xml_doc:
  * @root_element:
  * @ExternalID:
  * @SystemID:
  *
- * TODO: Write me
- */
+ * Make DTD declaration, and assigns it to the given document.  Doesn't add it to doc tree
+ *
+ * Returns: the #xmlDtdPtr that was assigned
+ */ 
 xmlDtdPtr
 cong_util_make_dtd (xmlDocPtr xml_doc,
 		    const xmlChar *root_element,
@@ -481,7 +491,10 @@
  * @ExternalID:
  * @SystemID:
  *
- * TODO: Write me
+ * Make DTD declaration, assigns it to the given document, and add it to the tree.
+ * Call cong_document_set_external_dtd() instead if you want notifications to work.
+ *
+ * Returns: the #xmlDtdPtr that was assigned
  */
 xmlDtdPtr 
 cong_util_add_external_dtd (xmlDocPtr xml_doc, 
@@ -572,8 +585,13 @@
 /**
  * cong_util_get_int_from_rgb_hex:
  * @string:
+ * 
+ * Parse a string containing an HTML-style hexadecimal representation of an RGB triplet
+ * into a 32 bit RGB triplet.
  *
- * TODO: Write me
+ * FIXME: it's fundamentally broken to be using ints for this; should use a struct
+ *
+ * Returns: RGB triplet packed into a 32-bit value
  */
 unsigned int
 cong_util_get_int_from_rgb_hex (const gchar *string)
@@ -597,11 +615,14 @@
 }
 
 /**
- * cong_util_ns_equality:
- * @xml_ns1:
- * @xml_ns2:
- *
- * TODO: Write me
+ * cong_util_ns_equality
+ * @xml_ns1: A namespace. Can be NULL.
+ * @xml_ns2: Another namespace. Can be NULL.
+ *
+ * Compares the namespace URIs of both namespaces. 
+ * The prefixes are not checked. If both are NULL
+ * they are also equal.
+ * Returns:
  */
 gboolean
 cong_util_ns_equality (const xmlNs *xml_ns1,
@@ -621,8 +642,14 @@
  * cong_util_ns_uri_equality:
  * @uri0:
  * @uri1:
+ * 
+ * Compare two namespace URIs, either or both of which can be NULL.
+ *
+ * Currently the comparison is an exact string comparison, which might be too strict,
+ * see p118 of "Effective XML" for a discussion of ambiguities in the spec.
+ *
+ * Returns: TRUE if they are the same URI (or both NULL), FALSE otherwise
  *
- * TODO: Write me
  */
 gboolean
 cong_util_ns_uri_equality (const gchar* uri0, 
@@ -637,8 +664,14 @@
  * cong_util_ns_uri_sort_order:
  * @uri0:
  * @uri1:
+ * 
+ * Compare two namespace URIs, either or both of which can be NULL.
+ *
+ * Currently the comparison is an exact string comparison, which might be too strict,
+ * see p118 of "Effective XML" for a discussion of ambiguities in the spec.
+ *
+ * Returns: 0 if they are the same URI (or both NULL), otherwise positive or negative to give an ordering
  *
- * TODO: Write me
  */
 gint
 cong_util_ns_uri_sort_order (const gchar* uri0, 
@@ -669,7 +702,9 @@
  * @value0:
  * @value1:
  *
- * TODO: Write me
+ * Compare two attribute value strings for equality; either or both might be NULL
+ *
+ * Returns: TRUE if they are equal (i.e. the same string, or both are NULL)
  */
 gboolean
 cong_util_attribute_value_equality (const gchar *value0,
@@ -696,6 +731,7 @@
  * @local_name:
  *
  * TODO: Write me
+ * Returns:
  */
 CongElementDescription*
 cong_element_description_new (const gchar *ns_uri,
@@ -720,6 +756,7 @@
  * @element_desc:
  *
  * TODO: Write me
+ * Returns:
  */
 CongElementDescription*
 cong_element_description_clone (const CongElementDescription *element_desc)
@@ -762,6 +799,7 @@
  * @ns_search_node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongNodePtr
 cong_element_description_make_node (const CongElementDescription *element_desc,
@@ -790,6 +828,7 @@
  * @doc:
  *
  * TODO: Write me
+ * Returns:
  */
 CongDispspecElement*
 cong_element_description_get_dispspec_element_for_doc (const CongElementDescription *element_desc,
@@ -813,6 +852,7 @@
  * @ds:
  *
  * TODO: Write me
+ * Returns:
  */
 CongDispspecElement*
 cong_element_description_get_dispspec_element_for_dispspec (const CongElementDescription *element_desc,
@@ -870,6 +910,7 @@
  * @user_data:
  *
  * TODO: Write me
+ * Returns:
  */
 gint
 sort_func_ds_user_visible_name (GtkTreeModel *model,
@@ -920,6 +961,7 @@
  * @user_data:
  *
  * TODO: Write me
+ * Returns:
  */
 gint
 sort_func_element_local_name (GtkTreeModel *model,
@@ -961,12 +1003,14 @@
 
 /**
  * cong_util_modal_element_selection_dialog:
- * @title:
- * @description:
- * @doc:
- * @elements:
+ * @title: Title for the dialog
+ * @description: Descriptive text for the dialog
+ * @doc: The document, so that dispspecs can be searched for descriptions
+ * @elements: A GList of #CongElementDescription
  *
- * TODO: Write me
+ * Runs a modal element selection dialog.
+ *
+ * Returns: the selected element (which the caller must free), or NULL if the dialog was cancelled
  */
 CongElementDescription*
 cong_util_modal_element_selection_dialog (const gchar *title, 
@@ -1151,6 +1195,7 @@
  * @pixbuf:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkMenuItem* 
 cong_util_make_menu_item (const gchar *label,
@@ -1184,6 +1229,7 @@
  * @stock_id:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkMenuItem* 
 cong_util_make_stock_menu_item (const gchar *stock_id)
@@ -1199,6 +1245,7 @@
  * @element:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkMenuItem* 
 cong_util_make_menu_item_for_dispspec_element (CongDispspecElement *element)
@@ -1232,6 +1279,7 @@
  * @doc:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkMenuItem* 
 cong_util_make_menu_item_for_element_desc (const CongElementDescription *element_desc,
@@ -1258,6 +1306,7 @@
  * @menu:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkWidget*
 cong_util_add_menu_separator (GtkMenu *menu)
@@ -1278,10 +1327,10 @@
 
 /**
  * cong_util_get_qualified_attribute_name:
- * @namespace:
- * @local_attribute_name:
+ * @namespace: Namespace of attribute (can be NULL).
+ * @local_attribute_name: Local name of attribute.
  *
- * TODO: Write me
+ * Returns: 
  */
 char *
 cong_util_get_qualified_attribute_name(const xmlNs *namespace,
@@ -1302,6 +1351,15 @@
 
 extern char *ilogo_xpm[];
 
+/**
+ * cong_util_show_in_window:
+ * @content:
+ * @title:
+ * 
+ * Embed the chosen GtkWidget in an appropriate frame, with the application icon etc.
+ * Anything using this probably needs some HIG love.
+ *
+ */
 void
 cong_util_show_in_window (GtkWidget *content,
 			  const gchar *title)
@@ -1350,6 +1408,14 @@
 	return filter;
 }
 
+/**
+ * cong_util_run_add_dtd_dialog:
+ * @doc:
+ * @parent_window:
+ *
+ * Open a dialog for choosing a DTD to associate with the document
+ * 
+ */
 void
 cong_util_run_add_dtd_dialog (CongDocument *doc,
 			      GtkWindow *parent_window)
Index: src/cong-util.h
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-util.h,v
retrieving revision 1.29
diff -u -r1.29 cong-util.h
--- a/src/cong-util.h	22 Jun 2004 03:05:35 -0000	1.29
+++ b/src/cong-util.h	24 Jun 2004 17:45:33 -0000
@@ -35,39 +35,13 @@
 gboolean 
 cong_util_is_pure_whitespace (const gchar *utf8_text);
 
-/**
- * cong_util_cleanup_text:
- *
- * @text:  input UTF8 text
- *
- * Handy function for taking UTF8 text and turning it into something you can see in a log: tabs and carriage returns etc are turned into visible characters.
- *
- * Returns: a freshly-allocated string, with all tabs and carriage returns turned into their printf equivalents
- */
 gchar* 
 cong_util_cleanup_text (const xmlChar *text);
 
-/**
- * cong_util_text_header
- *
- * @text:  input UTF8 text
- *
- * Handy function for taking UTF8 text and turning it into something you can use in short user-visible message: tabs and carriage returns etc are turned into spaces,
- * and it is truncated with an ellipsis if above a certain length.
- *
- * Returns: a freshly-allocated string, cleaned up as described above
- */
 gchar* 
 cong_util_text_header (const xmlChar *text,
 		       guint truncation_length);
 
-/**
- * cong_utils_get_norman_walsh_stylesheet_path:
- *
- *  Try to locate Norman Walsh's stylesheets for DocBook using the local catalog to find them.
- *
- * Returns:  a string containing the path (which the caller must delete), or NULL
- */
 gchar*
 cong_utils_get_norman_walsh_stylesheet_path(void);
 
@@ -77,6 +51,7 @@
 /**
    Icon loading; take an icon basename e.g. "cong-docbook-set", convert to a filename and load it.
  */
+ 
 GdkPixbuf*
 cong_util_load_icon (const gchar *icon_basename);
 
@@ -124,116 +99,46 @@
     }								\
 }
 
-/**
- * cong_util_make_dtd:
- *
- * Make DTD declaration, and assigns it to the given document.  Doesn't add it to doc tree
- *
- * Returns: the #xmlDtdPtr that was assigned
- */
 xmlDtdPtr
 cong_util_make_dtd (xmlDocPtr xml_doc,
 		    const xmlChar *root_element,
 		    const xmlChar *ExternalID, 
 		    const xmlChar *SystemID);
 
-/**
- * cong_util_add_external_dtd:
- *
- * Make DTD declaration, assigns it to the given document, and add it to the tree.
- * Call cong_document_set_external_dtd() instead if you want notifications to work.
- *
- * Returns: the #xmlDtdPtr that was assigned
- */
 xmlDtdPtr 
 cong_util_add_external_dtd (xmlDocPtr xml_doc, 
 			    const xmlChar *root_element,
 			    const xmlChar *ExternalID, 
 			    const xmlChar *SystemID);
 
-/**
- * cong_util_run_add_dtd_dialog:
- *
- * Open a dialog for choosing a DTD to associate with the document
- * 
- */
 void
 cong_util_run_add_dtd_dialog (CongDocument *doc,
 			      GtkWindow *parent_window);
 
 /* Dodgy hack to do lines that blend to white: */
+
 void 
 cong_util_draw_blended_line (GtkWidget *w,
 			     const GdkColor *col,
 			     int x0, int y0,
 			     int x1);
 
-/**
- * cong_util_get_int_from_rgb_hex:
- * 
- * Parse a string containing an HTML-style hexadecimal representation of an RGB triplet
- * into a 32 bit RGB triplet.
- *
- * FIXME: it's fundamentally broken to be using ints for this; should use a struct
- *
- * Returns: RGB triplet packed into a 32-bit value
- */
 unsigned int
 cong_util_get_int_from_rgb_hex (const gchar *string);
 
 
-/**
- * cong_util_ns_equality
- *
- * @xml_ns1: A namespace. Can be NULL.
- * @xml_ns2: Another namespace. Can be NULL.
- *
- * Compares the namespace URIs of both namespaces. 
- * The prefixes are not checked. If both are NULL
- * they are also equal.
- */
 gboolean 
 cong_util_ns_equality (const xmlNs *xml_ns1,
 		       const xmlNs *xml_ns2);
 
-/**
- * cong_util_ns_uri_equality:
- * 
- * Compare two namespace URIs, either or both of which can be NULL.
- *
- * Currently the comparison is an exact string comparison, which might be too strict,
- * see p118 of "Effective XML" for a discussion of ambiguities in the spec.
- *
- * Returns: TRUE if they are the same URI (or both NULL), FALSE otherwise
- *
- */
 gboolean
 cong_util_ns_uri_equality (const gchar* uri0, 
 			   const gchar* uri1);
 
-/**
- * cong_util_ns_uri_sort_order:
- * 
- * Compare two namespace URIs, either or both of which can be NULL.
- *
- * Currently the comparison is an exact string comparison, which might be too strict,
- * see p118 of "Effective XML" for a discussion of ambiguities in the spec.
- *
- * Returns: 0 if they are the same URI (or both NULL), otherwise positive or negative to give an ordering
- *
- */
 gint
 cong_util_ns_uri_sort_order (const gchar* uri0, 
 			     const gchar* uri1);
 
-/* 
- * cong_util_make_source_view:
- *
- * Make a scrollable source view for a programming language, with syntax highlighting if available.
- * The view is uneditable.
- * The widget is already "shown".
- *
- */
 GtkWidget*
 cong_util_make_source_view (const gchar *source_mime_type,
 			    GtkTextView **output_text_view);
@@ -243,14 +148,6 @@
 			   const gchar *source_mime_type,
 			   void (*regeneration_cb) (CongDocument *doc,
 						    GtkTextBuffer *text_buffer));
-/**
- * cong_util_attribute_value_equality:
- *
- * Compare two attribute value strings for equality; either or both might be NULL
- *
- * Returns TRUE if they are equal (i.e. the same string, or both are NULL)
- *
- */
 gboolean
 cong_util_attribute_value_equality (const gchar *value0,
 				    const gchar *value1);
@@ -294,18 +191,6 @@
 void
 cong_element_description_list_free (GList *list_of_element_desc);
 
-/**
- * cong_util_modal_element_selection_dialog:
- *
- * @title: Title for the dialog
- * @description: Descriptive text for the dialog
- * @doc: The document, so that dispspecs can be searched for descriptions
- * @elements: A GList of #CongElementDescription
- *
- * Runs a modal element selection dialog.
- *
- * Returns: the selected element (which the caller must free), or NULL if the dialog was cancelled
- */
 CongElementDescription*
 cong_util_modal_element_selection_dialog (const gchar *title, 
 					  const gchar *description,
@@ -331,25 +216,10 @@
 cong_util_add_menu_separator (GtkMenu *menu);
 
 
-/**
- * cong_util_attribute_name_qualified
- *
- * @namespace: Namespace of attribute (can be NULL).
- * @local_attribute_name: Local name of attribute.
- *
- * Returns: 
- */
 char *
 cong_util_get_qualified_attribute_name(const xmlNs *namespace,
 				       const xmlChar *local_attribute_name);
 
-/**
- * cong_util_show_in_window:
- * 
- * Embed the chosen GtkWidget in an appropriate frame, with the application icon etc.
- * Anything using this probably needs some HIG love.
- *
- */
 void
 cong_util_show_in_window (GtkWidget *content,
 			  const gchar *title);
Index: src/cong-vfs.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-vfs.c,v
retrieving revision 1.5
diff -u -r1.5 cong-vfs.c
--- a/src/cong-vfs.c	18 Apr 2004 05:32:30 -0000	1.5
+++ b/src/cong-vfs.c	24 Jun 2004 17:45:33 -0000
@@ -39,6 +39,7 @@
  * @bytes:
  *
  * TODO: Write me
+ * Returns:
  */
 GnomeVFSResult
 cong_vfs_read_bytes (GnomeVFSHandle* vfs_handle, 
@@ -63,6 +64,7 @@
  * @size:
  *
  * TODO: Write me
+ * Returns:
  */
 GnomeVFSResult
 cong_vfs_new_buffer_from_file (const char* filename, 
@@ -100,11 +102,13 @@
 
 /**
  * cong_vfs_new_buffer_from_uri:
- * @uri:
+ * @vfs_uri:
  * @buffer:
  * @size:
  *
- * TODO: Write me
+ * A routine that tries to syncronously load a file into a buffer in memory (surely this exists already somewhere?)
+ *
+ * Returns:
  */
 GnomeVFSResult
 cong_vfs_new_buffer_from_uri (GnomeVFSURI* uri, 
@@ -182,6 +186,7 @@
  * @parent_window:
  *
  * TODO: Write me
+ * Returns:
  */
 xmlDocPtr
 cong_vfs_load_xml_from_uri (const gchar *string_uri,
@@ -285,10 +290,11 @@
 /**
  * cong_vfs_save_xml_to_uri:
  * @doc_ptr:
- * @file_uri:
+ * @vfs_uri:
  * @output_file_size:
  *
  * TODO: Write me
+ * Returns:
  */
 GnomeVFSResult
 cong_vfs_save_xml_to_uri (xmlDocPtr doc_ptr, 
@@ -344,7 +350,7 @@
 
 /**
  * cong_vfs_get_local_path_from_uri:
- * @uri: a #GnomeVFSURI
+ * @vfs_uri: a #GnomeVFSURI
  *
  * Returns: a #gchar containing @uri as a POSIX path, assuming it is
  * valid
@@ -442,6 +448,7 @@
  * @string_uri:
  *
  * TODO: Write me
+ * Returns:
  */
 gchar*
 cong_vfs_extract_short_name (const gchar *string_uri)
Index: src/cong-vfs.h
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-vfs.h,v
retrieving revision 1.2
diff -u -r1.2 cong-vfs.h
--- a/src/cong-vfs.h	13 Oct 2003 10:59:16 -0000	1.2
+++ b/src/cong-vfs.h	24 Jun 2004 17:45:33 -0000
@@ -47,16 +47,6 @@
 			       char** buffer, 
 			       GnomeVFSFileSize* size);
 
-/**
- * cong_vfs_new_buffer_from_uri
- * @uri:
- * @buffer:
- * @size:
- * 
- * A routine that tries to syncronously load a file into a buffer in memory (surely this exists already somewhere?)
- * 
- * Returns:
-*/
 GnomeVFSResult
 cong_vfs_new_buffer_from_uri (GnomeVFSURI *vfs_uri, 
 			      char** buffer, 
Index: src/cong-view.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-view.c,v
retrieving revision 1.4
diff -u -r1.4 cong-view.c
--- a/src/cong-view.c	18 Apr 2004 05:32:30 -0000	1.4
+++ b/src/cong-view.c	24 Jun 2004 17:45:33 -0000
@@ -31,6 +31,7 @@
  * @view:
  *
  * TODO: Write me
+ * Returns:
  */
 CongDocument*
 cong_view_get_document(CongView *view)
@@ -45,6 +46,7 @@
  * @view:
  *
  * TODO: Write me
+ * Returns:
  */
 CongDispspec*
 cong_view_get_dispspec(CongView *view)
Index: src/cong-xpath-expression.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-xpath-expression.c,v
retrieving revision 1.5
diff -u -r1.5 cong-xpath-expression.c
--- a/src/cong-xpath-expression.c	18 Apr 2004 05:32:30 -0000	1.5
+++ b/src/cong-xpath-expression.c	24 Jun 2004 17:45:33 -0000
@@ -98,6 +98,7 @@
  * @xpath_expression_string:
  *
  * TODO: Write me
+ * Returns:
  */
 CongXPathExpression*
 cong_xpath_expression_construct (CongXPathExpression *xpath_expression,
@@ -122,6 +123,7 @@
  * @xpath_expression_string:
  *
  * TODO: Write me
+ * Returns:
  */
 CongXPathExpression*
 cong_xpath_expression_new (CongDocument *doc,
@@ -144,6 +146,7 @@
  * @xpath_expression:
  *
  * TODO: Write me
+ * Returns:
  */
 CongDocument*
 cong_xpath_expression_get_document (CongXPathExpression *xpath_expression)
@@ -158,6 +161,7 @@
  * @xpath_expression:
  *
  * TODO: Write me
+ * Returns:
  */
 CongNodePtr
 cong_xpath_expression_get_context_node (CongXPathExpression *xpath_expression)
@@ -172,6 +176,7 @@
  * @xpath_expression:
  *
  * TODO: Write me
+ * Returns:
  */
 const gchar*
 cong_xpath_expression_get_string_result (CongXPathExpression *xpath_expression)
Index: src/cursor.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cursor.c,v
retrieving revision 1.42
diff -u -r1.42 cursor.c
--- a/src/cursor.c	18 Apr 2004 05:32:30 -0000	1.42
+++ b/src/cursor.c	24 Jun 2004 17:45:34 -0000
@@ -67,9 +67,9 @@
 
 /**
  * cong_cursor_blink:
- * @data:
  *
  * TODO: Write me
+ * Returns:
  */
 gint 
 cong_cursor_blink(gpointer data)
@@ -102,6 +102,7 @@
  * @curs:
  *
  * TODO: Write me
+ * Returns:
  */
 int 
 cong_cursor_paragraph_insert(CongCursor *curs)
Index: src/file.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/file.c,v
retrieving revision 1.10
diff -u -r1.10 file.c
--- a/src/file.c	21 Jun 2004 01:33:23 -0000	1.10
+++ b/src/file.c	24 Jun 2004 17:45:34 -0000
@@ -12,9 +12,11 @@
  * @title:
  * @filename:
  * @parent_window:
- * @cong_action:
+ * @action:
+ * @list_of_filters:
  * 
  * TODO: Write me
+ * Returns:
  */
 
 gchar*
Index: src/fo-print-context.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/fo-print-context.c,v
retrieving revision 1.5
diff -u -r1.5 fo-print-context.c
--- a/src/fo-print-context.c	18 Apr 2004 05:32:30 -0000	1.5
+++ b/src/fo-print-context.c	24 Jun 2004 17:45:34 -0000
@@ -26,6 +26,7 @@
  * @gpc:
  *
  * TODO: Write me
+ * Returns:
  */
 FoPrintContext *
 fo_print_context_new_from_gnome_print(GnomePrintContext *gpc)
Index: src/plugin-abiword.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/plugin-abiword.c,v
retrieving revision 1.2
diff -u -r1.2 plugin-abiword.c
--- a/src/plugin-abiword.c	18 Apr 2004 05:32:30 -0000	1.2
+++ b/src/plugin-abiword.c	24 Jun 2004 17:45:35 -0000
@@ -35,6 +35,7 @@
  * @plugin:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 plugin_abiword_plugin_register (CongPlugin *plugin)
@@ -52,6 +53,7 @@
  * @plugin:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 plugin_abiword_plugin_configure (CongPlugin *plugin)
Index: src/plugin-admonition-node-element.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/plugin-admonition-node-element.c,v
retrieving revision 1.8
diff -u -r1.8 plugin-admonition-node-element.c
--- a/src/plugin-admonition-node-element.c	2 May 2004 16:26:28 -0000	1.8
+++ b/src/plugin-admonition-node-element.c	24 Jun 2004 17:45:35 -0000
@@ -88,10 +88,11 @@
 /**
  * cong_editor_node_element_admonition_construct:
  * @editor_node_element_admonition:
- * @editor_widget:
+ * @widget:
  * @traversal_node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorNodeElementAdmonition*
 cong_editor_node_element_admonition_construct (CongEditorNodeElementAdmonition *editor_node_element_admonition,
@@ -111,6 +112,7 @@
  * @traversal_node:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorNode*
 cong_editor_node_element_admonition_new (CongEditorWidget3* widget,
Index: src/plugin-admonition.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/plugin-admonition.c,v
retrieving revision 1.4
diff -u -r1.4 plugin-admonition.c
--- a/src/plugin-admonition.c	18 Apr 2004 05:32:30 -0000	1.4
+++ b/src/plugin-admonition.c	24 Jun 2004 17:45:35 -0000
@@ -65,6 +65,7 @@
  * @plugin:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 plugin_admonition_plugin_register(CongPlugin *plugin)
@@ -86,6 +87,7 @@
  * @plugin:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 plugin_admonition_plugin_configure(CongPlugin *plugin)
Index: src/plugin-arbitrary.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/plugin-arbitrary.c,v
retrieving revision 1.1
diff -u -r1.1 plugin-arbitrary.c
--- a/src/plugin-arbitrary.c	21 Jun 2004 04:43:08 -0000	1.1
+++ b/src/plugin-arbitrary.c	24 Jun 2004 17:45:35 -0000
@@ -259,6 +259,7 @@
  * @plugin:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 plugin_arbitrary_plugin_register (CongPlugin *plugin)
@@ -283,6 +284,7 @@
  * @plugin:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 plugin_arbitrary_plugin_configure (CongPlugin *plugin)
Index: src/plugin-cleanup-source.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/plugin-cleanup-source.c,v
retrieving revision 1.18
diff -u -r1.18 plugin-cleanup-source.c
--- a/src/plugin-cleanup-source.c	23 Jun 2004 17:37:29 -0000	1.18
+++ b/src/plugin-cleanup-source.c	24 Jun 2004 17:45:35 -0000
@@ -442,6 +442,7 @@
  * @plugin:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 plugin_cleanup_source_plugin_register(CongPlugin *plugin)
@@ -468,6 +469,7 @@
  * @plugin:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 plugin_cleanup_source_plugin_configure(CongPlugin *plugin)
Index: src/plugin-convert-case.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/plugin-convert-case.c,v
retrieving revision 1.10
diff -u -r1.10 plugin-convert-case.c
--- a/src/plugin-convert-case.c	18 Apr 2004 05:32:30 -0000	1.10
+++ b/src/plugin-convert-case.c	24 Jun 2004 17:45:35 -0000
@@ -114,6 +114,7 @@
  * @plugin:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 plugin_convert_case_plugin_register(CongPlugin *plugin)
@@ -136,6 +137,7 @@
  * @plugin:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 plugin_convert_case_plugin_configure(CongPlugin *plugin)
Index: src/plugin-css.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/plugin-css.c,v
retrieving revision 1.1
diff -u -r1.1 plugin-css.c
--- a/src/plugin-css.c	4 Jun 2004 05:12:36 -0000	1.1
+++ b/src/plugin-css.c	24 Jun 2004 17:45:35 -0000
@@ -108,6 +108,7 @@
  * @plugin:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 plugin_css_plugin_register (CongPlugin *plugin)
@@ -136,6 +137,7 @@
  * @plugin:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 plugin_css_plugin_configure (CongPlugin *plugin)
Index: src/plugin-docbook.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/plugin-docbook.c,v
retrieving revision 1.43
diff -u -r1.43 plugin-docbook.c
--- a/src/plugin-docbook.c	21 Jun 2004 03:34:42 -0000	1.43
+++ b/src/plugin-docbook.c	24 Jun 2004 17:45:37 -0000
@@ -173,6 +173,7 @@
  * @title:
  *
  * TODO: Write me
+ * Returns:
  */
 xmlDocPtr 
 make_article(const xmlChar *title)
@@ -234,6 +235,7 @@
  * @title:
  *
  * TODO: Write me
+ * Returns:
  */
 xmlDocPtr 
 make_book(const xmlChar *title)
@@ -302,6 +304,7 @@
  * @title:
  *
  * TODO: Write me
+ * Returns:
  */
 xmlDocPtr 
 make_set(const xmlChar *title)
@@ -375,6 +378,7 @@
  * @c:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean
 cong_unichar_is_line_break(gunichar c)
@@ -927,6 +931,7 @@
  * @user_data:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 sourcecode_importer_mime_filter(CongServiceImporter *importer, const gchar *mime_type, gpointer user_data)
@@ -1151,6 +1156,7 @@
  * @user_data:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 docbook_print_method_document_filter (CongServicePrintMethod *print_method, 
@@ -1231,6 +1237,7 @@
  * @node:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkWidget* 
 docbook_generic_node_factory_method(CongServiceNodePropertyDialog *custom_property_dialog, CongDocument *doc, CongNodePtr node)
@@ -1280,6 +1287,7 @@
  * @node:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkWidget* 
 docbook_orderedlist_properties_factory_method(CongServiceNodePropertyDialog *custom_property_dialog, CongDocument *doc, CongNodePtr node)
@@ -1409,6 +1417,7 @@
  * @node:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkWidget* 
 docbook_ulink_properties_factory_method(CongServiceNodePropertyDialog *custom_property_dialog, CongDocument *doc, CongNodePtr node)
@@ -1569,6 +1578,7 @@
  * @plugin:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 plugin_docbook_plugin_register(CongPlugin *plugin)
@@ -1715,6 +1725,7 @@
  * @plugin:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 plugin_docbook_plugin_configure(CongPlugin *plugin)
Index: src/plugin-dtd.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/plugin-dtd.c,v
retrieving revision 1.19
diff -u -r1.19 plugin-dtd.c
--- a/src/plugin-dtd.c	21 Jun 2004 01:33:23 -0000	1.19
+++ b/src/plugin-dtd.c	24 Jun 2004 17:45:38 -0000
@@ -204,6 +204,7 @@
  * @plugin:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 plugin_dtd_plugin_register(CongPlugin *plugin)
@@ -259,6 +260,7 @@
  * @plugin:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 plugin_dtd_plugin_configure(CongPlugin *plugin)
Index: src/plugin-empty.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/plugin-empty.c,v
retrieving revision 1.5
diff -u -r1.5 plugin-empty.c
--- a/src/plugin-empty.c	18 Apr 2004 05:32:30 -0000	1.5
+++ b/src/plugin-empty.c	24 Jun 2004 17:45:38 -0000
@@ -35,6 +35,7 @@
  * @plugin:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 plugin_empty_plugin_register (CongPlugin *plugin)
@@ -52,6 +53,7 @@
  * @plugin:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 plugin_empty_plugin_configure (CongPlugin *plugin)
Index: src/plugin-fo.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/plugin-fo.c,v
retrieving revision 1.7
diff -u -r1.7 plugin-fo.c
--- a/src/plugin-fo.c	18 Apr 2004 05:32:30 -0000	1.7
+++ b/src/plugin-fo.c	24 Jun 2004 17:45:38 -0000
@@ -142,6 +142,7 @@
  * @plugin:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 plugin_fo_plugin_register(CongPlugin *plugin)
@@ -174,6 +175,7 @@
  * @plugin:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 plugin_fo_plugin_configure(CongPlugin *plugin)
Index: src/plugin-html.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/plugin-html.c,v
retrieving revision 1.3
diff -u -r1.3 plugin-html.c
--- a/src/plugin-html.c	18 Apr 2004 05:32:30 -0000	1.3
+++ b/src/plugin-html.c	24 Jun 2004 17:45:38 -0000
@@ -124,6 +124,7 @@
  * @plugin:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 plugin_html_plugin_register (CongPlugin *plugin)
@@ -175,6 +176,7 @@
  * @plugin:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 plugin_html_plugin_configure (CongPlugin *plugin)
Index: src/plugin-lists-area-listitem.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/plugin-lists-area-listitem.c,v
retrieving revision 1.8
diff -u -r1.8 plugin-lists-area-listitem.c
--- a/src/plugin-lists-area-listitem.c	18 Apr 2004 05:32:30 -0000	1.8
+++ b/src/plugin-lists-area-listitem.c	24 Jun 2004 17:45:38 -0000
@@ -65,6 +65,7 @@
  * @label:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorArea*
 cong_editor_area_listitem_construct (CongEditorAreaListitem *area_listitem,
@@ -90,6 +91,7 @@
  * @label:
  *
  * TODO: Write me
+ * Returns:
  */
 CongEditorArea*
 cong_editor_area_listitem_new (CongEditorWidget3 *editor_widget,
Index: src/plugin-lists-node-element-listitem.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/plugin-lists-node-element-listitem.c,v
retrieving revision 1.14
diff -u -r1.14 plugin-lists-node-element-listitem.c
--- a/src/plugin-lists-node-element-listitem.c	23 Jun 2004 17:37:29 -0000	1.14
+++ b/src/plugin-lists-node-element-listitem.c	24 Jun 2004 17:45:38 -0000
@@ -108,7 +108,7 @@
 /**
  * cong_editor_node_element_listitem_construct:
  * @editor_node_element_listitem:
- * @editor_widget:
+ * @widget:
  * @traversal_node:
  *
  * TODO: Write me
@@ -160,6 +160,7 @@
  * @listitem:
  *
  * TODO: Write me
+ * Returns:
  */
 const gchar*
 cong_editor_node_element_listitem_get_label (CongEditorNodeElementListitem* listitem)
Index: src/plugin-lists.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/plugin-lists.c,v
retrieving revision 1.12
diff -u -r1.12 plugin-lists.c
--- a/src/plugin-lists.c	18 Apr 2004 05:32:30 -0000	1.12
+++ b/src/plugin-lists.c	24 Jun 2004 17:45:38 -0000
@@ -65,6 +65,7 @@
  * @plugin:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 plugin_lists_plugin_register(CongPlugin *plugin)
@@ -86,6 +87,7 @@
  * @plugin:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 plugin_lists_plugin_configure(CongPlugin *plugin)
Index: src/plugin-paragraph.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/plugin-paragraph.c,v
retrieving revision 1.7
diff -u -r1.7 plugin-paragraph.c
--- a/src/plugin-paragraph.c	18 Apr 2004 05:32:30 -0000	1.7
+++ b/src/plugin-paragraph.c	24 Jun 2004 17:45:38 -0000
@@ -56,6 +56,7 @@
  * @plugin:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 plugin_paragraph_plugin_register(CongPlugin *plugin)
@@ -77,6 +78,7 @@
  * @plugin:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 plugin_paragraph_plugin_configure(CongPlugin *plugin)
Index: src/plugin-random.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/plugin-random.c,v
retrieving revision 1.11
diff -u -r1.11 plugin-random.c
--- a/src/plugin-random.c	24 Jun 2004 03:24:51 -0000	1.11
+++ b/src/plugin-random.c	24 Jun 2004 17:45:38 -0000
@@ -671,6 +671,7 @@
  * @plugin:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 plugin_random_plugin_register(CongPlugin *plugin)
@@ -694,6 +695,7 @@
  * @plugin:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 plugin_random_plugin_configure(CongPlugin *plugin)
Index: src/plugin-save-dispspec.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/plugin-save-dispspec.c,v
retrieving revision 1.8
diff -u -r1.8 plugin-save-dispspec.c
--- a/src/plugin-save-dispspec.c	20 Jun 2004 21:39:23 -0000	1.8
+++ b/src/plugin-save-dispspec.c	24 Jun 2004 17:45:39 -0000
@@ -138,6 +138,7 @@
  * @plugin:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 plugin_save_dispspec_plugin_register(CongPlugin *plugin)
@@ -176,6 +177,7 @@
  * @plugin:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 plugin_save_dispspec_plugin_configure(CongPlugin *plugin)
Index: src/plugin-sgml.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/plugin-sgml.c,v
retrieving revision 1.8
diff -u -r1.8 plugin-sgml.c
--- a/src/plugin-sgml.c	21 Jun 2004 01:33:23 -0000	1.8
+++ b/src/plugin-sgml.c	24 Jun 2004 17:45:39 -0000
@@ -198,6 +198,7 @@
  * @plugin:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 plugin_sgml_plugin_register(CongPlugin *plugin)
@@ -220,6 +221,7 @@
  * @plugin:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 plugin_sgml_plugin_configure(CongPlugin *plugin)
Index: src/plugin-tei.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/plugin-tei.c,v
retrieving revision 1.2
diff -u -r1.2 plugin-tei.c
--- a/src/plugin-tei.c	18 Apr 2004 05:32:30 -0000	1.2
+++ b/src/plugin-tei.c	24 Jun 2004 17:45:39 -0000
@@ -35,6 +35,7 @@
  * @plugin:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 plugin_tei_plugin_register (CongPlugin *plugin)
@@ -52,6 +53,7 @@
  * @plugin:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 plugin_tei_plugin_configure (CongPlugin *plugin)
Index: src/plugin-templates.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/plugin-templates.c,v
retrieving revision 1.9
diff -u -r1.9 plugin-templates.c
--- a/src/plugin-templates.c	18 Apr 2004 05:32:30 -0000	1.9
+++ b/src/plugin-templates.c	24 Jun 2004 17:45:39 -0000
@@ -244,6 +244,7 @@
  * @plugin:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 plugin_templates_plugin_register(CongPlugin *plugin)
@@ -271,6 +272,7 @@
  * @plugin:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean
 plugin_templates_plugin_configure(CongPlugin *plugin)
Index: src/plugin-tests.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/plugin-tests.c,v
retrieving revision 1.10
diff -u -r1.10 plugin-tests.c
--- a/src/plugin-tests.c	18 Apr 2004 05:32:30 -0000	1.10
+++ b/src/plugin-tests.c	24 Jun 2004 17:45:39 -0000
@@ -346,6 +346,7 @@
  * @plugin:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 plugin_tests_plugin_register(CongPlugin *plugin)
@@ -373,6 +374,7 @@
  * @plugin:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 plugin_tests_plugin_configure(CongPlugin *plugin)
Index: src/plugin-validate.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/plugin-validate.c,v
retrieving revision 1.13
diff -u -r1.13 plugin-validate.c
--- a/src/plugin-validate.c	23 Jun 2004 17:37:29 -0000	1.13
+++ b/src/plugin-validate.c	24 Jun 2004 17:45:39 -0000
@@ -237,6 +237,8 @@
  * Registers validate plugin - plugin that provides menu item
  * that validates document agains DTD and show validation 
  * warining and errors.
+ *
+ * Returns:
  */
 gboolean 
 plugin_validate_plugin_register(CongPlugin *plugin)
@@ -262,6 +264,8 @@
  * @plugin: Plugin
  *
  * This function should contain all code to configure validate plugin
+ *
+ * Returns: 
  */
 gboolean 
 plugin_validate_plugin_configure(CongPlugin *plugin)
Index: src/plugin-website.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/plugin-website.c,v
retrieving revision 1.15
diff -u -r1.15 plugin-website.c
--- a/src/plugin-website.c	18 Apr 2004 05:32:30 -0000	1.15
+++ b/src/plugin-website.c	24 Jun 2004 17:45:39 -0000
@@ -495,6 +495,7 @@
  * @plugin:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 plugin_website_plugin_register(CongPlugin *plugin)
@@ -525,6 +526,7 @@
  * @plugin:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 plugin_website_plugin_configure(CongPlugin *plugin)
Index: src/plugin-xsl.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/plugin-xsl.c,v
retrieving revision 1.7
diff -u -r1.7 plugin-xsl.c
--- a/src/plugin-xsl.c	18 Apr 2004 05:32:30 -0000	1.7
+++ b/src/plugin-xsl.c	24 Jun 2004 17:45:39 -0000
@@ -311,6 +311,7 @@
  * @plugin:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 plugin_xsl_plugin_register(CongPlugin *plugin)
@@ -336,6 +337,7 @@
  * @plugin:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean 
 plugin_xsl_plugin_configure(CongPlugin *plugin)
Index: src/popup.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/popup.c,v
retrieving revision 1.79
diff -u -r1.79 popup.c
--- a/src/popup.c	11 Jun 2004 03:57:03 -0000	1.79
+++ b/src/popup.c	24 Jun 2004 17:45:40 -0000
@@ -105,6 +105,7 @@
  * @doc:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkMenuItem* 
 cong_menu_item_attach_callback_Document (GtkMenuItem *item,
@@ -135,6 +136,7 @@
  * @parent_window:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkMenuItem*
 cong_menu_item_attach_callback_Document_Node_ParentWindow (GtkMenuItem *item,
@@ -177,6 +179,7 @@
  * @node:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkMenuItem*
 cong_menu_item_attach_callback_Document_DispspecElement_Node (GtkMenuItem *item, 
@@ -228,6 +231,7 @@
  * @parent_window:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkMenuItem*
 cong_menu_item_attach_callback_legacy (GtkMenuItem *item,
@@ -264,6 +268,7 @@
  * @is_sensitive:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkMenuItem* 
 cong_menu_add_item (GtkMenu *menu,
@@ -1135,6 +1140,7 @@
  * @parent_window:
  *
  * TODO: Write me
+ * Returns:
  */
 GtkWidget* 
 cong_ui_popup_init(CongDocument *doc, 
Index: src/select.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/select.c,v
retrieving revision 1.33
diff -u -r1.33 select.c
--- a/src/select.c	18 Jun 2004 03:49:02 -0000	1.33
+++ b/src/select.c	24 Jun 2004 17:45:40 -0000
@@ -135,6 +135,7 @@
  * @selection:
  *
  * TODO: Write me
+ * Returns:
  */
 CongRange*
 cong_selection_get_logical_range (CongSelection *selection)
@@ -149,6 +150,7 @@
  * @selection:
  *
  * TODO: Write me
+ * Returns:
  */
 CongRange*
 cong_selection_get_ordered_range (CongSelection *selection)
@@ -166,6 +168,7 @@
  * @selection:
  *
  * TODO: Write me
+ * Returns:
  */
 CongLocation*
 cong_selection_get_logical_start (CongSelection *selection)
@@ -180,6 +183,7 @@
  * @selection:
  *
  * TODO: Write me
+ * Returns:
  */
 CongLocation*
 cong_selection_get_logical_end (CongSelection *selection)
@@ -194,6 +198,7 @@
  * @selection:
  *
  * TODO: Write me
+ * Returns:
  */
 CongLocation*
 cong_selection_get_ordered_start (CongSelection *selection)
@@ -211,6 +216,7 @@
  * @selection:
  *
  * TODO: Write me
+ * Returns:
  */
 CongLocation*
 cong_selection_get_ordered_end (CongSelection *selection)
@@ -335,6 +341,7 @@
  * @node:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean
 cong_selection_is_node (CongSelection *selection,
@@ -366,6 +373,7 @@
  * @selection:
  *
  * TODO: Write me
+ * Returns:
  */
 gboolean
 cong_selection_is_valid (CongSelection *selection)
@@ -386,6 +394,7 @@
  * @selection:
  *
  * TODO: Write me
+ * Returns:
  */
 GdkGC*
 cong_selection_legacy_get_gc_valid (CongSelection *selection)
@@ -398,6 +407,7 @@
  * @selection:
  *
  * TODO: Write me
+ * Returns:
  */
 GdkGC*
 cong_selection_legacy_get_gc_invalid (CongSelection *selection)
@@ -420,6 +430,7 @@
  * @doc:
  *
  * TODO: Write me
+ * Returns:
  */
 gchar* 
 cong_selection_get_selected_text (CongDocument *doc)
Index: src/xmldata.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/xmldata.c,v
retrieving revision 1.69
diff -u -r1.69 xmldata.c
--- a/src/xmldata.c	23 Jun 2004 17:37:29 -0000	1.69
+++ b/src/xmldata.c	24 Jun 2004 17:45:41 -0000
@@ -39,6 +39,7 @@
  * @x:
  *
  * TODO: Write me
+ * Returns:
  */
 const gchar *
 xml_frag_data_nice(CongNodePtr x)
@@ -117,6 +118,7 @@
  * @node:
  *
  * TODO: Write me
+ * Returns:
  */
 GList* 
 xml_all_present_span_elements(CongDispspec *ds, CongNodePtr node) 
@@ -188,6 +190,7 @@
  * @node:
  *
  * TODO: Write me
+ * Returns:
  */
 GList*
 xml_all_valid_span_elements(CongDispspec *ds, CongNodePtr node) 
@@ -920,6 +923,7 @@
  * @value:
  *
  * TODO: Write me
+ * Returns:
  */
 xmlAttrPtr
 xmlNewProp_NUMBER (xmlNodePtr node,
Index: src/xmlview.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/xmlview.c,v
retrieving revision 1.37
diff -u -r1.37 xmlview.c
--- a/src/xmlview.c	23 Jun 2004 17:37:29 -0000	1.37
+++ b/src/xmlview.c	24 Jun 2004 17:45:42 -0000
@@ -58,6 +58,7 @@
  * @col:
  *
  * TODO: Write me
+ * Returns:
  */
 gchar*
 get_col_string(const GdkColor* col)
