Fix references in garcon-docs.xml and garcon-sections.xmlparser-rewrite

2 files changed, 183 insertions, 183 deletions

diff --git a/docs/reference/garcon-docs.xml b/docs/reference/garcon-docs.xml
index 2f6e51c..721518a 100644
--- a/docs/reference/garcon-docs.xml
+++ b/docs/reference/garcon-docs.xml
@@ -58,33 +58,33 @@
 
   <part id="garcon-menus">
     <title>Menus and Menu Items</title>
-    <xi:include href="xml/garconmenu.xml"/>
-    <xi:include href="xml/garconmenudirectory.xml"/>
-    <xi:include href="xml/garconmenuelement.xml"/>
-    <xi:include href="xml/garconmenuitem.xml"/>
-    <xi:include href="xml/garconmenuitemcache.xml"/>
-    <xi:include href="xml/garconmenuitempool.xml"/>
-    <xi:include href="xml/garconmenuseparator.xml"/>
+    <xi:include href="xml/garcon-menu.xml"/>
+    <xi:include href="xml/garcon-menu-directory.xml"/>
+    <xi:include href="xml/garcon-menu-element.xml"/>
+    <xi:include href="xml/garcon-menu-item.xml"/>
+    <xi:include href="xml/garcon-menu-item-cache.xml"/>
+    <xi:include href="xml/garcon-menu-item-pool.xml"/>
+    <xi:include href="xml/garcon-menu-separator.xml"/>
   </part>
 
   <part id="garcon-parsing">
     <title>Parsing and Modifying the Menu Tree</title>
-    <xi:include href="xml/garconmnumerger.xml"/>
-    <xi:include href="xml/garconmnunode.xml"/>
-    <xi:include href="xml/garconmnuparser.xml"/>
-    <xi:include href="xml/garconmnutreeprovider.xml"/>
+    <xi:include href="xml/garcon-menu-merger.xml"/>
+    <xi:include href="xml/garcon-menu-node.xml"/>
+    <xi:include href="xml/garcon-menu-parser.xml"/>
+    <xi:include href="xml/garcon-menu-tree-provider.xml"/>
   </part>
 
   <part id="garcon-monitoring">
     <title>Monitoring</title>
-    <xi:include href="xml/garconmenumonitor.xml"/>
+    <xi:include href="xml/garcon-menu-monitor.xml"/>
   </part>
 
   <part id="garcon-miscellaneous">
     <title>Miscellaneous</title>
-    <xi:include href="xml/garconenvironment.xml"/>
+    <xi:include href="xml/garcon-environment.xml"/>
     <xi:include href="xml/garcon.xml"/>
-    <xi:include href="xml/garcongio.xml"/>
+    <xi:include href="xml/garcon-gio.xml"/>
     <xi:include href="xml/garcon-config.xml"/>
   </part>
 
diff --git a/docs/reference/garcon-sections.txt b/docs/reference/garcon-sections.txt
index 7456eb0..c91d5e7 100644
--- a/docs/reference/garcon-sections.txt
+++ b/docs/reference/garcon-sections.txt
@@ -1,115 +1,5 @@
 <SECTION>
-<FILE>garconmenudirectory</FILE>
-GarconMenuDirectoryPrivate
-GarconMenuDirectoryClass
-GarconMenuDirectory
-garcon_menu_directory_get_file
-garcon_menu_directory_get_name
-garcon_menu_directory_set_name
-garcon_menu_directory_get_comment
-garcon_menu_directory_set_comment
-garcon_menu_directory_get_icon
-garcon_menu_directory_set_icon
-garcon_menu_directory_get_no_display
-garcon_menu_directory_set_no_display
-garcon_menu_directory_get_hidden
-garcon_menu_directory_get_show_in_environment
-garcon_menu_directory_get_visible
-garcon_menu_directory_equal
-<SUBSECTION Standard>
-GARCON_MENU_DIRECTORY
-GARCON_IS_MENU_DIRECTORY
-GARCON_TYPE_MENU_DIRECTORY
-garcon_menu_directory_get_type
-GARCON_MENU_DIRECTORY_CLASS
-GARCON_IS_MENU_DIRECTORY_CLASS
-GARCON_MENU_DIRECTORY_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>garconmenuitempool</FILE>
-GarconMenuItemPoolPrivate
-GarconMenuItemPoolClass
-GarconMenuItemPool
-garcon_menu_item_pool_new
-garcon_menu_item_pool_insert
-garcon_menu_item_pool_lookup
-garcon_menu_item_pool_foreach
-garcon_menu_item_pool_apply_exclude_rule
-garcon_menu_item_pool_get_empty
-<SUBSECTION Standard>
-GARCON_MENU_ITEM_POOL
-GARCON_IS_MENU_ITEM_POOL
-GARCON_TYPE_MENU_ITEM_POOL
-garcon_menu_item_pool_get_type
-GARCON_MENU_ITEM_POOL_CLASS
-GARCON_IS_MENU_ITEM_POOL_CLASS
-GARCON_MENU_ITEM_POOL_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>garconmenuparser</FILE>
-GarconMenuParserPrivate
-garcon_menu_parser_new
-garcon_menu_parser_run
-<TITLE>GarconMenuParser</TITLE>
-GarconMenuParser
-<SUBSECTION Standard>
-GARCON_MENU_PARSER
-GARCON_IS_MENU_PARSER
-GARCON_TYPE_MENU_PARSER
-garcon_menu_parser_get_type
-GARCON_MENU_PARSER_CLASS
-GARCON_IS_MENU_PARSER_CLASS
-GARCON_MENU_PARSER_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>garconmenunode</FILE>
-GarconMenuNodeType
-GarconMenuLayoutMergeType
-GarconMenuMergeFileType
-GarconMenuNodeClass
-GarconMenuNode
-garcon_menu_node_new
-garcon_menu_node_get_node_type
-garcon_menu_node_create
-garcon_menu_node_copy
-garcon_menu_node_get_string
-garcon_menu_node_set_string
-garcon_menu_node_get_merge_file_type
-garcon_menu_node_set_merge_file_type
-garcon_menu_node_get_merge_file_filename
-garcon_menu_node_set_merge_file_filename
-garcon_menu_node_tree_get_child_node
-garcon_menu_node_tree_get_child_nodes
-garcon_menu_node_tree_get_string_children
-garcon_menu_node_tree_get_boolean_child
-garcon_menu_node_tree_get_string_child
-garcon_menu_node_tree_rule_matches
-garcon_menu_node_tree_get_node_type
-garcon_menu_node_tree_get_string
-garcon_menu_node_tree_set_string
-garcon_menu_node_tree_get_layout_merge_type
-garcon_menu_node_tree_get_merge_file_type
-garcon_menu_node_tree_get_merge_file_filename
-garcon_menu_node_tree_set_merge_file_filename
-garcon_menu_node_tree_compare
-garcon_menu_node_tree_copy
-garcon_menu_node_tree_free
-garcon_menu_node_tree_free_data
-<SUBSECTION Standard>
-GARCON_MENU_NODE
-GARCON_IS_MENU_NODE
-GARCON_TYPE_MENU_NODE
-garcon_menu_node_get_type
-GARCON_MENU_NODE_CLASS
-GARCON_IS_MENU_NODE_CLASS
-GARCON_MENU_NODE_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>garconmenu</FILE>
+<FILE>garcon-menu</FILE>
 GarconMenuPrivate
 garcon_menu_new
 garcon_menu_new_for_file
@@ -134,7 +24,25 @@ GARCON_MENU_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>garconmenuitem</FILE>
+<FILE>garcon-menu-element</FILE>
+GarconMenuElement
+GarconMenuElementIface
+garcon_menu_element_get_name
+garcon_menu_element_get_comment
+garcon_menu_element_get_icon_name
+garcon_menu_element_get_visible
+garcon_menu_element_get_show_in_environment
+garcon_menu_element_get_no_display
+<SUBSECTION Standard>
+GARCON_MENU_ELEMENT
+GARCON_IS_MENU_ELEMENT
+GARCON_TYPE_MENU_ELEMENT
+garcon_menu_element_get_type
+GARCON_MENU_ELEMENT_GET_IFACE
+</SECTION>
+
+<SECTION>
+<FILE>garcon-menu-item</FILE>
 GarconMenuItemPrivate
 GarconMenuItemClass
 GarconMenuItem
@@ -184,25 +92,71 @@ GARCON_MENU_ITEM_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>garconmenuelement</FILE>
-GarconMenuElement
-GarconMenuElementIface
-garcon_menu_element_get_name
-garcon_menu_element_get_comment
-garcon_menu_element_get_icon_name
-garcon_menu_element_get_visible
-garcon_menu_element_get_show_in_environment
-garcon_menu_element_get_no_display
+<FILE>garcon-menu-directory</FILE>
+GarconMenuDirectoryPrivate
+GarconMenuDirectoryClass
+GarconMenuDirectory
+garcon_menu_directory_get_file
+garcon_menu_directory_get_name
+garcon_menu_directory_set_name
+garcon_menu_directory_get_comment
+garcon_menu_directory_set_comment
+garcon_menu_directory_get_icon
+garcon_menu_directory_set_icon
+garcon_menu_directory_get_no_display
+garcon_menu_directory_set_no_display
+garcon_menu_directory_get_hidden
+garcon_menu_directory_get_show_in_environment
+garcon_menu_directory_get_visible
+garcon_menu_directory_equal
 <SUBSECTION Standard>
-GARCON_MENU_ELEMENT
-GARCON_IS_MENU_ELEMENT
-GARCON_TYPE_MENU_ELEMENT
-garcon_menu_element_get_type
-GARCON_MENU_ELEMENT_GET_IFACE
+GARCON_MENU_DIRECTORY
+GARCON_IS_MENU_DIRECTORY
+GARCON_TYPE_MENU_DIRECTORY
+garcon_menu_directory_get_type
+GARCON_MENU_DIRECTORY_CLASS
+GARCON_IS_MENU_DIRECTORY_CLASS
+GARCON_MENU_DIRECTORY_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>garconmenutreeprovider</FILE>
+<FILE>garcon-menu-item-cache</FILE>
+GarconMenuItemCachePrivate
+GarconMenuItemCacheClass
+GarconMenuItemCache
+garcon_menu_item_cache_get_default
+garcon_menu_item_cache_lookup
+garcon_menu_item_cache_foreach
+garcon_menu_item_cache_invalidate
+<SUBSECTION Standard>
+GARCON_MENU_ITEM_CACHE
+GARCON_IS_MENU_ITEM_CACHE
+GARCON_TYPE_MENU_ITEM_CACHE
+garcon_menu_item_cache_get_type
+GARCON_MENU_ITEM_CACHE_CLASS
+GARCON_IS_MENU_ITEM_CACHE_CLASS
+GARCON_MENU_ITEM_CACHE_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>garcon-menu-parser</FILE>
+GarconMenuParserPrivate
+garcon_menu_parser_new
+garcon_menu_parser_run
+<TITLE>GarconMenuParser</TITLE>
+GarconMenuParser
+<SUBSECTION Standard>
+GARCON_MENU_PARSER
+GARCON_IS_MENU_PARSER
+GARCON_TYPE_MENU_PARSER
+garcon_menu_parser_get_type
+GARCON_MENU_PARSER_CLASS
+GARCON_IS_MENU_PARSER_CLASS
+GARCON_MENU_PARSER_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>garcon-menu-tree-provider</FILE>
 GarconMenuTreeProviderIface
 GarconMenuTreeProvider
 garcon_menu_tree_provider_get_tree
@@ -216,7 +170,51 @@ GARCON_MENU_TREE_PROVIDER_GET_IFACE
 </SECTION>
 
 <SECTION>
-<FILE>garconmenuseparator</FILE>
+<FILE>garcon-menu-node</FILE>
+GarconMenuNodeType
+GarconMenuLayoutMergeType
+GarconMenuMergeFileType
+GarconMenuNodeClass
+GarconMenuNode
+garcon_menu_node_new
+garcon_menu_node_get_node_type
+garcon_menu_node_create
+garcon_menu_node_copy
+garcon_menu_node_get_string
+garcon_menu_node_set_string
+garcon_menu_node_get_merge_file_type
+garcon_menu_node_set_merge_file_type
+garcon_menu_node_get_merge_file_filename
+garcon_menu_node_set_merge_file_filename
+garcon_menu_node_tree_get_child_node
+garcon_menu_node_tree_get_child_nodes
+garcon_menu_node_tree_get_string_children
+garcon_menu_node_tree_get_boolean_child
+garcon_menu_node_tree_get_string_child
+garcon_menu_node_tree_rule_matches
+garcon_menu_node_tree_get_node_type
+garcon_menu_node_tree_get_string
+garcon_menu_node_tree_set_string
+garcon_menu_node_tree_get_layout_merge_type
+garcon_menu_node_tree_get_merge_file_type
+garcon_menu_node_tree_get_merge_file_filename
+garcon_menu_node_tree_set_merge_file_filename
+garcon_menu_node_tree_compare
+garcon_menu_node_tree_copy
+garcon_menu_node_tree_free
+garcon_menu_node_tree_free_data
+<SUBSECTION Standard>
+GARCON_MENU_NODE
+GARCON_IS_MENU_NODE
+GARCON_TYPE_MENU_NODE
+garcon_menu_node_get_type
+GARCON_MENU_NODE_CLASS
+GARCON_IS_MENU_NODE_CLASS
+GARCON_MENU_NODE_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>garcon-menu-separator</FILE>
 GarconMenuSeparatorClass
 GarconMenuSeparator
 garcon_menu_separator_get_default
@@ -231,26 +229,28 @@ GARCON_MENU_SEPARATOR_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>garconmenuitemcache</FILE>
-GarconMenuItemCachePrivate
-GarconMenuItemCacheClass
-GarconMenuItemCache
-garcon_menu_item_cache_get_default
-garcon_menu_item_cache_lookup
-garcon_menu_item_cache_foreach
-garcon_menu_item_cache_invalidate
+<FILE>garcon-menu-item-pool</FILE>
+GarconMenuItemPoolPrivate
+GarconMenuItemPoolClass
+GarconMenuItemPool
+garcon_menu_item_pool_new
+garcon_menu_item_pool_insert
+garcon_menu_item_pool_lookup
+garcon_menu_item_pool_foreach
+garcon_menu_item_pool_apply_exclude_rule
+garcon_menu_item_pool_get_empty
 <SUBSECTION Standard>
-GARCON_MENU_ITEM_CACHE
-GARCON_IS_MENU_ITEM_CACHE
-GARCON_TYPE_MENU_ITEM_CACHE
-garcon_menu_item_cache_get_type
-GARCON_MENU_ITEM_CACHE_CLASS
-GARCON_IS_MENU_ITEM_CACHE_CLASS
-GARCON_MENU_ITEM_CACHE_GET_CLASS
+GARCON_MENU_ITEM_POOL
+GARCON_IS_MENU_ITEM_POOL
+GARCON_TYPE_MENU_ITEM_POOL
+garcon_menu_item_pool_get_type
+GARCON_MENU_ITEM_POOL_CLASS
+GARCON_IS_MENU_ITEM_POOL_CLASS
+GARCON_MENU_ITEM_POOL_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>garconmenumerger</FILE>
+<FILE>garcon-menu-merger</FILE>
 GarconMenuMergerPrivate
 garcon_menu_merger_new
 garcon_menu_merger_run
@@ -267,40 +267,20 @@ GARCON_MENU_MERGER_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>garcon-config</FILE>
-GARCON_MAJOR_VERSION
-GARCON_MINOR_VERSION
-GARCON_MICRO_VERSION
-GARCON_CHECK_VERSION
-garcon_major_version
-garcon_minor_version
-garcon_micro_version
-garcon_check_version
-</SECTION>
-
-<SECTION>
-<FILE>garconenvironment</FILE>
-garcon_set_environment
-garcon_get_environment
-</SECTION>
-
-<SECTION>
-<FILE>garcongio</FILE>
+<FILE>garcon-gio</FILE>
 g_file_new_for_unknown_input
 g_file_new_relative_to_file
 g_file_get_uri_relative_to_file
 </SECTION>
 
 <SECTION>
-<FILE>garcon</FILE>
-GARCON_INSIDE_GARCON_H
-garcon_init
-garcon_shutdown
-garcon_config_lookup
+<FILE>garcon-environment</FILE>
+garcon_set_environment
+garcon_get_environment
 </SECTION>
 
 <SECTION>
-<FILE>garconmenumonitor</FILE>
+<FILE>garcon-menu-monitor</FILE>
 GarconMenuMonitorFlags
 GarconMenuMonitorVTable
 garcon_menu_monitor_set_vtable
@@ -315,3 +295,23 @@ garcon_menu_monitor_get_flags
 garcon_menu_monitor_has_flags
 </SECTION>
 
+<SECTION>
+<FILE>garcon-config</FILE>
+GARCON_MAJOR_VERSION
+GARCON_MINOR_VERSION
+GARCON_MICRO_VERSION
+GARCON_CHECK_VERSION
+garcon_major_version
+garcon_minor_version
+garcon_micro_version
+garcon_check_version
+</SECTION>
+
+<SECTION>
+<FILE>garcon</FILE>
+GARCON_INSIDE_GARCON_H
+garcon_init
+garcon_shutdown
+garcon_config_lookup
+</SECTION>
+