simplified documentation of color0-9 variables

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1120 7f574dfc-610e-0410-a909-a81674777703

diff --git a/ChangeLog b/ChangeLog
index 567fc5b..8e3536b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 # $Id$
 
+2008-05-30
+       * Simplified docs for color0-9 config settings and variables.
+
 2008-04-29
        * own_window_type dock patch (thanks Morgan).
        * Fix for $if_up memleak (thanks Micha¿).

diff --git a/doc/config_settings.xml b/doc/config_settings.xml
index 1292fb0..a5dc6ff 100644 (file)
--- a/doc/config_settings.xml
+++ b/doc/config_settings.xml
@@ -28,72 +28,9 @@
        </varlistentry>
 
        <varlistentry>
-               <term><command><option>color0</option></command></term>
+               <term><command><option>colorN</option></command></term>
                <listitem>
-                       A color variable for use inside TEXT segments
-                       <para></para></listitem>
-       </varlistentry>
-
-       <varlistentry>
-               <term><command><option>color1</option></command></term>
-               <listitem>
-                       A color variable for use inside TEXT segments
-                       <para></para></listitem>
-       </varlistentry>
-
-       <varlistentry>
-               <term><command><option>color2</option></command></term>
-               <listitem>
-                       A color variable for use inside TEXT segments
-                       <para></para></listitem>
-       </varlistentry>
-
-       <varlistentry>
-               <term><command><option>color3</option></command></term>
-               <listitem>
-                       A color variable for use inside TEXT segments
-                       <para></para></listitem>
-       </varlistentry>
-
-       <varlistentry>
-               <term><command><option>color4</option></command></term>
-               <listitem>
-                       A color variable for use inside TEXT segments
-                       <para></para></listitem>
-       </varlistentry>
-
-       <varlistentry>
-               <term><command><option>color5</option></command></term>
-               <listitem>
-                       A color variable for use inside TEXT segments
-                       <para></para></listitem>
-       </varlistentry>
-
-       <varlistentry>
-               <term><command><option>color6</option></command></term>
-               <listitem>
-                       A color variable for use inside TEXT segments
-                       <para></para></listitem>
-       </varlistentry>
-
-       <varlistentry>
-               <term><command><option>color7</option></command></term>
-               <listitem>
-                       A color variable for use inside TEXT segments
-                       <para></para></listitem>
-       </varlistentry>
-
-       <varlistentry>
-               <term><command><option>color8</option></command></term>
-               <listitem>
-                       A color variable for use inside TEXT segments
-                       <para></para></listitem>
-       </varlistentry>
-
-       <varlistentry>
-               <term><command><option>color9</option></command></term>
-               <listitem>
-                       A color variable for use inside TEXT segments
+                       Predefine a color for use inside TEXT segments. Substitute N by a digit between 0 and 9, inclusively. When specifying the color value in hex, omit the leading hash (#).
                        <para></para></listitem>
        </varlistentry>
 

diff --git a/doc/variables.xml b/doc/variables.xml
index 29da227..1db364e 100644 (file)
--- a/doc/variables.xml
+++ b/doc/variables.xml
@@ -364,92 +364,9 @@
        </varlistentry>
 
        <varlistentry>
-               <term>
-                       <command><option>color0</option></command>
-               </term>
-               <listitem>
-                       Change drawing color to color0 configuration option
-                       <para></para></listitem>
-       </varlistentry>
-
-       <varlistentry>
-               <term>
-                       <command><option>color1</option></command>
-               </term>
-               <listitem>
-                       Change drawing color to color1 configuration option
-                       <para></para></listitem>
-       </varlistentry>
-
-       <varlistentry>
-               <term>
-                       <command><option>color2</option></command>
-               </term>
-               <listitem>
-                       Change drawing color to color2 configuration option
-                       <para></para></listitem>
-       </varlistentry>
-
-       <varlistentry>
-               <term>
-                       <command><option>color3</option></command>
-               </term>
-               <listitem>
-                       Change drawing color to color3 configuration option
-                       <para></para></listitem>
-       </varlistentry>
-
-       <varlistentry>
-               <term>
-                       <command><option>color4</option></command>
-               </term>
-               <listitem>
-                       Change drawing color to color4 configuration option
-                       <para></para></listitem>
-       </varlistentry>
-
-       <varlistentry>
-               <term>
-                       <command><option>color5</option></command>
-               </term>
-               <listitem>
-                       Change drawing color to color5 configuration option
-                       <para></para></listitem>
-       </varlistentry>
-
-       <varlistentry>
-               <term>
-                       <command><option>color6</option></command>
-               </term>
-               <listitem>
-                       Change drawing color to color6 configuration option
-                       <para></para></listitem>
-       </varlistentry>
-
-       <varlistentry>
-               <term>
-                       <command><option>color7</option></command>
-               </term>
-               <listitem>
-                       Change drawing color to color7 configuration option
-                       <para></para></listitem>
-       </varlistentry>
-
-       <varlistentry>
-               <term>
-                       <command><option>color8</option></command>
-               </term>
-               <listitem>
-                       Change drawing color to color8 configuration option
-                       <para></para></listitem>
-       </varlistentry>
-
-       <varlistentry>
-               <term>
-                       <command><option>color9</option></command>
-               </term>
+               <term><command><option>colorN</option></command></term>
                <listitem>
-                       Change drawing color to color9 configuration option
+                       Change drawing color to colorN configuration option, where N is a digit between 0 and 9, inclusively.
                        <para></para></listitem>
        </varlistentry>