diff options
author | Ross Burton <ross@linux.intel.com> | 2010-05-17 12:19:57 +0100 |
---|---|---|
committer | Ross Burton <ross@linux.intel.com> | 2010-05-17 12:19:57 +0100 |
commit | ae8b14b0934b55308527d7e9e7b0b46ba7cce604 (patch) | |
tree | 7f7697cb5a3ce350a62f32054fa7ccbaa5fcc9a2 | |
parent | b1cf5794b4dfb459498413c94a882a11f2add208 (diff) | |
download | librest-ae8b14b0934b55308527d7e9e7b0b46ba7cce604.tar.gz |
docs: remove rest-extras from rest docs, they don't work
-rw-r--r-- | docs/reference/rest/Makefile.am | 8 | ||||
-rw-r--r-- | docs/reference/rest/rest-docs.sgml | 10 | ||||
-rw-r--r-- | docs/reference/rest/rest-sections.txt | 43 | ||||
-rw-r--r-- | docs/reference/rest/rest.types | 2 |
4 files changed, 12 insertions, 51 deletions
diff --git a/docs/reference/rest/Makefile.am b/docs/reference/rest/Makefile.am index 3cbfc00..c718fdc 100644 --- a/docs/reference/rest/Makefile.am +++ b/docs/reference/rest/Makefile.am @@ -46,12 +46,12 @@ FIXXREF_OPTIONS= # Used for dependencies. The docs will be rebuilt if any of these change. # e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h # e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c -HFILE_GLOB=$(top_srcdir)/rest/*.h $(top_srcdir)/rest-extras/*.h -CFILE_GLOB=$(top_srcdir)/rest/*.c $(top_srcdir)/rest-extras/*.c +HFILE_GLOB=$(top_srcdir)/rest/*.h +CFILE_GLOB=$(top_srcdir)/rest/*.c # Header files to ignore when scanning. # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h -IGNORE_HFILES=rest-private.h +IGNORE_HFILES=rest-private.h sha1.h # Images to copy into HTML directory. # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png @@ -72,7 +72,7 @@ expand_content_files= # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GLIB_CFLAGS) $(SOUP_CFLAGS) $(XML_CFLAGS) -GTKDOC_LIBS=$(top_builddir)/rest/librest-@API_VERSION@.la $(top_builddir)/rest-extras/librest-extras-@API_VERSION@.la +GTKDOC_LIBS=$(top_builddir)/rest/librest-@API_VERSION@.la # This includes the standard gtk-doc make rules, copied by gtkdocize. include $(top_srcdir)/gtk-doc.make diff --git a/docs/reference/rest/rest-docs.sgml b/docs/reference/rest/rest-docs.sgml index a7d2cd0..9e59663 100644 --- a/docs/reference/rest/rest-docs.sgml +++ b/docs/reference/rest/rest-docs.sgml @@ -3,17 +3,19 @@ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"> <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude"> <bookinfo> - <title>Rest Reference Manual</title> + <title>librest Reference Manual</title> </bookinfo> <chapter> - <title>Rest API Reference</title> + <title>REST Proxies</title> <xi:include href="xml/rest-proxy.xml"/> <xi:include href="xml/rest-proxy-call.xml"/> <xi:include href="xml/oauth-proxy.xml"/> <xi:include href="xml/oauth-proxy-call.xml"/> - <xi:include href="xml/flickr-proxy.xml"/> - <xi:include href="xml/flickr-proxy-call.xml"/> + </chapter> + + <chapter> + <title>XML Parsing</title> <xi:include href="xml/rest-xml-parser.xml"/> </chapter> </book> diff --git a/docs/reference/rest/rest-sections.txt b/docs/reference/rest/rest-sections.txt index dbf986d..7038cce 100644 --- a/docs/reference/rest/rest-sections.txt +++ b/docs/reference/rest/rest-sections.txt @@ -1,19 +1,4 @@ <SECTION> -<FILE>flickr-proxy-call</FILE> -<TITLE>FlickrProxyCall</TITLE> -FlickrProxyCall -<SUBSECTION Standard> -FlickrProxyCallClass -FLICKR_PROXY_CALL -FLICKR_IS_PROXY_CALL -FLICKR_TYPE_PROXY_CALL -flickr_proxy_call_get_type -FLICKR_PROXY_CALL_CLASS -FLICKR_IS_PROXY_CALL_CLASS -FLICKR_PROXY_CALL_GET_CLASS -</SECTION> - -<SECTION> <FILE>rest-xml-parser</FILE> <TITLE>RestXmlParser</TITLE> RestXmlParser @@ -67,6 +52,7 @@ rest_proxy_call_get_payload rest_proxy_call_get_status_code rest_proxy_call_get_status_message <SUBSECTION Standard> +RestProxyCallPrivate REST_PROXY_CALL REST_IS_PROXY_CALL REST_TYPE_PROXY_CALL @@ -77,32 +63,6 @@ REST_PROXY_CALL_GET_CLASS </SECTION> <SECTION> -<FILE>flickr-proxy</FILE> -FlickrProxyPrivate -<TITLE>FlickrProxy</TITLE> -FlickrProxy -FLICKR_PROXY_ERROR -flickr_proxy_new -flickr_proxy_new_with_token -flickr_proxy_get_api_key -flickr_proxy_get_shared_secret -flickr_proxy_get_token -flickr_proxy_set_token -flickr_proxy_sign -flickr_proxy_build_login_url -flickr_proxy_is_successful -<SUBSECTION Standard> -FlickrProxyClass -FLICKR_PROXY -FLICKR_IS_PROXY -FLICKR_TYPE_PROXY -flickr_proxy_get_type -FLICKR_PROXY_CLASS -FLICKR_IS_PROXY_CLASS -FLICKR_PROXY_GET_CLASS -</SECTION> - -<SECTION> <FILE>rest-proxy</FILE> <TITLE>RestProxy</TITLE> RestProxy @@ -162,6 +122,7 @@ oauth_proxy_set_token oauth_proxy_get_token_secret oauth_proxy_set_token_secret <SUBSECTION Standard> +OAuthProxyPrivate OAuthProxyClass OAUTH_PROXY OAUTH_IS_PROXY diff --git a/docs/reference/rest/rest.types b/docs/reference/rest/rest.types index 28eae50..b710397 100644 --- a/docs/reference/rest/rest.types +++ b/docs/reference/rest/rest.types @@ -3,5 +3,3 @@ rest_proxy_get_type rest_proxy_call_get_type oauth_proxy_get_type oauth_proxy_call_get_type -flickr_proxy_get_type -flickr_proxy_call_get_type |