From ea662b9ecaf1dd956f0cdc79ce04880270bf99de Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri, 15 Jan 2010 17:06:56 +0000
Subject: [PATCH] docs: Display the features section

The features section of the API reference is built but not used, and it
has some copy-and-paste errors.
---
 clutter/clutter-feature.c                  | 11 +++++++++--
 clutter/clutter-feature.h                  |  8 --------
 doc/reference/clutter/clutter-docs.xml.in  |  1 +
 doc/reference/clutter/clutter-sections.txt |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/clutter/clutter-feature.c b/clutter/clutter-feature.c
index 745a4a8d1..b181c52cb 100644
--- a/clutter/clutter-feature.c
+++ b/clutter/clutter-feature.c
@@ -25,9 +25,16 @@
 
 /**
  * SECTION:clutter-feature
- * @short_description: Query GL features at runtime
+ * @short_description: Run-time detection of Clutter features
  *
- * Functions to query available GL features ay runtime
+ * Parts of Clutter depend on the underlying platform, including the
+ * capabilities of the backend used and the OpenGL features exposed through the
+ * Clutter and COGL API.
+ *
+ * It is possible to ask whether Clutter has support for specific features at
+ * run-time.
+ *
+ * See also cogl_get_features() and #CoglFeatureFlags
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/clutter/clutter-feature.h b/clutter/clutter-feature.h
index 864606634..cd65edf18 100644
--- a/clutter/clutter-feature.h
+++ b/clutter/clutter-feature.h
@@ -25,14 +25,6 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-/**
- * SECTION:clutter-main
- * @short_description: Various 'global' clutter functions.
- *
- * Functions to retrieve various global Clutter resources and other utility
- * functions for mainloops, events and threads
- */
-
 #ifndef __CLUTTER_FEATURE_H__
 #define __CLUTTER_FEATURE_H__
 
diff --git a/doc/reference/clutter/clutter-docs.xml.in b/doc/reference/clutter/clutter-docs.xml.in
index d00ec1d5c..921e7cb62 100644
--- a/doc/reference/clutter/clutter-docs.xml.in
+++ b/doc/reference/clutter/clutter-docs.xml.in
@@ -141,6 +141,7 @@
       <xi:include href="xml/clutter-stage-manager.xml"/>
       <xi:include href="xml/clutter-units.xml"/>
       <xi:include href="xml/clutter-util.xml"/>
+      <xi:include href="xml/clutter-feature.xml"/>
       <xi:include href="xml/clutter-version.xml"/>
     </chapter>
 
diff --git a/doc/reference/clutter/clutter-sections.txt b/doc/reference/clutter/clutter-sections.txt
index a1a7b7581..132770d63 100644
--- a/doc/reference/clutter/clutter-sections.txt
+++ b/doc/reference/clutter/clutter-sections.txt
@@ -874,7 +874,7 @@ clutter_param_fixed_get_type
 
 <SECTION>
 <FILE>clutter-feature</FILE>
-<TITLE>GL Features</TITLE>
+<TITLE>Features</TITLE>
 ClutterFeatureFlags
 clutter_feature_available
 clutter_feature_get_all