[grilo/0.1.x] doc: Merge libraries documention into Grilo documentation



commit 7f35593920e9f7d92cadab1ba332e7a79f9e06ec
Author: Juan A. Suarez Romero <jasuarez igalia com>
Date:   Mon Sep 5 09:43:41 2011 +0000

    doc: Merge libraries documention into Grilo documentation
    
    So there is only one access point to the whole documentation.
    
    Partially fixes https://bugzilla.gnome.org/show_bug.cgi?id=657920
    
    Signed-off-by: Juan A. Suarez Romero <jasuarez igalia com>

 configure.ac                     |    1 -
 doc/Makefile.am                  |    2 +-
 doc/grilo/Makefile.am            |    2 +-
 doc/grilo/grilo-docs.sgml        |   17 ++++++
 doc/grilo/grilo-sections.txt     |   27 ++++++++++
 doc/libs/Makefile.am             |  105 --------------------------------------
 doc/libs/grilo-libs-docs.sgml    |   51 ------------------
 doc/libs/grilo-libs-sections.txt |   28 ----------
 8 files changed, 46 insertions(+), 187 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 64ba2f4..f4aeb8f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -275,7 +275,6 @@ AC_CONFIG_FILES([
   bindings/vala/grilo-net-uninstalled.namespace
   doc/Makefile
   doc/grilo/Makefile
-  doc/libs/Makefile
   examples/Makefile
 ])
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 5ff0020..6874180 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -5,4 +5,4 @@
 #
 # Copyright (C) 2010 Igalia S.L. All rights reserved.
 
-SUBDIRS = grilo libs
+SUBDIRS = grilo
diff --git a/doc/grilo/Makefile.am b/doc/grilo/Makefile.am
index 3e18d00..c3383f1 100644
--- a/doc/grilo/Makefile.am
+++ b/doc/grilo/Makefile.am
@@ -22,7 +22,7 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
 # gtk-doc will search all .c & .h files beneath here for inline comments
 # documenting the functions and macros.
 # e.g. DOC_SOURCE_DIR=../../../gtk
-DOC_SOURCE_DIR=$(top_srcdir)/src
+DOC_SOURCE_DIR=$(top_srcdir)/src $(top_srcdir)/libs
 
 # Extra options to pass to gtkdoc-scangobj. Not normally needed.
 SCANGOBJ_OPTIONS=
diff --git a/doc/grilo/grilo-docs.sgml b/doc/grilo/grilo-docs.sgml
index a749862..2bfa946 100644
--- a/doc/grilo/grilo-docs.sgml
+++ b/doc/grilo/grilo-docs.sgml
@@ -111,6 +111,23 @@
     </chapter>
   </reference>
 
+    <reference>
+      <title>Grilo Libraries</title>
+
+      <para>
+        To ease the creation of plugins, a library system was created. The most common
+        functions for a plugin can be found in a library.
+      </para>
+      <para>
+        Grilo provides some standard libraries you can use to create plugins.
+      </para>
+
+      <chapter id="grilo-net">
+        <title>Grilo Net Classes</title>
+        <xi:include href="xml/grl-net-wc.xml"/>
+      </chapter>
+    </reference>
+
   <index id="api-index-full">
     <title>API Index</title>
     <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
diff --git a/doc/grilo/grilo-sections.txt b/doc/grilo/grilo-sections.txt
index 80b5ee0..a54c989 100644
--- a/doc/grilo/grilo-sections.txt
+++ b/doc/grilo/grilo-sections.txt
@@ -638,3 +638,30 @@ GRL_CORE_ERROR
 GrlCoreError
 </SECTION>
 
+<SECTION>
+<FILE>grl-net-wc</FILE>
+<TITLE>GrlNetWc</TITLE>
+GrlNetWcError
+GRL_NET_WC_ERROR
+GrlNetWc
+GrlNetWcClass
+grl_net_wc_error_quark
+grl_net_wc_new
+grl_net_wc_request_async
+grl_net_wc_request_finish
+grl_net_wc_set_log_level
+grl_net_wc_set_throttling
+grl_net_wc_set_cache
+grl_net_wc_set_cache_size
+grl_net_wc_flush_delayed_requests
+<SUBSECTION Standard>
+GRL_NET_WC
+GRL_IS_NET_WC
+GRL_TYPE_NET_WC
+grl_net_wc_get_type
+GRL_NET_WC_CLASS
+GRL_IS_NET_WC_CLASS
+GRL_NET_WC_GET_CLASS
+<SUBSECTION Private>
+GrlNetWcPrivate
+</SECTION>



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]