From 459e1e7fc9d2a608ee7e404b0f9f98eea648fea4 Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon, 20 Jun 2011 19:45:14 +0100
Subject: [PATCH] docs: Fix the GLX section

The whole thing should just go away.
---
 clutter/cogl/clutter-glx-texture-pixmap.c  |  4 +++-
 clutter/cogl/clutter-glx.h                 | 10 ----------
 doc/reference/clutter/clutter-docs.xml.in  |  1 -
 doc/reference/clutter/clutter-sections.txt |  5 -----
 4 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/clutter/cogl/clutter-glx-texture-pixmap.c b/clutter/cogl/clutter-glx-texture-pixmap.c
index 33fb894dc..c1bcdfe9e 100644
--- a/clutter/cogl/clutter-glx-texture-pixmap.c
+++ b/clutter/cogl/clutter-glx-texture-pixmap.c
@@ -29,7 +29,9 @@
 
 /**
  * SECTION:clutter-glx-texture-pixmap
- * @short_description: A texture which displays the content of an X Pixmap.
+ * @Title: ClutterGLXTexturePixmap
+ * @short_description: A texture which displays the content of an X Pixmap
+ * @Deprecated: 1.4: Use #ClutterX11TexturePixmap instead.
  *
  * #ClutterGLXTexturePixmap is a class for displaying the content of an
  * X Pixmap as a ClutterActor. Used together with the X Composite extension,
diff --git a/clutter/cogl/clutter-glx.h b/clutter/cogl/clutter-glx.h
index 60223998b..04b001e99 100644
--- a/clutter/cogl/clutter-glx.h
+++ b/clutter/cogl/clutter-glx.h
@@ -23,16 +23,6 @@
  *
  */
 
-/**
- * SECTION:clutter-glx
- * @short_description: GLX specific API
- *
- * The GLX backend for Clutter provides some specific API for GLX
- * related calls.
- *
- * The ClutterGLX API is available since Clutter 0.4
- */
-
 #ifndef __CLUTTER_GLX_H__
 #define __CLUTTER_GLX_H__
 
diff --git a/doc/reference/clutter/clutter-docs.xml.in b/doc/reference/clutter/clutter-docs.xml.in
index e24d3da0c..7a2c7b5cc 100644
--- a/doc/reference/clutter/clutter-docs.xml.in
+++ b/doc/reference/clutter/clutter-docs.xml.in
@@ -220,7 +220,6 @@
     <xi:include href="xml/clutter-backend.xml"/>
     <xi:include href="xml/clutter-x11.xml"/>
     <xi:include href="xml/clutter-x11-texture-pixmap.xml"/>
-    <xi:include href="xml/clutter-glx.xml"/>
     <xi:include href="xml/clutter-glx-texture-pixmap.xml"/>
     <xi:include href="xml/clutter-win32.xml"/>
     <xi:include href="xml/clutter-egl.xml"/>
diff --git a/doc/reference/clutter/clutter-sections.txt b/doc/reference/clutter/clutter-sections.txt
index 37f720f47..98a34dcfa 100644
--- a/doc/reference/clutter/clutter-sections.txt
+++ b/doc/reference/clutter/clutter-sections.txt
@@ -1921,11 +1921,6 @@ ClutterBindingPoolClass
 clutter_binding_pool_get_type
 </SECTION>
 
-<SECTION>
-<TITLE>GLX Specific Support</TITLE>
-<FILE>clutter-glx</FILE>
-</SECTION>
-
 <SECTION>
 <TITLE>EGL Specific Support</TITLE>
 <FILE>clutter-egl</FILE>