documentation

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

diff --git a/README b/README
index 25ac943..292f0ca 100644 (file)
--- a/README
+++ b/README
@@ -168,14 +168,14 @@ CONFIGURATION SETTINGS
              Default color and border color
 
 
-       default_shade_color
-             Default shading color and border's shading color
-
-
        default_outline_color
              Default outline color
 
 
+       default_shade_color
+             Default shading color and border's shading color
+
+
        double_buffer
              Use the Xdbe extension? (eliminates flicker) It is highly recom-
              mended to use own window with this one so double buffer won't be
@@ -190,14 +190,14 @@ CONFIGURATION SETTINGS
              Draw borders around graphs?
 
 
-       draw_shades
-             Draw shades?
-
-
        draw_outline
              Draw outlines?
 
 
+       draw_shades
+             Draw shades?
+
+
        font   Font name in X, xfontsel can be used to get a nice font
 
 
@@ -216,17 +216,13 @@ CONFIGURATION SETTINGS
              ter the password when Conky starts.
 
 
-       no_buffers
-             Substract (file system) buffers from used memory?
-
-
        mail_spool
              Mail spool for mail checking
 
 
        max_user_text bytes
              Maximum size of user text buffer, i.e. layout below TEXT line in
-             config file
+             config file (default is 16384 bytes)
 
 
        maximum_width pixels
@@ -263,6 +259,10 @@ CONFIGURATION SETTINGS
              The number of samples to average for net data
 
 
+       no_buffers
+             Substract (file system) buffers from used memory?
+
+
        override_utf8_locale
              Force UTF8? requires XFT
 

diff --git a/doc/config_settings.xml b/doc/config_settings.xml
index 46cee74..d0ffd4a 100644 (file)
--- a/doc/config_settings.xml
+++ b/doc/config_settings.xml
@@ -42,16 +42,16 @@
 </varlistentry>
 
 <varlistentry>
-       <term><command><option>default_shade_color</option></command></term>
+       <term><command><option>default_outline_color</option></command></term>
        <listitem>
-               Default shading color and border's shading color
+               Default outline color
        <para></para></listitem>
 </varlistentry>
 
 <varlistentry>
-       <term><command><option>default_outline_color</option></command></term>
+       <term><command><option>default_shade_color</option></command></term>
        <listitem>
-               Default outline color
+               Default shading color and border's shading color
        <para></para></listitem>
 </varlistentry>
 
@@ -77,16 +77,16 @@
 </varlistentry>
 
 <varlistentry>
-       <term><command><option>draw_shades</option></command></term>
+       <term><command><option>draw_outline</option></command></term>
        <listitem>
-               Draw shades?
+               Draw outlines?
        <para></para></listitem>
 </varlistentry>
 
 <varlistentry>
-       <term><command><option>draw_outline</option></command></term>
+       <term><command><option>draw_shades</option></command></term>
        <listitem>
-               Draw outlines?
+               Draw shades?
        <para></para></listitem>
 </varlistentry>
 
@@ -119,13 +119,6 @@
 </varlistentry>
 
 <varlistentry>
-       <term><command><option>no_buffers</option></command></term>
-       <listitem>
-               Substract (file system) buffers from used memory?
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
        <term><command><option>mail_spool</option></command></term>
        <listitem>
                Mail spool for mail checking
@@ -138,6 +131,7 @@
        </term>
        <listitem>
                Maximum size of user text buffer, i.e. layout below TEXT line in config file
+               (default is 16384 bytes)
                <para></para></listitem>
 </varlistentry>
 
@@ -202,6 +196,13 @@
 </varlistentry>
 
 <varlistentry>
+       <term><command><option>no_buffers</option></command></term>
+       <listitem>
+               Substract (file system) buffers from used memory?
+       <para></para></listitem>
+</varlistentry>
+
+<varlistentry>
        <term><command><option>override_utf8_locale</option></command></term>
        <listitem>
                Force UTF8? requires XFT

diff --git a/doc/conky.1 b/doc/conky.1
index ee86eb6..e633021 100644 (file)
--- a/doc/conky.1
+++ b/doc/conky.1
@@ -160,14 +160,14 @@ The number of samples to average for CPU monitoring
 Default color and border color
 
 .TP 
-\fB\*(T<\fBdefault_shade_color\fR\*(T>\fR
-Default shading color and border's shading color
-
-.TP 
 \fB\*(T<\fBdefault_outline_color\fR\*(T>\fR
 Default outline color
 
 .TP 
+\fB\*(T<\fBdefault_shade_color\fR\*(T>\fR
+Default shading color and border's shading color
+
+.TP 
 \fB\*(T<\fBdouble_buffer\fR\*(T>\fR
 Use the Xdbe extension? (eliminates flicker) It is highly recommended to use own window with this one so double buffer won't be so big.
 
@@ -180,14 +180,14 @@ Draw borders around text?
 Draw borders around graphs?
 
 .TP 
-\fB\*(T<\fBdraw_shades\fR\*(T>\fR
-Draw shades?
-
-.TP 
 \fB\*(T<\fBdraw_outline\fR\*(T>\fR
 Draw outlines?
 
 .TP 
+\fB\*(T<\fBdraw_shades\fR\*(T>\fR
+Draw shades?
+
+.TP 
 \fB\*(T<\fBfont\fR\*(T>\fR
 Font name in X, xfontsel can be used to get a nice font
 
@@ -204,16 +204,13 @@ Gap between top or bottom border of screen, same as passing -y at command line
 Default global IMAP server. Arguments are: "host user pass [-i interval] [-f folder] [-p port] [-e command]". Default port is 143, default folder is 'INBOX', default interval is 5 minutes. If the password is supplied as '*', you will be prompted to enter the password when Conky starts.
 
 .TP 
-\fB\*(T<\fBno_buffers\fR\*(T>\fR
-Substract (file system) buffers from used memory?
-
-.TP 
 \fB\*(T<\fBmail_spool\fR\*(T>\fR
 Mail spool for mail checking
 
 .TP 
 \fB\*(T<\fBmax_user_text\fR\*(T>\fR \*(T<\fBbytes\fR\*(T> 
 Maximum size of user text buffer, i.e. layout below TEXT line in config file
+(default is 16384 bytes)
 
 .TP 
 \fB\*(T<\fBmaximum_width\fR\*(T>\fR \*(T<\fBpixels\fR\*(T> 
@@ -248,6 +245,10 @@ MPD server password
 The number of samples to average for net data
 
 .TP 
+\fB\*(T<\fBno_buffers\fR\*(T>\fR
+Substract (file system) buffers from used memory?
+
+.TP 
 \fB\*(T<\fBoverride_utf8_locale\fR\*(T>\fR
 Force UTF8? requires XFT