Make 3.0 parallel-installable to 2.x

[~andy/gtk] / docs / reference / gdk / tmpl / colors.sgml

diff --git a/docs/reference/gdk/tmpl/colors.sgml b/docs/reference/gdk/tmpl/colors.sgml
index 8743a8783e2d729f4db1fa27926105ebdb32b6cd..3d1a8749f1a085e72db56f077045df85e85d961b 100644 (file)
--- a/docs/reference/gdk/tmpl/colors.sgml
+++ b/docs/reference/gdk/tmpl/colors.sgml
@@ -2,7 +2,7 @@
 Colormaps and Colors
 
 <!-- ##### SECTION Short_Description ##### -->
-manipulation of colors and colormaps.
+Manipulation of colors and colormaps
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
@@ -23,7 +23,7 @@ with gdk_colormap_get_system()) is the default
 colormap of the system. If you are using GdkRGB,
 there is another colormap that is important - the
 colormap in which GdkRGB works, retrieved with
-gdk_rgb_get_cmap(). However, when using GdkRGB, 
+gdk_rgb_get_colormap(). However, when using GdkRGB, 
 it is not generally necessary to allocate colors
 directly.
 </para>
@@ -43,6 +43,12 @@ gdk_color_change() will probably become aliases.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkColor ##### -->
 <para>
 The #GdkColor structure is used to describe an 
@@ -62,7 +68,6 @@ allocated or unallocated color.
 The colormap structure contains the following public fields.
 </para>
 
-@parent_instance: 
 @size: For pseudo-color colormaps, the number of colors
   in the colormap.
 @colors: An array containing the current values in the
@@ -100,6 +105,7 @@ The colormap structure contains the following public fields.
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -107,6 +113,7 @@ The colormap structure contains the following public fields.
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -124,7 +131,7 @@ The colormap structure contains the following public fields.
 
 @colormap: 
 @colors: 
-@ncolors: 
+@n_colors: 
 @writeable: 
 @best_match: 
 @success: 
@@ -148,7 +155,7 @@ The colormap structure contains the following public fields.
 
 @colormap: 
 @colors: 
-@ncolors: 
+@n_colors: 
 
 
 <!-- ##### FUNCTION gdk_colormap_query_color ##### -->
@@ -287,3 +294,12 @@ The colormap structure contains the following public fields.
 @Returns: 
 
 
+<!-- ##### FUNCTION gdk_color_to_string ##### -->
+<para>
+
+</para>
+
+@color: 
+@Returns: 
+
+