doc cleanup

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

diff --git a/COPYING b/COPYING
index 46b9d71..c1b3aac 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -5,5 +5,5 @@ All code written since the fork of torsmo is licensed under the GPL (see
 LICENSE.GPL for a copy), except where noted differently (such as in portmon code, timed thread code, and audacious code which are LGPL, and prss which is an MIT-style license).
 
 Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
-Copyright (c) 2005-2007 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS)
+Copyright (c) 2005-2008 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS)
 All rights reserved.

diff --git a/README b/README
index 418aaa3..3fd2980 100644 (file)
--- a/README
+++ b/README
@@ -10,12 +10,12 @@ SYNOPSIS
        conky [options]
 
 DESCRIPTION
-       Conky is a system monitor for X originally based on  the         torsmo  code.
-       Since  it's original conception, Conky has changed a fair bit from it's
-       predecessor.  Conky can display just about  anything,  either  on  your
-       root  desktop  or in it's own window.  Conky has many built-in objects,
-       as well as the ability to execute programs and  scripts,         then  display
-       the output from stdout.
+       Conky is a system monitor for X originally based on torsmo.  Since it's
+       conception,  Conky  has changed  significantly  from it's predecessor.
+       Conky can display just about anything, either on your root  desktop  or
+       in  it's         own  window.  Conky has many built-in objects, as well as the
+       ability to execute programs and scripts, then display the  output  from
+       stdout.
 
        We are always looking for help, and anyone interested in becoming a de-
        veloper is welcome.  Please use the facilities at SourceForge  to  make
@@ -24,28 +24,33 @@ DESCRIPTION
        Thanks for your interest in Conky.
 
 COMPILING
-       For  users  compiling from source, make sure you have the X development
-       libraries installed.  This should be  a package  along  the  lines  of
-       "libx11-dev or xorg-x11-dev".
+       For  users compiling from source on a binary distro, make sure you have
+       the X development libraries installed. This should be a package  along
+       the  lines  of "libx11-dev" or "xorg-x11-dev" for X11 libs, and similar
+       "-dev" format for the other libs required (depending on your  configure
+       options).
+
+       Conky  has  (for         some time) been available in the repositories of most
+       popular distributions.  Here are some installation instructions for  a
+       few:
 
        Gentoo users -- Conky is in Gentoo's Portage... simply use "emerge app-
        admin/conky" for installation.  There is         also  usually  an  up-to-date
-       ebuild within Conky's package or in Svn.
+       ebuild within Conky's package or in SVN.
 
-       Debian,etc.  users  --  Conky will be in Debian's repositories soon (by
-       mid-September, hopefully), and then Ubuntu  shortly  thereafter.         Until
-       then, "dpkg -i" the .deb package to install.
+       Debian, etc. users -- Conky should be in your repositories, and can be
+       installed by doing "aptitude install conky".
 
-       Example to  compile  and  run Conky with all optional components (note
+       Example to compile and run Conky with  all  optional  components         (note
        that some configure options may differ for your system):
 
        sh autogen.sh # Only required if building from SVN
 
-       ./configure     --prefix=/usr      --mandir=/usr/share/man       --in-
-       fodir=/usr/share/info  --datadir=/usr/share  --sysconfdir=/etc --local-
+       ./configure      --prefix=/usr      --mandir=/usr/share/man      --in-
+       fodir=/usr/share/info --datadir=/usr/share  --sysconfdir=/etc  --local-
        statedir=/var/lib --disable-own-window --enable-audacious[=yes|no|lega-
        cy] --enable-bmpx --disable-hddtemp --disable-mpd --enable-xmms2 --dis-
-       able-portmon  --disable-network --enable-debug  --disable-x11   --dis-
+       able-portmon   --disable-network         --enable-debug  --disable-x11  --dis-
        able-double-buffer --disable-xdamage --disable-xft
 
        make
@@ -54,34 +59,19 @@ COMPILING
 
        src/conky
 
-       Conky probably doesn't compile with compilers other than gcc  and  icc.
-       It  doesn't  compile  with C89 compiler and not even with pure C99.  It
-       uses a few things that might not exist: strdup(),  strcasecmp(),         strn-
-       casecmp(),  optarg  variable  with getopt() and long long (not in C89).
-       Crashes in file system statistics stuff when compiled with icc, I don't
-       know exactly why.
-
-       You  can disable 'drawing to own window' feature in case you don't need
-       it by passing --disable-own-window to configure -script.
+       Conky  has  been tested to be compatible with C99 C, however it has not
+       been tested with anything other than gcc, and is not guaranteed to work
+       with other compilers.
 
 
 YOU SHOULD KNOW
-       Conky is generally very good on resources. However, certain objects  in
-       Conky  are  harder  on resources then others. In particular, the $tail,
-       $top, $font, and $graph objects are quite costly in comparison  to  the
-       rest of Conky.
-
-       If  you do use them, please do not complain about memory or CPU usage,
-       unless you think something's seriously wrong (mem leak, etc.).
+       Conky  is generally very good on resources. That said, the more you try
+       to make Conky do, the more resources it is going to consume.
 
        An easy way to force Conky to reload your ~/.conkyrc: "killall -SIGUSR1
        conky".  Saves you the trouble of having to kill and then restart. You
        can now also do the same with SIGHUP.
 
-       IMPORTANT: For previous Conky users, Conky 1.3 no longer         supports  the
-       metar  stuff.   mdsplib was  causing  way too many problems. Hopefully
-       there'll be a better solution in Conky 2.x...
-
 OPTIONS
        Command line options override configurations defined  in         configuration
        file.
@@ -139,13 +129,12 @@ OPTIONS
 
 
 CONFIGURATION SETTINGS
-       Default configuration  file  is  $HOME/.conkyrc  (can  be changed from
-       conky.c among other things). See conkyrc.sample. If installing from De-
-       bian  package, this should be in /usr/share/doc/conky/examples ("gunzip
-       conkyrc.sample.gz" to get conkyrc.sample).
+       Default   configuration    file    location   is   $HOME/.conkyrc   or
+       ${sysconfdir}/conky/conky.conf. On most systems,         sysconfdir  is  /etc,
+       and  you can find the sample config file there (/etc/conky/conky.conf).
 
        You might want to copy it to $HOME/.conkyrc and then  start  modifying
-       it.  Other configs can be found at http://conky.sf.net
+       it.  Other configs can be found at http://conky.sf.net/
 
        alignment
              Aligned position on screen, may be top_left, top_right, top_mid-
@@ -426,10 +415,8 @@ CONFIGURATION SETTINGS
 
 VARIABLES
        Colors  are  parsed using XParsecolor(), there might be a list of them:
-       /usr/X11R6/lib/X11/rgb.txt. Also,  <http://sedition.com/perl/rgb.html>.
-       Color  can  be also in #rrggbb format (hex).  Note that when displaying
-       bytes, power is 1024 and not 1000 so 1M really  means  1024*1024         bytes
-       and not 1000*1000.
+       /usr/share/X11/rgb.txt.  Also,    <http://sedition.com/perl/rgb.html>.
+       Color can be also in #rrggbb format (hex).
 
        addr interface
              IP address for an interface
@@ -1540,17 +1527,27 @@ BUGS
        show_desktop in /apps/nautilus/preferences/.  There  is -w  switch  in
        Conky  to  set  some  specific window id. You might find xwininfo -tree
        useful to find the window to draw to. You  can  also  use  -o  argument
-       which makes Conky to create its own window.
+       which makes Conky to create its own window. If you do try running Conky
+       in its own window, be sure to read up on the  own_window_type  settings
+       and experiment.
 
 SEE ALSO
-       <http://conky.sourceforge.net>
+       <http://conky.sourceforge.net/>
 
        <http://www.sourceforge.net/projects/conky>
 
        #conky on irc.freenode.net
 
+COPYING
+       Copyright  (c)  2005-2008 Brenden Matthews, Philip Kovacs, et. al.  Any
+       original torsmo code is licensed under the BSD license (see LICENSE.BSD
+       for a copy).  All code written since the fork of torsmo is licensed un-
+       der the GPL (see LICENSE.GPL for a copy), except where noted different-
+       ly  (such  as  in  portmon  code, timed thread code, and audacious code
+       which are LGPL, and prss which is an MIT-style license).
+
 AUTHORS
-       The Conky dev team. What's up now!
+       The Conky dev team (see AUTHORS for a full list of contributors).
 
 
 

diff --git a/doc/config_settings.xml b/doc/config_settings.xml
index 6a01f9e..638a345 100644 (file)
--- a/doc/config_settings.xml
+++ b/doc/config_settings.xml
@@ -1,458 +1,458 @@
 <variablelist>
-<varlistentry>
-       <term><command><option>alignment</option></command></term>
-       <listitem>
-               Aligned position on screen, may be top_left, top_right, top_middle, bottom_left, bottom_right, bottom_middle, middle_left, middle_right, or none (also can be abreviated as tl, tr, tm, bl, br, bm, ml, mr)
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term><command><option>background</option></command></term>
-       <listitem>
-               Boolean value, if true, Conky will be forked to background when started
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term><command><option>border_margin</option></command></term>
-       <listitem>
-               Border margin in pixels
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term><command><option>border_width</option></command></term>
-       <listitem>
-               Border width in pixels
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term><command><option>color0</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
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term><command><option>cpu_avg_samples</option></command></term>
-       <listitem>
-               The number of samples to average for CPU monitoring
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term><command><option>top_cpu_separate</option></command></term>
-       <listitem>
-               If true, cpu in top will show usage of one processor's power.  If false, cpu in top will show the usage of all processors' power combined.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term><command><option>default_color</option></command></term>
-       <listitem>
-               Default color and border color
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term><command><option>default_outline_color</option></command></term>
-       <listitem>
-               Default outline color
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term><command><option>default_shade_color</option></command></term>
-       <listitem>
-               Default shading color and border's shading color
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term><command><option>double_buffer</option></command></term>
-       <listitem>
-               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.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term><command><option>draw_borders</option></command></term>
-       <listitem>
-               Draw borders around text?
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term><command><option>draw_graph_borders</option></command></term>
-       <listitem>
-               Draw borders around graphs?
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term><command><option>draw_outline</option></command></term>
-       <listitem>
-               Draw outlines?
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term><command><option>draw_shades</option></command></term>
-       <listitem>
-               Draw shades?
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term><command><option>font</option></command></term>
-       <listitem>
-               Font name in X, xfontsel can be used to get a nice font
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term><command><option>gap_x</option></command></term>
-       <listitem>
-               Gap, in pixels, between right or left border of screen, same as passing -x at command line,
-               e.g. gap_x 10
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term><command><option>gap_y</option></command></term>
-       <listitem>
-               Gap, in pixels, between top or bottom border of screen, same as passing -y at command line,
-               e.g. gap_y 10.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term><command><option>imap</option></command></term>
-       <listitem>
-               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.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term><command><option>mail_spool</option></command></term>
-       <listitem>
-               Mail spool for mail checking
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-        <term><command><option>max_port_monitor_connections</option></command></term>
-        <listitem>
-                Allow each port monitor to track at most this many connections (if 0 or not set, default is 256)
-        <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term><command><option>max_specials</option></command></term>
-       <listitem>
-               Maximum number of special things, e.g. fonts, offsets, aligns, etc. (default is 512)
-               <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term><command><option>max_user_text</option></command>
-               <option>bytes</option>
-       </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>
-
-<varlistentry>
-       <term><command><option>text_buffer_size</option></command>
-               <option>bytes</option>
-       </term>
-       <listitem>
-               Size of the standard text buffer (default is 128 bytes).  This buffer is used for intermediary text, such as individual lines, output from $exec vars, and various other variables.  Increasing the size of this buffer can drastically reduce Conky's performance, but will allow for more text display per variable.  The size of this buffer cannot be smaller than the default value of 128 bytes.
-               <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term><command><option>maximum_width</option></command>
-               <option>pixels</option>
-       </term>
-       <listitem>
-               Maximum width of window
-               <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term><command><option>minimum_size</option></command>
-       <option>width (height)</option>
-       </term>
-       <listitem>
-               Minimum size of window
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term><command><option>mpd_host</option></command></term>
-       <listitem>
-               Host of MPD server
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term><command><option>mpd_port</option></command></term>
-       <listitem>
-               Port of MPD server
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term><command><option>mpd_password</option></command></term>
-       <listitem>
-               MPD server password
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term><command><option>music_player_interval</option></command></term>
-       <listitem>
-               Music player thread update interval (defaults to Conky's update interval)
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term><command><option>net_avg_samples</option></command></term>
-       <listitem>
-               The number of samples to average for net data
-       <para></para></listitem>
-</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
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term><command><option>own_window</option></command></term>
-       <listitem>
-               Boolean, create own window to draw?
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-        <term><command><option>own_window_class</option></command></term>
-        <listitem>
-                Manually set the WM_CLASS name.  Defaults to "Conky".
-        <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term><command><option>own_window_colour</option></command>
-               <option>colour</option>
-       </term>
-       <listitem>
-               If own_window_transparent no, set a specified background colour (defaults to black).  Takes either a hex value (#ffffff) or a valid RGB name (see /usr/lib/X11/rgb.txt)
-               <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-        <term><command><option>own_window_hints</option></command>
-                <option>undecorated,below,above,sticky,skip_taskbar,skip_pager</option>
-       </term>
-       <listitem>
-               If own_window is yes, you may use these window manager hints to affect the way Conky displays.
-               Notes: Use own_window_type desktop as another way to implement many of these hints implicitly.
-               If you use own_window_type override, window manager hints have no meaning and are ignored.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-        <term><command><option>own_window_title</option></command></term>
-        <listitem>
-                Manually set the window name.  Defaults to "&lt;hostname&gt; - conky".
-        <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term><command><option>own_window_transparent</option></command></term>
-       <listitem>
-               Boolean, set pseudo-transparency?
-               <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term><command><option>own_window_type</option></command></term>
-       <listitem>
-               if own_window is yes, you may specify type normal, desktop or override (default: normal).
-               Desktop windows are special windows that have no window decorations; are always visible
-               on your desktop; do not appear in your pager or taskbar; and are sticky across all workspaces.
-               Override windows are not under the control of the window manager.  Hints are ignored. This type
-               of window can be useful for certain situations.
-               <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term><command><option>out_to_console</option></command>
-       </term>
-       <listitem>
-               Print text to stdout.
-               <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term><command><option>pad_percents</option></command></term>
-       <listitem>
-               Pad percentages to this many decimals (0 = no padding)
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term><command><option>pop3</option></command></term>
-       <listitem>
-               Default global POP3 server.  Arguments are: "host user pass [-i interval] [-p port] [-e command]".  Default port is 110, default interval is 5 minutes.  If the password is supplied as '*', you will be prompted to enter the password when Conky starts.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term><command><option>short_units</option></command></term>
-       <listitem>
-               Shortens units to a single character (kiB->k, GiB->G, etc.).  Default is off.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term><command><option>stippled_borders</option></command></term>
-       <listitem>
-               Border stippling (dashing) in pixels
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term><command><option>total_run_times</option></command></term>
-       <listitem>
-               Total number of times for Conky to update before quitting. Zero makes Conky run forever
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term><command><option>update_interval</option></command></term>
-       <listitem>
-               Update interval in seconds
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term><command><option>uppercase</option></command></term>
-       <listitem>
-               Boolean value, if true, text is rendered in upper case
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term><command><option>use_spacer</option></command></term>
-       <listitem>
-               Adds spaces around certain objects to stop them from moving other things around. Arguments are left, right, and none (default).  The old true/false values are deprecated and default to right/none respectively. Note that this only helps if you are using a mono font, such as Bitstream Vera Sans Mono.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term><command><option>use_xft</option></command></term>
-       <listitem>
-               Use Xft (anti-aliased font and stuff)
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term><command><option>xftalpha</option></command></term>
-       <listitem>
-               Alpha of Xft font.  Must be a value at or between 1 and 0.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term><command><option>xftfont</option></command></term>
-       <listitem>
-               Xft font to use.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term><command><option>TEXT</option></command></term>
-       <listitem>
-               After this begins text to be formatted on screen
-       <para></para></listitem>
-</varlistentry>
+       <varlistentry>
+               <term><command><option>alignment</option></command></term>
+               <listitem>
+                       Aligned position on screen, may be top_left, top_right, top_middle, bottom_left, bottom_right, bottom_middle, middle_left, middle_right, or none (also can be abreviated as tl, tr, tm, bl, br, bm, ml, mr)
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term><command><option>background</option></command></term>
+               <listitem>
+                       Boolean value, if true, Conky will be forked to background when started
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term><command><option>border_margin</option></command></term>
+               <listitem>
+                       Border margin in pixels
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term><command><option>border_width</option></command></term>
+               <listitem>
+                       Border width in pixels
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term><command><option>color0</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
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term><command><option>cpu_avg_samples</option></command></term>
+               <listitem>
+                       The number of samples to average for CPU monitoring
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term><command><option>top_cpu_separate</option></command></term>
+               <listitem>
+                       If true, cpu in top will show usage of one processor's power.  If false, cpu in top will show the usage of all processors' power combined.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term><command><option>default_color</option></command></term>
+               <listitem>
+                       Default color and border color
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term><command><option>default_outline_color</option></command></term>
+               <listitem>
+                       Default outline color
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term><command><option>default_shade_color</option></command></term>
+               <listitem>
+                       Default shading color and border's shading color
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term><command><option>double_buffer</option></command></term>
+               <listitem>
+                       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.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term><command><option>draw_borders</option></command></term>
+               <listitem>
+                       Draw borders around text?
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term><command><option>draw_graph_borders</option></command></term>
+               <listitem>
+                       Draw borders around graphs?
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term><command><option>draw_outline</option></command></term>
+               <listitem>
+                       Draw outlines?
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term><command><option>draw_shades</option></command></term>
+               <listitem>
+                       Draw shades?
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term><command><option>font</option></command></term>
+               <listitem>
+                       Font name in X, xfontsel can be used to get a nice font
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term><command><option>gap_x</option></command></term>
+               <listitem>
+                       Gap, in pixels, between right or left border of screen, same as passing -x at command line,
+                       e.g. gap_x 10
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term><command><option>gap_y</option></command></term>
+               <listitem>
+                       Gap, in pixels, between top or bottom border of screen, same as passing -y at command line,
+                       e.g. gap_y 10.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term><command><option>imap</option></command></term>
+               <listitem>
+                       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.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term><command><option>mail_spool</option></command></term>
+               <listitem>
+                       Mail spool for mail checking
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term><command><option>max_port_monitor_connections</option></command></term>
+               <listitem>
+                       Allow each port monitor to track at most this many connections (if 0 or not set, default is 256)
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term><command><option>max_specials</option></command></term>
+               <listitem>
+                       Maximum number of special things, e.g. fonts, offsets, aligns, etc. (default is 512)
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term><command><option>max_user_text</option></command>
+                       <option>bytes</option>
+               </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>
+
+       <varlistentry>
+               <term><command><option>text_buffer_size</option></command>
+                       <option>bytes</option>
+               </term>
+               <listitem>
+                       Size of the standard text buffer (default is 128 bytes).  This buffer is used for intermediary text, such as individual lines, output from $exec vars, and various other variables.  Increasing the size of this buffer can drastically reduce Conky's performance, but will allow for more text display per variable.  The size of this buffer cannot be smaller than the default value of 128 bytes.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term><command><option>maximum_width</option></command>
+                       <option>pixels</option>
+               </term>
+               <listitem>
+                       Maximum width of window
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term><command><option>minimum_size</option></command>
+                       <option>width (height)</option>
+               </term>
+               <listitem>
+                       Minimum size of window
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term><command><option>mpd_host</option></command></term>
+               <listitem>
+                       Host of MPD server
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term><command><option>mpd_port</option></command></term>
+               <listitem>
+                       Port of MPD server
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term><command><option>mpd_password</option></command></term>
+               <listitem>
+                       MPD server password
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term><command><option>music_player_interval</option></command></term>
+               <listitem>
+                       Music player thread update interval (defaults to Conky's update interval)
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term><command><option>net_avg_samples</option></command></term>
+               <listitem>
+                       The number of samples to average for net data
+                       <para></para></listitem>
+       </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
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term><command><option>own_window</option></command></term>
+               <listitem>
+                       Boolean, create own window to draw?
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term><command><option>own_window_class</option></command></term>
+               <listitem>
+                       Manually set the WM_CLASS name.  Defaults to "Conky".
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term><command><option>own_window_colour</option></command>
+                       <option>colour</option>
+               </term>
+               <listitem>
+                       If own_window_transparent no, set a specified background colour (defaults to black).  Takes either a hex value (#ffffff) or a valid RGB name (see /usr/lib/X11/rgb.txt)
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term><command><option>own_window_hints</option></command>
+                       <option>undecorated,below,above,sticky,skip_taskbar,skip_pager</option>
+               </term>
+               <listitem>
+                       If own_window is yes, you may use these window manager hints to affect the way Conky displays.
+                       Notes: Use own_window_type desktop as another way to implement many of these hints implicitly.
+                       If you use own_window_type override, window manager hints have no meaning and are ignored.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term><command><option>own_window_title</option></command></term>
+               <listitem>
+                       Manually set the window name.  Defaults to "&lt;hostname&gt; - conky".
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term><command><option>own_window_transparent</option></command></term>
+               <listitem>
+                       Boolean, set pseudo-transparency?
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term><command><option>own_window_type</option></command></term>
+               <listitem>
+                       if own_window is yes, you may specify type normal, desktop or override (default: normal).
+                       Desktop windows are special windows that have no window decorations; are always visible
+                       on your desktop; do not appear in your pager or taskbar; and are sticky across all workspaces.
+                       Override windows are not under the control of the window manager.  Hints are ignored. This type
+                       of window can be useful for certain situations.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term><command><option>out_to_console</option></command>
+               </term>
+               <listitem>
+                       Print text to stdout.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term><command><option>pad_percents</option></command></term>
+               <listitem>
+                       Pad percentages to this many decimals (0 = no padding)
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term><command><option>pop3</option></command></term>
+               <listitem>
+                       Default global POP3 server.  Arguments are: "host user pass [-i interval] [-p port] [-e command]".  Default port is 110, default interval is 5 minutes.  If the password is supplied as '*', you will be prompted to enter the password when Conky starts.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term><command><option>short_units</option></command></term>
+               <listitem>
+                       Shortens units to a single character (kiB->k, GiB->G, etc.).  Default is off.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term><command><option>stippled_borders</option></command></term>
+               <listitem>
+                       Border stippling (dashing) in pixels
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term><command><option>total_run_times</option></command></term>
+               <listitem>
+                       Total number of times for Conky to update before quitting. Zero makes Conky run forever
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term><command><option>update_interval</option></command></term>
+               <listitem>
+                       Update interval in seconds
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term><command><option>uppercase</option></command></term>
+               <listitem>
+                       Boolean value, if true, text is rendered in upper case
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term><command><option>use_spacer</option></command></term>
+               <listitem>
+                       Adds spaces around certain objects to stop them from moving other things around. Arguments are left, right, and none (default).  The old true/false values are deprecated and default to right/none respectively. Note that this only helps if you are using a mono font, such as Bitstream Vera Sans Mono.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term><command><option>use_xft</option></command></term>
+               <listitem>
+                       Use Xft (anti-aliased font and stuff)
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term><command><option>xftalpha</option></command></term>
+               <listitem>
+                       Alpha of Xft font.  Must be a value at or between 1 and 0.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term><command><option>xftfont</option></command></term>
+               <listitem>
+                       Xft font to use.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term><command><option>TEXT</option></command></term>
+               <listitem>
+                       After this begins text to be formatted on screen
+                       <para></para></listitem>
+       </varlistentry>
 
 </variablelist>

diff --git a/doc/conky.1 b/doc/conky.1
index 94bddd7..37cafe8 100644 (file)
--- a/doc/conky.1
+++ b/doc/conky.1
@@ -20,8 +20,8 @@ conky \- A system monitor for X originally based on the torsmo code, but more ki
 .ad b
 'hy
 .SH DESCRIPTION
-Conky is a system monitor for X originally based on the torsmo code.
-Since it's original conception, Conky has changed a fair bit from it's predecessor.
+Conky is a system monitor for X originally based on torsmo.
+Since it's conception, Conky has changed significantly from it's predecessor.
 Conky can display just about anything, either on your root desktop or in it's own window.
 Conky has many built-in objects, as well as the ability to execute programs and scripts,
 then display the output from stdout.
@@ -31,14 +31,19 @@ Please use the facilities at SourceForge to make bug reports, feature requests,
 .PP
 Thanks for your interest in Conky.
 .SH COMPILING
-For users compiling from source, make sure you have the X development libraries installed.
-This should be a package along the lines of "libx11-dev or xorg-x11-dev".
+For users compiling from source on a binary distro, make sure you have the X development
+libraries installed. This should be a package along the lines of "libx11-dev" or 
+"xorg-x11-dev" for X11 libs, and similar "-dev" format for the other libs required (depending
+on your configure options).
+.PP
+Conky has (for some time) been available in the repositories of most popular distributions. 
+Here are some installation instructions for a few:
 .PP
 Gentoo users -- Conky is in Gentoo's Portage... simply use "emerge app-admin/conky" for installation.
-There is also usually an up-to-date ebuild within Conky's package or in Svn.
+There is also usually an up-to-date ebuild within Conky's package or in SVN.
 .PP
-Debian,etc. users -- Conky will be in Debian's repositories soon (by mid-September, hopefully), and then
-Ubuntu shortly thereafter. Until then, "dpkg -i" the .deb package to install.
+Debian, etc. users -- Conky should be in your repositories, and can be installed by doing
+"aptitude install conky".
 .PP
 Example to compile and run Conky with all optional components (note that some configure options may differ for your system):
 .TP 
@@ -52,28 +57,15 @@ Example to compile and run Conky with all optional components (note that some co
 .TP 
 \fB\*(T<\fBsrc/conky\fR\*(T>\fR 
 .PP
-Conky probably doesn't compile with compilers other than gcc and icc.
-It doesn't compile with C89 compiler and not even with pure C99.
-It uses a few things that might not exist: strdup(), strcasecmp(), strncasecmp(),
-optarg variable with getopt() and long long (not in C89). Crashes in file system
-statistics stuff when compiled with icc, I don't know exactly why.
-.PP
-You can disable 'drawing to own window' feature in case you don't need it by passing
---disable-own-window to configure -script.
+Conky has been tested to be compatible with C99 C, however it has not been tested
+with anything other than gcc, and is not guaranteed to work with other compilers.
 .PP
 .SH "YOU SHOULD KNOW"
-Conky is generally very good on resources. However, certain objects in
-Conky are harder on resources then others. In particular, the $tail,
-$top, $font, and $graph objects are quite costly in comparison to the rest of Conky.
-.PP
-If you do use them, please do not complain about memory or CPU usage,
-unless you think something's seriously wrong (mem leak, etc.).
+Conky is generally very good on resources. That said, the more you try to make Conky
+do, the more resources it is going to consume.
 .PP
 An easy way to force Conky to reload your ~/.conkyrc: "killall -SIGUSR1 conky".
 Saves you the trouble of having to kill and then restart. You can now also do the same with SIGHUP.
-.PP
-IMPORTANT: For previous Conky users, Conky 1.3 no longer supports the metar stuff.
-mdsplib was causing way too many problems. Hopefully there'll be a better solution in Conky 2.x...
 .SH OPTIONS
 Command line options override configurations defined in configuration file.
 .TP 
@@ -129,12 +121,12 @@ X position
 Y position
 
 .SH "CONFIGURATION SETTINGS"
-Default configuration file is $HOME/.conkyrc (can be changed from
-conky.c among other things). See conkyrc.sample. If installing from Debian package,
-this should be in /usr/share/doc/conky/examples ("gunzip conkyrc.sample.gz" to get conkyrc.sample).
+Default configuration file location is $HOME/.conkyrc or 
+${sysconfdir}/conky/conky.conf. On most systems, sysconfdir is /etc,
+and you can find the sample config file there (/etc/conky/conky.conf).
 .PP
 You might want to copy it to $HOME/.conkyrc and then start modifying it.
-Other configs can be found at http://conky.sf.net
+Other configs can be found at http://conky.sf.net/
 .TP 
 \fB\*(T<\fBalignment\fR\*(T>\fR
 Aligned position on screen, may be top_left, top_right, top_middle, bottom_left, bottom_right, bottom_middle, middle_left, middle_right, or none (also can be abreviated as tl, tr, tm, bl, br, bm, ml, mr)
@@ -394,10 +386,8 @@ After this begins text to be formatted on screen
 
 .SH VARIABLES
 Colors are parsed using XParsecolor(), there might be a list of them:
-/usr/X11R6/lib/X11/rgb.txt. Also, \(lahttp://sedition.com/perl/rgb.html\(ra.
+/usr/share/X11/rgb.txt. Also, \(lahttp://sedition.com/perl/rgb.html\(ra.
 Color can be also in #rrggbb format (hex).
-Note that when displaying bytes, power is 1024 and not 1000 so 1M really
-means 1024*1024 bytes and not 1000*1000.
 .TP 
 \fB\*(T<\fBaddr\fR\*(T>\fR \*(T<\fBinterface\fR\*(T> 
 IP address for an interface
@@ -1383,12 +1373,17 @@ disabled from drawing to desktop with program gconf-editor. Uncheck
 show_desktop in /apps/nautilus/preferences/. There is -w switch in Conky
 to set some specific window id. You might find xwininfo -tree useful to
 find the window to draw to. You can also use -o argument which makes
-Conky to create its own window.
+Conky to create its own window. If you do try running Conky in its own
+window, be sure to read up on the own_window_type settings and experiment.
 .SH "SEE ALSO"
-\(lahttp://conky.sourceforge.net\(ra
+\(lahttp://conky.sourceforge.net/\(ra
 .PP
 \(lahttp://www.sourceforge.net/projects/conky\(ra
 .PP
 #conky on irc.freenode.net
+.SH COPYING
+Copyright (c) 2005-2008 Brenden Matthews, Philip Kovacs, et. al.
+Any original torsmo code is licensed under the BSD license (see LICENSE.BSD for a copy).
+All code written since the fork of torsmo is licensed under the GPL (see LICENSE.GPL for a copy), except where noted differently (such as in portmon code, timed thread code, and audacious code which are LGPL, and prss which is an MIT-style license).
 .SH AUTHORS
-The Conky dev team. What's up now!
+The Conky dev team (see AUTHORS for a full list of contributors).

diff --git a/doc/docs.xml b/doc/docs.xml
index e9299e9..1f18fb6 100644 (file)
--- a/doc/docs.xml
+++ b/doc/docs.xml
@@ -1,75 +1,81 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-               "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-               <!ENTITY testtable SYSTEM "test.xml">
-               <!ENTITY command_options SYSTEM "command_options.xml">
-               <!ENTITY config_settings SYSTEM "config_settings.xml">
-               <!ENTITY variables SYSTEM "variables.xml">
-               ]>
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY testtable SYSTEM "test.xml">
+<!ENTITY command_options SYSTEM "command_options.xml">
+<!ENTITY config_settings SYSTEM "config_settings.xml">
+<!ENTITY variables SYSTEM "variables.xml">
+]>
 
 <refentry>
-  <refentryinfo>
-    <address>
-      <email>brenden1@users.sourceforge.net</email>
-    </address>
-    <author>
-      <firstname>Brenden</firstname>
-      <surname>Matthews</surname>
-    </author>
-    <date>2007-08-08</date>
-  </refentryinfo>
-
-  <refmeta>
-    <refentrytitle>conky</refentrytitle>
-    <manvolnum>1</manvolnum>
-  </refmeta>
-
-  <refnamediv>
-    <refname>conky</refname>
-    <refpurpose>A system monitor for X originally based on the torsmo code, but more kickass.  It just keeps on given'er. Yeah.</refpurpose>
-  </refnamediv>
-
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>conky</command>
-      <arg><replaceable>options</replaceable></arg>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-
-  <refsect1>
-    <title>Description</title>
-    <para>
-    Conky is a system monitor for X originally based on the torsmo code.
-    Since it's original conception, Conky has changed a fair bit from it's predecessor.
-    Conky can display just about anything, either on your root desktop or in it's own window.
-    Conky has many built-in objects, as well as the ability to execute programs and scripts,
-    then display the output from stdout.
-               </para>
-               <para>
-               We are always looking for help, and anyone interested in becoming a developer is welcome.
-               Please use the facilities at SourceForge to make bug reports, feature requests, and submit patches.
-               </para>
-               <para>
-               Thanks for your interest in Conky.
-               </para>
-  </refsect1>
+       <refentryinfo>
+               <address>
+                       <email>brenden1@users.sourceforge.net</email>
+               </address>
+               <author>
+                       <firstname>Brenden</firstname>
+                       <surname>Matthews</surname>
+               </author>
+               <date>2007-08-08</date>
+       </refentryinfo>
+
+       <refmeta>
+               <refentrytitle>conky</refentrytitle>
+               <manvolnum>1</manvolnum>
+       </refmeta>
+
+       <refnamediv>
+               <refname>conky</refname>
+               <refpurpose>A system monitor for X originally based on the torsmo code, but more kickass.  It just keeps on given'er. Yeah.</refpurpose>
+       </refnamediv>
+
+       <refsynopsisdiv>
+               <cmdsynopsis>
+                       <command>conky</command>
+                       <arg><replaceable>options</replaceable></arg>
+               </cmdsynopsis>
+       </refsynopsisdiv>
+
+       <refsect1>
+               <title>Description</title>
+               <para>
+                       Conky is a system monitor for X originally based on torsmo.
+                       Since it's conception, Conky has changed significantly from it's predecessor.
+                       Conky can display just about anything, either on your root desktop or in it's own window.
+                       Conky has many built-in objects, as well as the ability to execute programs and scripts,
+                       then display the output from stdout.
+               </para>
+               <para>
+                       We are always looking for help, and anyone interested in becoming a developer is welcome.
+                       Please use the facilities at SourceForge to make bug reports, feature requests, and submit patches.
+               </para>
+               <para>
+                       Thanks for your interest in Conky.
+               </para>
+       </refsect1>
 
        <refsect1>
                <title>Compiling</title>
                <para>
-               For users compiling from source, make sure you have the X development libraries installed.
-               This should be a package along the lines of "libx11-dev or xorg-x11-dev".
+                       For users compiling from source on a binary distro, make sure you have the X development
+                       libraries installed.  This should be a package along the lines of "libx11-dev" or 
+                       "xorg-x11-dev" for X11 libs, and similar "-dev" format for the other libs required (depending
+                       on your configure options).
+               </para>
+               <para>
+                       Conky has (for some time) been available in the repositories of most popular distributions.  
+                       Here are some installation instructions for a few:
                </para>
                <para>
-               Gentoo users -- Conky is in Gentoo's Portage... simply use "emerge app-admin/conky" for installation.
-               There is also usually an up-to-date ebuild within Conky's package or in Svn.
+                       Gentoo users -- Conky is in Gentoo's Portage... simply use "emerge app-admin/conky" for installation.
+                       There is also usually an up-to-date ebuild within Conky's package or in SVN.
                </para>
                <para>
-               Debian,etc. users -- Conky will be in Debian's repositories soon (by mid-September, hopefully), and then
-               Ubuntu shortly thereafter. Until then, "dpkg -i" the .deb package to install.
+                       Debian, etc. users -- Conky should be in your repositories, and can be installed by doing
+                       "aptitude install conky".
                </para>
                <para>
-               Example to compile and run Conky with all optional components (note that some configure options may differ for your system):
+                       Example to compile and run Conky with all optional components (note that some configure options may differ for your system):
                </para>
                <variablelist>
                        <varlistentry>
@@ -99,15 +105,8 @@
                        </varlistentry>
                </variablelist>
                <para>
-                       Conky probably doesn't compile with compilers other than gcc and icc.
-                       It doesn't compile with C89 compiler and not even with pure C99.
-                       It uses a few   things that might not exist: strdup(), strcasecmp(), strncasecmp(),
-                       optarg variable with getopt() and long long (not in C89). Crashes in file system
-                       statistics stuff when compiled with icc, I don't know exactly why.
-               </para>
-               <para>
-                       You can disable 'drawing to own window' feature in case you don't need it       by passing
-                       --disable-own-window to configure -script.
+                       Conky has been tested to be compatible with C99 C, however it has not been tested
+                       with anything other than gcc, and is not guaranteed to work with other compilers.
                </para>
                <para>
 
@@ -116,47 +115,38 @@
 
 
 
-  <refsect1>
-    <title>You Should Know</title>
-    <para>
-               Conky is generally very good on resources.  However, certain objects in
-               Conky are harder on resources then others.  In particular, the $tail,
-               $top, $font, and $graph objects are quite costly in comparison to the rest of Conky.
-               </para>
-               <para>
-               If you do use them, please do not complain about memory or CPU usage,
-               unless you think something's seriously wrong (mem leak, etc.).
-               </para>
+       <refsect1>
+               <title>You Should Know</title>
                <para>
-               An easy way to force Conky to reload your ~/.conkyrc: "killall -SIGUSR1 conky".
-               Saves you the trouble of having to kill and then restart.  You can now also do the same with SIGHUP.
+                       Conky is generally very good on resources.  That said, the more you try to make Conky
+                       do, the more resources it is going to consume.
                </para>
                <para>
-               IMPORTANT: For previous Conky users, Conky 1.3 no longer supports the metar stuff.
-               mdsplib was causing way too many problems. Hopefully there'll be a better solution in Conky 2.x...
+                       An easy way to force Conky to reload your ~/.conkyrc: "killall -SIGUSR1 conky".
+                       Saves you the trouble of having to kill and then restart.  You can now also do the same with SIGHUP.
                </para>
-  </refsect1>
+       </refsect1>
 
-  <refsect1>
-    <title>Options</title>
+       <refsect1>
+               <title>Options</title>
 
-    <para>Command line options override configurations defined in configuration file.</para>
+               <para>Command line options override configurations defined in configuration file.</para>
 
                &command_options;
 
-  </refsect1>
+       </refsect1>
 
        <refsect1>
                <title>Configuration Settings</title>
 
                <para>
-               Default configuration file is $HOME/.conkyrc (can be changed from
-               conky.c among other things). See conkyrc.sample. If installing from Debian package,
-               this should be in /usr/share/doc/conky/examples ("gunzip conkyrc.sample.gz" to get conkyrc.sample).
+                       Default configuration file location is $HOME/.conkyrc or 
+                       ${sysconfdir}/conky/conky.conf.  On most systems, sysconfdir is /etc,
+                       and you can find the sample config file there (/etc/conky/conky.conf).
                </para>
                <para>
-               You might want to copy it to $HOME/.conkyrc and then start modifying it.
-               Other configs can be found at http://conky.sf.net
+                       You might want to copy it to $HOME/.conkyrc and then start modifying it.
+                       Other configs can be found at http://conky.sf.net/
                </para>
 
                &config_settings;
@@ -166,13 +156,10 @@
                <title>Variables</title>
 
                <para>
-               Colors are parsed using XParsecolor(), there might be a list of them:
-               /usr/X11R6/lib/X11/rgb.txt. Also, <ulink url="http://sedition.com/perl/rgb.html">
-                                                                                                                                                        http://sedition.com/perl/rgb.html</ulink>.
-               Color can be also in #rrggbb format (hex).
-
-               Note that when displaying bytes, power is 1024 and not 1000 so 1M really
-               means 1024*1024 bytes and not 1000*1000.
+                       Colors are parsed using XParsecolor(), there might be a list of them:
+                       /usr/share/X11/rgb.txt. Also, <ulink url="http://sedition.com/perl/rgb.html">
+                               http://sedition.com/perl/rgb.html</ulink>.
+                       Color can be also in #rrggbb format (hex).
                </para>
 
                &variables;
@@ -203,33 +190,41 @@
        <refsect1>
                <title>Bugs</title>
                <para>
-               Drawing to root or some other desktop window directly doesn't work with
-               all window managers. Especially doesn't work well with Gnome and it has
-               been reported that it doesn't work with KDE either. Nautilus can be
-               disabled from drawing to desktop with program gconf-editor. Uncheck
-               show_desktop in /apps/nautilus/preferences/. There is -w switch in Conky
-               to set some specific window id. You might find xwininfo -tree useful to
-               find the window to draw to. You can also use -o argument which makes
-               Conky to create its own window.
+                       Drawing to root or some other desktop window directly doesn't work with
+                       all window managers. Especially doesn't work well with Gnome and it has
+                       been reported that it doesn't work with KDE either. Nautilus can be
+                       disabled from drawing to desktop with program gconf-editor. Uncheck
+                       show_desktop in /apps/nautilus/preferences/. There is -w switch in Conky
+                       to set some specific window id. You might find xwininfo -tree useful to
+                       find the window to draw to. You can also use -o argument which makes
+                       Conky to create its own window.  If you do try running Conky in its own
+                       window, be sure to read up on the own_window_type settings and experiment.
                </para>
        </refsect1>
 
-  <refsect1>
-    <title>See Also</title>
-    <para><ulink url="http://conky.sourceforge.net">
-    http://conky.sourceforge.net</ulink></para>
-    <para><ulink url="http://www.sourceforge.net/projects/conky">
-    http://www.sourceforge.net/projects/conky</ulink></para>
+       <refsect1>
+               <title>See Also</title>
+               <para><ulink url="http://conky.sourceforge.net/">
+                               http://conky.sourceforge.net/</ulink></para>
+               <para><ulink url="http://www.sourceforge.net/projects/conky">
+                               http://www.sourceforge.net/projects/conky</ulink></para>
                <para>
                        #conky on irc.freenode.net
                </para>
-  </refsect1>
+       </refsect1>
 
        <refsect1>
+               <title>Copying</title>
+               <para>
+                       Copyright (c) 2005-2008 Brenden Matthews, Philip Kovacs, et. al.
+                       Any original torsmo code is licensed under the BSD license (see LICENSE.BSD for a copy).
+                       All code written since the fork of torsmo is licensed under the GPL (see LICENSE.GPL for a copy), except where noted differently (such as in portmon code, timed thread code, and audacious code which are LGPL, and prss which is an MIT-style license).
+               </para>
+       </refsect1>
+       <refsect1>
                <title>Authors</title>
                <para>
-                       The Conky dev team. What's up now!
+                       The Conky dev team (see AUTHORS for a full list of contributors).
                </para>
        </refsect1>
-
 </refentry>

diff --git a/doc/variables.xml b/doc/variables.xml
index c5b0c67..f571b40 100644 (file)
--- a/doc/variables.xml
+++ b/doc/variables.xml
@@ -1,2200 +1,2200 @@
 <variablelist>
-<varlistentry>
-       <term>
-               <command><option>addr</option></command>
-       <option>interface</option>
-       </term>
-       <listitem>
-               IP address for an interface
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-        <term>
-                <command><option>addrs</option></command>
-        <option>interface</option>
-        </term>
-        <listitem>
-                IP addresses for an interface (if one - works like addr). Linux only.
-        <para></para></listitem>
-</varlistentry>
-
-
-<varlistentry>
-       <term>
-               <command><option>acpiacadapter</option></command>
-       </term>
-       <listitem>
-               ACPI ac adapter state.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>acpifan</option></command>
-       </term>
-       <listitem>
-               ACPI fan state
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>acpitemp</option></command>
-       </term>
-       <listitem>
-               ACPI temperature in C.
-               <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>acpitempf</option></command>
-       </term>
-       <listitem>
-               ACPI temperature in F.
-               <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>adt746xcpu</option></command>
-       </term>
-       <listitem>
-               CPU temperature from therm_adt746x
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>adt746xfan</option></command>
-       </term>
-       <listitem>
-               Fan speed from therm_adt746x
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>alignr</option></command>
-       <option>(num)</option>
-       </term>
-       <listitem>
-               Right-justify text, with space of N
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>alignc</option></command>
-       <option>(num)</option>
-       </term>
-       <listitem>
-               Align text to centre
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>apm_adapter</option></command>
-       </term>
-       <listitem>
-               Display APM AC adapter status (FreeBSD only)
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>apm_battery_life</option></command>
-       </term>
-       <listitem>
-               Display APM battery life in percent (FreeBSD only)
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-        <term>
-                <command><option>apm_battery_time</option></command>
-        </term>
-        <listitem>
-               Display remaining APM battery life in hh:mm:ss or "unknown" if
-               AC adapterstatus is on-line or charging (FreeBSD only)
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>audacious_bar</option></command>
-                <option>(height),(width)</option>
-       </term>
-       <listitem>
-               Progress bar
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>audacious_bitrate</option></command>
-       </term>
-       <listitem>
-               Bitrate of current tune
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>audacious_channels</option></command>
-       </term>
-       <listitem>
-               Number of audio channels of current tune
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>audacious_filename</option></command>
-       </term>
-       <listitem>
-               Full path and filename of current tune
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>audacious_frequency</option></command>
-       </term>
-       <listitem>
-               Sampling frequency of current tune
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>audacious_length</option></command>
-       </term>
-       <listitem>
-               Total length of current tune as MM:SS
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>audacious_length_seconds</option></command>
-       </term>
-       <listitem>
-               Total length of current tune in seconds
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>audacious_playlist_position</option></command>
-       </term>
-       <listitem>
-               Playlist position of current tune
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>audacious_playlist_length</option></command>
-       </term>
-       <listitem>
-               Number of tunes in playlist
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>audacious_position</option></command>
-       </term>
-       <listitem>
-               Position of current tune (MM:SS)
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>audacious_position_seconds</option></command>
-       </term>
-       <listitem>
-               Position of current tune in seconds
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>audacious_status</option></command>
-       </term>
-       <listitem>
-               Player status (Playing/Paused/Stopped/Not running)
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>audacious_title</option></command>
-               <option>(max length)</option>
-       </term>
-       <listitem>
-               Title of current tune with optional maximum length specifier
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>battery</option></command>
-       <option>(num)</option>
-       </term>
-       <listitem>
-               Battery status and remaining percentage capacity of ACPI or APM battery. ACPI battery number can be given as argument (default is BAT0).
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>battery_bar</option></command>
-       <option>(height),(width) (num)</option>
-       </term>
-       <listitem>
-               Battery percentage remaining of ACPI battery in a bar.  ACPI battery number can be given as argument (default is BAT0).
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>battery_percent</option></command>
-       <option>(num)</option>
-       </term>
-       <listitem>
-               Battery percentage remaining for ACPI battery.  ACPI battery number can be given as argument (default is BAT0).
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>battery_time</option></command>
-       <option>(num)</option>
-       </term>
-       <listitem>
-               Battery charge/discharge time remaining of ACPI battery.  ACPI battery number can be given as argument (default is BAT0).
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-        <term>
-                <command><option>bmpx_artist</option></command>
-        </term>
-        <listitem>
-                Artist in current BMPx track
-        <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-        <term>
-                <command><option>bmpx_album</option></command>
-        </term>
-        <listitem>
-                Album in current BMPx track
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-        <term>
-               <command><option>bmpx_title</option></command>
-       </term>
-       <listitem>
-               Title of the current BMPx track
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>bmpx_track</option></command>
-       </term>
-       <listitem>
-               Track number of the current BMPx track
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>bmpx_bitrate</option></command>
-       </term>
-       <listitem>
-               Bitrate of the current BMPx track
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>bmpx_uri</option></command>
-       </term>
-       <listitem>
-               URI of the current BMPx track
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>buffers</option></command>
-       </term>
-       <listitem>
-               Amount of memory buffered
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>cached</option></command>
-       </term>
-       <listitem>
-               Amount of memory cached
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>color</option></command>
-       <option>(color)</option>
-       </term>
-       <listitem>
-               Change drawing color to color
-       <para></para></listitem>
-</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>
-       <listitem>
-               Change drawing color to color9 configuration option
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>conky_version</option></command>
-       </term>
-       <listitem>
-               Conky version
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>conky_build_date</option></command>
-       </term>
-       <listitem>
-               Date Conky was built
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>conky_bulid_arch</option></command>
-       </term>
-       <listitem>
-               CPU architecture Conky was built for
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>cpu</option></command>
-               <option>(cpuN)</option>
-       </term>
-       <listitem>
-               CPU usage in percents.  For SMP machines, the CPU number can be provided as an argument.  ${cpu cpu0} is the total usage, and ${cpu cpuX} (X >= 1) are individual CPUs.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>cpubar</option></command>
-               <option>(cpu number) (height),(width)</option>
-       </term>
-       <listitem>
-               Bar that shows CPU usage, height is bar's height in pixels.  See $cpu for more info on SMP.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>cpugraph</option></command>
-       <option>(cpu number) (height),(width) (gradient colour 1) (gradient colour 2)</option>
-       </term>
-       <listitem>
-               CPU usage graph, with optional colours in hex, minus the #.  See $cpu for more info on SMP.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>diskio</option></command>
-               <option>(device)</option>
-       </term>
-       <listitem>
-               Displays current disk IO.  Device is optional, and takes the form of sda for /dev/sda.  Individual partitions are allowed.
-               <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>diskiograph</option></command>
-               <option>(device) (height),(width) (gradient colour 1) (gradient colour 2) (scale)</option>
-       </term>
-       <listitem>
-               Disk IO graph, colours defined in hex, minus the #.  If scale is non-zero, it becomes the scale for the graph.
-               <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>diskio_read</option></command>
-               <option>(device)</option>
-       </term>
-       <listitem>
-               Displays current disk IO for reads.  Device as in diskio.
-               <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>diskiograph_read</option></command>
-               <option>(device) (height),(width) (gradient colour 1) (gradient colour 2) (scale)</option>
-       </term>
-       <listitem>
-               Disk IO graph for reads, colours defined in hex, minus the #.  If scale is non-zero, it becomes the scale for the graph.  Device as in diskio.
-               <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>diskio_write</option></command>
-               <option>(device)</option>
-       </term>
-       <listitem>
-               Displays current disk IO for writes.  Device as in diskio.
-               <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>diskiograph_write</option></command>
-               <option>(device) (height),(width) (gradient colour 1) (gradient colour 2) (scale)</option>
-       </term>
-       <listitem>
-               Disk IO graph for writes, colours defined in hex, minus the #.  If scale is non-zero, it becomes the scale for the graph.  Device as in diskio.
-               <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>disk_protect</option></command>
-               <option>device</option>
-       </term>
-       <listitem>
-               Disk protection status, if supported (needs kernel-patch). Prints either "frozen" or "free  " (note the padding).
-               <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>downspeed</option></command>
-       <option>net</option>
-       </term>
-       <listitem>
-               Download speed in kilobytes
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>downspeedf</option></command>
-       <option>net</option>
-       </term>
-       <listitem>
-               Download speed in kilobytes with one decimal
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>downspeedgraph</option></command>
-               <option>net (height),(width) (gradient colour 1) (gradient colour 2) (scale)</option>
-       </term>
-       <listitem>
-               Download speed graph, colours defined in hex, minus the #.  If scale is non-zero, it becomes the scale for the graph.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>else</option></command>
-       </term>
-       <listitem>
-               Text to show if any of the above are not true
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>entropy_avail</option></command>
-       </term>
-       <listitem>
-               Current entropy available for crypto freaks
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>entropy_bar</option></command>
-               <option>(height),(width)</option>
-       </term>
-       <listitem>
-               Normalized bar of available entropy for crypto freaks
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>entropy_poolsize</option></command>
-       </term>
-       <listitem>
-               Total size of system entropy pool for crypto freaks
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>exec</option></command>
-       <option>command</option>
-       </term>
-       <listitem>
-               Executes a shell command and displays the output in conky. warning: this takes a lot more resources than other variables. I'd recommend coding wanted behaviour in C and posting a patch.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>execbar</option></command>
-       <option>command</option>
-       </term>
-       <listitem>
-               Same as exec, except if the first value return is a value between 0-100, it will use that number for a bar. The size for the bar is currently fixed, but that may change in the future.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>execgraph</option></command>
-       <option>command</option>
-       </term>
-       <listitem>
-               Same as execbar, but graphs values.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>execi</option></command>
-               <option>interval command</option>
-       </term>
-       <listitem>
-               Same as exec but with specific interval. Interval can't be less than update_interval in configuration. See also $texeci
-               <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>execibar</option></command>
-               <option>interval command</option>
-       </term>
-       <listitem>
-               Same as execbar, except with an interval
-               <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>execigraph</option></command>
-               <option>interval command</option>
-       </term>
-       <listitem>
-               Same as execgraph, but takes an interval arg graphs values
-               <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>execp</option></command>
-       <option>command</option>
-       </term>
-       <listitem>
-               Executes a shell command and displays the output in conky. warning: this takes a lot more resources than other variables. I'd recommend coding wanted behaviour in C and posting a patch.  This differs from $exec in that it parses the output of the command, so you can insert things like ${color red}hi!${color} in your script and have it correctly parsed by Conky.
-               Caveats: Conky parses and evaluates the output of $execp every time Conky loops, and then destroys all the objects.  If you try to use anything like $execi within an $execp statement, it will functionally run at the same interval that the $execp statement runs, as it is created and destroyed at every interval.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>execpi</option></command>
-               <option>interval command</option>
-       </term>
-       <listitem>
-               Same as execp but with specific interval. Interval can't be less than update_interval in configuration.  Note that the output from the $execpi command is still parsed and evaluated at every interval.
-               <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>font</option></command>
-       <option>(font)</option>
-       </term>
-       <listitem>
-               Specify a different font. This new font will apply to the current line and everything following.  You can use a $font with no arguments to change back to the default font (much like with $color)
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>freq</option></command>
-               <option>(n)</option>
-       </term>
-       <listitem>
-               Returns CPU #n's frequency in MHz. CPUs are
-               counted from 1. If omitted, the parameter
-               defaults to 1.
-               <para></para></listitem>
-</varlistentry>
-<varlistentry>
-       <term>
-               <command><option>freq_g</option></command>
-               <option>(n)</option>
-       </term>
-       <listitem>
-               Returns CPU #n's frequency in GHz. CPUs are
-               counted from 1. If omitted, the parameter
-               defaults to 1.
-               <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>freq_dyn</option></command>
-       </term>
-       <listitem>
+       <varlistentry>
+               <term>
+                       <command><option>addr</option></command>
+                       <option>interface</option>
+               </term>
+               <listitem>
+                       IP address for an interface
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>addrs</option></command>
+                       <option>interface</option>
+               </term>
+               <listitem>
+                       IP addresses for an interface (if one - works like addr). Linux only.
+                       <para></para></listitem>
+       </varlistentry>
+
+
+       <varlistentry>
+               <term>
+                       <command><option>acpiacadapter</option></command>
+               </term>
+               <listitem>
+                       ACPI ac adapter state.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>acpifan</option></command>
+               </term>
+               <listitem>
+                       ACPI fan state
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>acpitemp</option></command>
+               </term>
+               <listitem>
+                       ACPI temperature in C.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>acpitempf</option></command>
+               </term>
+               <listitem>
+                       ACPI temperature in F.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>adt746xcpu</option></command>
+               </term>
+               <listitem>
+                       CPU temperature from therm_adt746x
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>adt746xfan</option></command>
+               </term>
+               <listitem>
+                       Fan speed from therm_adt746x
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>alignr</option></command>
+                       <option>(num)</option>
+               </term>
+               <listitem>
+                       Right-justify text, with space of N
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>alignc</option></command>
+                       <option>(num)</option>
+               </term>
+               <listitem>
+                       Align text to centre
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>apm_adapter</option></command>
+               </term>
+               <listitem>
+                       Display APM AC adapter status (FreeBSD only)
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>apm_battery_life</option></command>
+               </term>
+               <listitem>
+                       Display APM battery life in percent (FreeBSD only)
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>apm_battery_time</option></command>
+               </term>
+               <listitem>
+                       Display remaining APM battery life in hh:mm:ss or "unknown" if
+                       AC adapterstatus is on-line or charging (FreeBSD only)
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>audacious_bar</option></command>
+                       <option>(height),(width)</option>
+               </term>
+               <listitem>
+                       Progress bar
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>audacious_bitrate</option></command>
+               </term>
+               <listitem>
+                       Bitrate of current tune
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>audacious_channels</option></command>
+               </term>
+               <listitem>
+                       Number of audio channels of current tune
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>audacious_filename</option></command>
+               </term>
+               <listitem>
+                       Full path and filename of current tune
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>audacious_frequency</option></command>
+               </term>
+               <listitem>
+                       Sampling frequency of current tune
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>audacious_length</option></command>
+               </term>
+               <listitem>
+                       Total length of current tune as MM:SS
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>audacious_length_seconds</option></command>
+               </term>
+               <listitem>
+                       Total length of current tune in seconds
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>audacious_playlist_position</option></command>
+               </term>
+               <listitem>
+                       Playlist position of current tune
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>audacious_playlist_length</option></command>
+               </term>
+               <listitem>
+                       Number of tunes in playlist
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>audacious_position</option></command>
+               </term>
+               <listitem>
+                       Position of current tune (MM:SS)
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>audacious_position_seconds</option></command>
+               </term>
+               <listitem>
+                       Position of current tune in seconds
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>audacious_status</option></command>
+               </term>
+               <listitem>
+                       Player status (Playing/Paused/Stopped/Not running)
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>audacious_title</option></command>
+                       <option>(max length)</option>
+               </term>
+               <listitem>
+                       Title of current tune with optional maximum length specifier
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>battery</option></command>
+                       <option>(num)</option>
+               </term>
+               <listitem>
+                       Battery status and remaining percentage capacity of ACPI or APM battery. ACPI battery number can be given as argument (default is BAT0).
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>battery_bar</option></command>
+                       <option>(height),(width) (num)</option>
+               </term>
+               <listitem>
+                       Battery percentage remaining of ACPI battery in a bar.  ACPI battery number can be given as argument (default is BAT0).
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>battery_percent</option></command>
+                       <option>(num)</option>
+               </term>
+               <listitem>
+                       Battery percentage remaining for ACPI battery.  ACPI battery number can be given as argument (default is BAT0).
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>battery_time</option></command>
+                       <option>(num)</option>
+               </term>
+               <listitem>
+                       Battery charge/discharge time remaining of ACPI battery.  ACPI battery number can be given as argument (default is BAT0).
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>bmpx_artist</option></command>
+               </term>
+               <listitem>
+                       Artist in current BMPx track
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>bmpx_album</option></command>
+               </term>
+               <listitem>
+                       Album in current BMPx track
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>bmpx_title</option></command>
+               </term>
+               <listitem>
+                       Title of the current BMPx track
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>bmpx_track</option></command>
+               </term>
+               <listitem>
+                       Track number of the current BMPx track
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>bmpx_bitrate</option></command>
+               </term>
+               <listitem>
+                       Bitrate of the current BMPx track
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>bmpx_uri</option></command>
+               </term>
+               <listitem>
+                       URI of the current BMPx track
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>buffers</option></command>
+               </term>
+               <listitem>
+                       Amount of memory buffered
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>cached</option></command>
+               </term>
+               <listitem>
+                       Amount of memory cached
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>color</option></command>
+                       <option>(color)</option>
+               </term>
+               <listitem>
+                       Change drawing color to color
+                       <para></para></listitem>
+       </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>
+               <listitem>
+                       Change drawing color to color9 configuration option
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>conky_version</option></command>
+               </term>
+               <listitem>
+                       Conky version
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>conky_build_date</option></command>
+               </term>
+               <listitem>
+                       Date Conky was built
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>conky_bulid_arch</option></command>
+               </term>
+               <listitem>
+                       CPU architecture Conky was built for
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>cpu</option></command>
+                       <option>(cpuN)</option>
+               </term>
+               <listitem>
+                       CPU usage in percents.  For SMP machines, the CPU number can be provided as an argument.  ${cpu cpu0} is the total usage, and ${cpu cpuX} (X >= 1) are individual CPUs.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>cpubar</option></command>
+                       <option>(cpu number) (height),(width)</option>
+               </term>
+               <listitem>
+                       Bar that shows CPU usage, height is bar's height in pixels.  See $cpu for more info on SMP.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>cpugraph</option></command>
+                       <option>(cpu number) (height),(width) (gradient colour 1) (gradient colour 2)</option>
+               </term>
+               <listitem>
+                       CPU usage graph, with optional colours in hex, minus the #.  See $cpu for more info on SMP.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>diskio</option></command>
+                       <option>(device)</option>
+               </term>
+               <listitem>
+                       Displays current disk IO.  Device is optional, and takes the form of sda for /dev/sda.  Individual partitions are allowed.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>diskiograph</option></command>
+                       <option>(device) (height),(width) (gradient colour 1) (gradient colour 2) (scale)</option>
+               </term>
+               <listitem>
+                       Disk IO graph, colours defined in hex, minus the #.  If scale is non-zero, it becomes the scale for the graph.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>diskio_read</option></command>
+                       <option>(device)</option>
+               </term>
+               <listitem>
+                       Displays current disk IO for reads.  Device as in diskio.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>diskiograph_read</option></command>
+                       <option>(device) (height),(width) (gradient colour 1) (gradient colour 2) (scale)</option>
+               </term>
+               <listitem>
+                       Disk IO graph for reads, colours defined in hex, minus the #.  If scale is non-zero, it becomes the scale for the graph.  Device as in diskio.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>diskio_write</option></command>
+                       <option>(device)</option>
+               </term>
+               <listitem>
+                       Displays current disk IO for writes.  Device as in diskio.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>diskiograph_write</option></command>
+                       <option>(device) (height),(width) (gradient colour 1) (gradient colour 2) (scale)</option>
+               </term>
+               <listitem>
+                       Disk IO graph for writes, colours defined in hex, minus the #.  If scale is non-zero, it becomes the scale for the graph.  Device as in diskio.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>disk_protect</option></command>
+                       <option>device</option>
+               </term>
+               <listitem>
+                       Disk protection status, if supported (needs kernel-patch). Prints either "frozen" or "free  " (note the padding).
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>downspeed</option></command>
+                       <option>net</option>
+               </term>
+               <listitem>
+                       Download speed in kilobytes
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>downspeedf</option></command>
+                       <option>net</option>
+               </term>
+               <listitem>
+                       Download speed in kilobytes with one decimal
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>downspeedgraph</option></command>
+                       <option>net (height),(width) (gradient colour 1) (gradient colour 2) (scale)</option>
+               </term>
+               <listitem>
+                       Download speed graph, colours defined in hex, minus the #.  If scale is non-zero, it becomes the scale for the graph.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>else</option></command>
+               </term>
+               <listitem>
+                       Text to show if any of the above are not true
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>entropy_avail</option></command>
+               </term>
+               <listitem>
+                       Current entropy available for crypto freaks
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>entropy_bar</option></command>
+                       <option>(height),(width)</option>
+               </term>
+               <listitem>
+                       Normalized bar of available entropy for crypto freaks
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>entropy_poolsize</option></command>
+               </term>
+               <listitem>
+                       Total size of system entropy pool for crypto freaks
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>exec</option></command>
+                       <option>command</option>
+               </term>
+               <listitem>
+                       Executes a shell command and displays the output in conky. warning: this takes a lot more resources than other variables. I'd recommend coding wanted behaviour in C and posting a patch.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>execbar</option></command>
+                       <option>command</option>
+               </term>
+               <listitem>
+                       Same as exec, except if the first value return is a value between 0-100, it will use that number for a bar. The size for the bar is currently fixed, but that may change in the future.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>execgraph</option></command>
+                       <option>command</option>
+               </term>
+               <listitem>
+                       Same as execbar, but graphs values.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>execi</option></command>
+                       <option>interval command</option>
+               </term>
+               <listitem>
+                       Same as exec but with specific interval. Interval can't be less than update_interval in configuration. See also $texeci
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>execibar</option></command>
+                       <option>interval command</option>
+               </term>
+               <listitem>
+                       Same as execbar, except with an interval
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>execigraph</option></command>
+                       <option>interval command</option>
+               </term>
+               <listitem>
+                       Same as execgraph, but takes an interval arg graphs values
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>execp</option></command>
+                       <option>command</option>
+               </term>
+               <listitem>
+                       Executes a shell command and displays the output in conky. warning: this takes a lot more resources than other variables. I'd recommend coding wanted behaviour in C and posting a patch.  This differs from $exec in that it parses the output of the command, so you can insert things like ${color red}hi!${color} in your script and have it correctly parsed by Conky.
+                       Caveats: Conky parses and evaluates the output of $execp every time Conky loops, and then destroys all the objects.  If you try to use anything like $execi within an $execp statement, it will functionally run at the same interval that the $execp statement runs, as it is created and destroyed at every interval.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>execpi</option></command>
+                       <option>interval command</option>
+               </term>
+               <listitem>
+                       Same as execp but with specific interval. Interval can't be less than update_interval in configuration.  Note that the output from the $execpi command is still parsed and evaluated at every interval.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>font</option></command>
+                       <option>(font)</option>
+               </term>
+               <listitem>
+                       Specify a different font. This new font will apply to the current line and everything following.  You can use a $font with no arguments to change back to the default font (much like with $color)
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>freq</option></command>
+                       <option>(n)</option>
+               </term>
+               <listitem>
+                       Returns CPU #n's frequency in MHz. CPUs are
+                       counted from 1. If omitted, the parameter
+                       defaults to 1.
+                       <para></para></listitem>
+       </varlistentry>
+       <varlistentry>
+               <term>
+                       <command><option>freq_g</option></command>
+                       <option>(n)</option>
+               </term>
+               <listitem>
+                       Returns CPU #n's frequency in GHz. CPUs are
+                       counted from 1. If omitted, the parameter
+                       defaults to 1.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>freq_dyn</option></command>
+               </term>
+               <listitem>
                        Returns CPU frequency in MHz, but is calculated by counting to clock cycles to complete an instruction.  Only available for x86/amd64.
                        <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>freq_dyn_g</option></command>
-       </term>
-       <listitem>
-               Returns CPU frequency in GHz, but is calculated by counting to clock cycles to complete an instruction.  Only available for x86/amd64.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>fs_bar</option></command>
-       <option>(height),(width) fs</option>
-       </term>
-       <listitem>
-               Bar that shows how much space is used on a file system. height is the height in pixels. fs is any file on that file system.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>fs_free</option></command>
-       <option>(fs)</option>
-       </term>
-       <listitem>
-               Free space on a file system available for users.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>fs_free_perc</option></command>
-       <option>(fs)</option>
-       </term>
-       <listitem>
-               Free percentage of space on a file system available for users.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>fs_size</option></command>
-       <option>(fs)</option>
-       </term>
-       <listitem>
-               File system size
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>fs_type</option></command>
-       <option>(fs)</option>
-       </term>
-       <listitem>
-               File system type
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>fs_used</option></command>
-       <option>(fs)</option>
-       </term>
-       <listitem>
-               File system used space
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>goto</option></command>
-               <option>x</option>
-       </term>
-       <listitem>
-        The next element will be printed at position 'x'.
-               <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>gw_iface</option></command>
-       </term>
-       <listitem>
-               Displays the default route's interface or "multiple"/"none" accordingly.
-               <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>gw_ip</option></command>
-       </term>
-       <listitem>
-               Displays the default gateway's IP or "multiple"/"none" accordingly.
-               <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>hddtemp</option></command>
-               <option>dev, (host,(port))</option>
-       </term>
-       <listitem>
-               Displays temperature of a selected hard disk drive as reported by the hddtemp daemon running on host:port.
-               Default host is 127.0.0.1, default port is 7634.
-               <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>head</option></command>
-               <option>logfile lines (interval)</option>
-       </term>
-       <listitem>
-               Displays first N lines of supplied text text file. If interval is not supplied, Conky assumes 2x Conky's interval. Max of 30 lines can be displayed, or until the text buffer is filled.
-               <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>hr</option></command>
-       <option>(height)</option>
-       </term>
-       <listitem>
-               Horizontal line, height is the height in pixels
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-  <term>
-    <command><option>hwmon</option></command>
-  <option>(dev) type n</option>
-  </term>
-  <listitem>
-    Hwmon sensor from sysfs (Linux 2.6). Parameter dev may be omitted if you have only one hwmon device. Parameter type is either 'in' or 'vol' meaning voltage; 'fan' meaning fan; 'temp' (Celsius) or 'tempf' (Fahrenheit) meaning temperature. Parameter n is number of the sensor. See /sys/class/hwmon/ on your local computer.
-  <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>iconv_start</option></command>
-       <option>codeset_from codeset_to</option>
-       </term>
-       <listitem>
-               Convert text from one codeset to another using GNU iconv.  Needs to be stopped with iconv_stop.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>iconv_stop</option></command>
-       <option></option>
-       </term>
-       <listitem>
-               Stop iconv codeset conversion.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>i2c</option></command>
-       <option>(dev) type n</option>
-       </term>
-       <listitem>
-               I2C sensor from sysfs (Linux 2.6).  Parameter dev may be omitted if you have only one I2C device.  Parameter type is either 'in' or 'vol' meaning voltage; 'fan' meaning fan; 'temp' (Celsius) or 'tempf' (Fahrenheit) meaning temperature.  Parameter n is number of the sensor. See /sys/bus/i2c/devices/ on your local computer.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>i8k_ac_status</option></command>
-       <option></option>
-       </term>
-       <listitem>
-               If running the i8k kernel driver for Inspiron laptops, displays whether ac power is on, as listed in /proc/i8k (translated to human-readable). Beware that this is by default not enabled by i8k itself.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>i8k_bios</option></command>
-       <option></option>
-       </term>
-       <listitem>
-               If running the i8k kernel driver for Inspiron laptops, displays the bios version as listed in /proc/i8k.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>i8k_buttons_status</option></command>
-       <option></option>
-       </term>
-       <listitem>
-               If running the i8k kernel driver for Inspiron laptops, displays the volume buttons status as listed in /proc/i8k.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>i8k_cpu_temp</option></command>
-       <option></option>
-       </term>
-       <listitem>
-               If running the i8k kernel driver for Inspiron laptops, displays the cpu temperature in Celsius, as reported by /proc/i8k.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>i8k_cpu_tempf</option></command>
-       <option></option>
-       </term>
-       <listitem>
-               If running the i8k kernel driver for Inspiron laptops, displays the cpu temperature in Fahrenheit, as reported by /proc/i8k.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>i8k_left_fan_rpm</option></command>
-       <option></option>
-       </term>
-       <listitem>
-               If running the i8k kernel driver for Inspiron laptops, displays the left fan's rate of rotation, in revolutions per minute as listed in /proc/i8k. Beware, some laptops i8k reports these fans in reverse order.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>i8k_left_fan_status</option></command>
-       <option></option>
-       </term>
-       <listitem>
-               If running the i8k kernel driver for Inspiron laptops, displays the left fan status as listed in /proc/i8k (translated to human-readable). Beware, some laptops i8k reports these fans in reverse order.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>i8k_right_fan_rpm</option></command>
-       <option></option>
-       </term>
-       <listitem>
-               If running the i8k kernel driver for Inspiron laptops, displays the right fan's rate of rotation, in revolutions per minute as listed in /proc/i8k. Beware, some laptops i8k reports these fans in reverse order.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>i8k_right_fan_status</option></command>
-       <option></option>
-       </term>
-       <listitem>
-               If running the i8k kernel driver for Inspiron laptops, displays the right fan status as listed in /proc/i8k (translated to human-readable). Beware, some laptops i8k reports these fans in reverse order.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>i8k_serial</option></command>
-       <option></option>
-       </term>
-       <listitem>
-               If running the i8k kernel driver for Inspiron laptops, displays your laptop serial number as listed in /proc/i8k.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>i8k_version</option></command>
-       <option></option>
-       </term>
-       <listitem>
-               If running the i8k kernel driver for Inspiron laptops, displays the version formatting of /proc/i8k.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>ibm_fan</option></command>
-       </term>
-       <listitem>
-               If running the IBM ACPI, displays the fan speed.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>ibm_temps</option></command>
-               <option>N</option>
-       </term>
-       <listitem>
-               If running the IBM ACPI, displays the temperatures
-               from the IBM temperature sensors (N=0..7) Sensor 0 is
-               on the CPU, 3 is on the GPU.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>ibm_volume</option></command>
-       </term>
-       <listitem>
-               If running the IBM ACPI, displays the "master" volume,
-       controlled by the volume keys (0-14).
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>ibm_brightness</option></command>
-       </term>
-       <listitem>
-               If running the IBM ACPI, displays the brigtness of the
-       laptops's LCD (0-7).
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>if_empty</option></command>
-       <option>(var)</option>
-       </term>
-       <listitem>
-               if conky variable VAR is empty, display everything between $if_empty and the matching $endif
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>if_gw</option></command>
-       </term>
-       <listitem>
-               if there is at least one default gateway, display everything between $if_gw and the matching $endif
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>if_running</option></command>
-       <option>(process)</option>
-       </term>
-       <listitem>
-               if PROCESS is running, display everything $if_running and the matching $endif
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>if_existing</option></command>
-       <option>file (string)</option>
-       </term>
-       <listitem>
-               if FILE exists, display everything between if_existing and the matching $endif.  The optional second paramater checks for FILE containing the specified string and prints everything between $if_existing and the matching $endif.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>if_mounted</option></command>
-       <option>(mountpoint)</option>
-       </term>
-       <listitem>
-               if MOUNTPOINT is mounted, display everything between $if_mounted and the matching $endif
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>if_smapi_bat_installed</option></command>
-       <option>(INDEX)</option>
-       </term>
-       <listitem>
-               when using smapi, if the battery with index INDEX is installed, display everything between $if_smapi_bat_installed and the matching $endif
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>if_up</option></command>
-       <option>(interface)</option>
-       </term>
-       <listitem>
-               if INTERFACE exists and is up, display everything between $if_up and the matching $endif
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>imap_messages</option></command>
-       <option>(args)</option>
-       </term>
-       <listitem>
-               Displays the number of messages in your global IMAP inbox by default.  You can define individual IMAP inboxes seperately by passing arguments to this object.  Arguments are: "host user pass [-i interval] [-p port] [-e command]".  Default port is 143, default interval is 5 minutes.  If the password is supplied as '*', you will be prompted to enter the password when Conky starts.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>imap_unseen</option></command>
-       <option>(args)</option>
-       </term>
-       <listitem>
-               Displays the number of unseen messages in your global IMAP inbox by default.  You can define individual IMAP inboxes seperately by passing arguments to this object.  Arguments are: "host user pass [-i interval] [-p port] [-e command]".  Default port is 143, default interval is 5 minutes.  If the password is supplied as '*', you will be prompted to enter the password when Conky starts.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>ioscheduler</option></command>
-       <option>disk</option>
-       </term>
-       <listitem>
-               Prints the current ioscheduler used for the given disk name (i.e. e.g. "hda" or "sdb")
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>kernel</option></command>
-       </term>
-       <listitem>
-               Kernel version
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>laptop_mode</option></command>
-       </term>
-       <listitem>
-               The value of /proc/sys/vm/laptop_mode
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>loadavg</option></command>
-       </term>
-       <listitem>
-               (1,2,3)> System load average, 1 is for past 1 minute, 2 for past 5 minutes and 3 for past 15 minutes.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>machine</option></command>
-       </term>
-       <listitem>
-               Machine, i686 for example
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>mails</option></command>
-       <option>(mailbox)</option>
-       <option>(interval)</option>
-       </term>
-       <listitem>
-               Mail count in the specified mailbox or your mail spool if not.
-               Both mbox and maildir type mailboxes are supported. You can
-               use a program like fetchmail to get mails from some server
-               using your favourite protocol. See also new_mails.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>mboxscan</option></command>
-               <option>(-n number of messages to print) (-fw from width) (-sw subject width) mbox</option>
-       </term>
-       <listitem>
-               Print a summary of recent messages in an mbox format mailbox.  mbox parameter is the filename of the mailbox (can be encapsulated using '"', ie. ${mboxscan -n 10 "/home/brenden/some box"}
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>mem</option></command>
-       </term>
-       <listitem>
-               Amount of memory in use
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>membar</option></command>
-       <option>(height),(width)</option>
-       </term>
-       <listitem>
-               Bar that shows amount of memory in use
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>memmax</option></command>
-       </term>
-       <listitem>
-               Total amount of memory
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>memperc</option></command>
-       </term>
-       <listitem>
-               Percentage of memory in use
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>mpd_artist</option></command>
-       </term>
-       <listitem>
-               Artist in current MPD song must be enabled at compile
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>mpd_album</option></command>
-       </term>
-       <listitem>
-               Album in current MPD song
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>mpd_bar</option></command>
-       <option>(height),(width)</option>
-       </term>
-       <listitem>
-               Bar of mpd's progress
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>mpd_bitrate</option></command>
-       </term>
-       <listitem>
-               Bitrate of current song
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>mpd_status</option></command>
-       </term>
-       <listitem>
-               Playing, stopped, et cetera.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>mpd_title</option></command>
-       <option>(max length)</option>
-       </term>
-       <listitem>
-               Title of current MPD song
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>mpd_vol</option></command>
-       </term>
-       <listitem>
-               MPD's volume
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>mpd_elapsed</option></command>
-       </term>
-       <listitem>
-               Song's elapsed time
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>mpd_length</option></command>
-       </term>
-       <listitem>
-               Song's length
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>mpd_percent</option></command>
-       </term>
-       <listitem>
-               Percent of song's progress
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>mpd_random</option></command>
-       </term>
-       <listitem>
-               Random status (On/Off)
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>mpd_repeat</option></command>
-       </term>
-       <listitem>
-               Repeat status (On/Off)
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>mpd_track</option></command>
-       </term>
-       <listitem>
-               Prints the MPD track field
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>mpd_name</option></command>
-       </term>
-       <listitem>
-               Prints the MPD name field
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>mpd_file</option></command>
-       </term>
-       <listitem>
-               Prints the file name of the current MPD song
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>mpd_smart</option></command>
-       </term>
-       <listitem>
-               Prints the song name in either the form "artist - title" or file name, depending on whats available
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>nameserver</option></command>
-       <option>(index)</option>
-       </term>
-       <listitem>
-               Print a nameserver from /etc/resolv.conf. Index starts at and defaults to 0.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>new_mails</option></command>
-       <option>(mailbox)</option>
-       <option>(interval)</option>
-       </term>
-       <listitem>
-               Unread mail count in the specified mailbox or mail spool if
-               not. Both mbox and maildir type mailboxes are supported.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>nodename</option></command>
-       </term>
-       <listitem>
-               Hostname
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>outlinecolor</option></command>
-       <option>(color)</option>
-       </term>
-       <listitem>
-               Change outline color
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>pb_battery</option></command>
-               <option>item</option>
-       </term>
-       <listitem>
-                If running on Apple powerbook/ibook, display
-                information on battery status. The item parameter
-                specifies, what information to display. Exactly one item
-                must be specified. Valid items are:
-               <simplelist>
-                        <member><command>status</command>:
-                                Display if battery is fully charged, charging,
-                                discharging or absent (running on AC)
-                        </member>
-                        <member><command>percent</command>:
-                                Display charge of battery in percent, if
-                                charging or discharging. Nothing will be
-                                displayed, if battery is fully charged
-                                or absent.
-                        </member>
-                        <member><command>time</command>:
-                                Display the time remaining until the battery
-                                will be fully charged or discharged at current
-                                rate.  Nothing is displayed, if battery is
-                                absent or if it's present but fully charged
-                                and not discharging.
-                        </member>
-                </simplelist>
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-  <term>
-    <command><option>platform</option></command>
-  <option>(dev) type n</option>
-  </term>
-  <listitem>
-    Platform sensor from sysfs (Linux 2.6). Parameter dev may be omitted if you have only one platform device. Platform type is either 'in' or 'vol' meaning voltage; 'fan' meaning fan; 'temp' (Celsius) or 'tempf' (Fahrenheit) meaning temperature. Parameter n is number of the sensor. See /sys/bus/platform/devices/ on your local computer.
-  <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>pop3_unseen</option></command>
-       <option>(args)</option>
-       </term>
-       <listitem>
-               Displays the number of unseen messages in your global POP3 inbox by default.  You can define individual POP3 inboxes seperately by passing arguments to this object.  Arguments are: "host user pass [-i interval] [-p port] [-e command]".  Default port is 110, default interval is 5 minutes.  If the password is supplied as '*', you will be prompted to enter the password when Conky starts.
-
-               <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>pop3_used</option></command>
-       <option>(args)</option>
-       </term>
-       <listitem>
-               Displays the amount of space (in MiB, 2^20) used in your global POP3 inbox by default.  You can define individual POP3 inboxes seperately by passing arguments to this object.  Arguments are: "host user pass [-i interval] [-p port] [-e command]".  Default port is 110, default interval is 5 minutes.  If the password is supplied as '*', you will be prompted to enter the password when Conky starts.
-
-               <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>pre_exec</option></command>
-       <option>shell command</option>
-       </term>
-       <listitem>
-               Executes a shell command one time before conky displays anything and puts output as text.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>processes</option></command>
-       </term>
-       <listitem>
-               Total processes (sleeping and running)
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>running_processes</option></command>
-       </term>
-       <listitem>
-               Running processes (not sleeping), requires Linux 2.6
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>shadecolor</option></command>
-       <option>(color)</option>
-       </term>
-       <listitem>
-               Change shading color
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>smapi</option></command>
-       <option>(ARGS)</option>
-       </term>
-       <listitem>
-               when using smapi, display contents of the /sys/devices/platform/smapi directory. ARGS are either '(FILENAME)' or 'bat (INDEX) (FILENAME)' to display the corresponding files' content. This is a very raw method of accessing the smapi values. When available, better use one of the smapi_* variables instead.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>smapi_bat_perc</option></command>
-       <option>(INDEX)</option>
-       </term>
-       <listitem>
-               when using smapi, display the remaining capacity in percent of the battery with index INDEX. This is a separate variable because it supports the 'use_spacer' configuration option.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>smapi_bat_bar</option></command>
-       <option>(INDEX),(height),(width)</option>
-       </term>
-       <listitem>
-               when using smapi, display the remaining capacity of the battery with index INDEX as a bar.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>stippled_hr</option></command>
-       <option>(space)</option>
-       </term>
-       <listitem>
-               Stippled (dashed) horizontal line
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>swapbar</option></command>
-       <option>(height),(width)</option>
-       </term>
-       <listitem>
-               Bar that shows amount of swap in use
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>swap</option></command>
-       </term>
-       <listitem>
-               Amount of swap in use
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>swapmax</option></command>
-       </term>
-       <listitem>
-               Total amount of swap
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>swapperc</option></command>
-       </term>
-       <listitem>
-               Percentage of swap in use
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>sysname</option></command>
-       </term>
-       <listitem>
-               System name, Linux for example
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>tcp_portmon</option></command>
-               <option>port_begin port_end item (index)</option>
-               <emphasis>(ip4 only at present)</emphasis>
-       </term>
-       <listitem>
-               TCP port monitor for specified local ports.  Port numbers must be in the range 1 to 65535. Valid items are:
-               <simplelist>
-                       <member><command>count</command> - total number of connections in the range
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>freq_dyn_g</option></command>
+               </term>
+               <listitem>
+                       Returns CPU frequency in GHz, but is calculated by counting to clock cycles to complete an instruction.  Only available for x86/amd64.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>fs_bar</option></command>
+                       <option>(height),(width) fs</option>
+               </term>
+               <listitem>
+                       Bar that shows how much space is used on a file system. height is the height in pixels. fs is any file on that file system.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>fs_free</option></command>
+                       <option>(fs)</option>
+               </term>
+               <listitem>
+                       Free space on a file system available for users.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>fs_free_perc</option></command>
+                       <option>(fs)</option>
+               </term>
+               <listitem>
+                       Free percentage of space on a file system available for users.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>fs_size</option></command>
+                       <option>(fs)</option>
+               </term>
+               <listitem>
+                       File system size
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>fs_type</option></command>
+                       <option>(fs)</option>
+               </term>
+               <listitem>
+                       File system type
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>fs_used</option></command>
+                       <option>(fs)</option>
+               </term>
+               <listitem>
+                       File system used space
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>goto</option></command>
+                       <option>x</option>
+               </term>
+               <listitem>
+                       The next element will be printed at position 'x'.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>gw_iface</option></command>
+               </term>
+               <listitem>
+                       Displays the default route's interface or "multiple"/"none" accordingly.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>gw_ip</option></command>
+               </term>
+               <listitem>
+                       Displays the default gateway's IP or "multiple"/"none" accordingly.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>hddtemp</option></command>
+                       <option>dev, (host,(port))</option>
+               </term>
+               <listitem>
+                       Displays temperature of a selected hard disk drive as reported by the hddtemp daemon running on host:port.
+                       Default host is 127.0.0.1, default port is 7634.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>head</option></command>
+                       <option>logfile lines (interval)</option>
+               </term>
+               <listitem>
+                       Displays first N lines of supplied text text file. If interval is not supplied, Conky assumes 2x Conky's interval. Max of 30 lines can be displayed, or until the text buffer is filled.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>hr</option></command>
+                       <option>(height)</option>
+               </term>
+               <listitem>
+                       Horizontal line, height is the height in pixels
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>hwmon</option></command>
+                       <option>(dev) type n</option>
+               </term>
+               <listitem>
+                       Hwmon sensor from sysfs (Linux 2.6). Parameter dev may be omitted if you have only one hwmon device. Parameter type is either 'in' or 'vol' meaning voltage; 'fan' meaning fan; 'temp' (Celsius) or 'tempf' (Fahrenheit) meaning temperature. Parameter n is number of the sensor. See /sys/class/hwmon/ on your local computer.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>iconv_start</option></command>
+                       <option>codeset_from codeset_to</option>
+               </term>
+               <listitem>
+                       Convert text from one codeset to another using GNU iconv.  Needs to be stopped with iconv_stop.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>iconv_stop</option></command>
+                       <option></option>
+               </term>
+               <listitem>
+                       Stop iconv codeset conversion.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>i2c</option></command>
+                       <option>(dev) type n</option>
+               </term>
+               <listitem>
+                       I2C sensor from sysfs (Linux 2.6).  Parameter dev may be omitted if you have only one I2C device.  Parameter type is either 'in' or 'vol' meaning voltage; 'fan' meaning fan; 'temp' (Celsius) or 'tempf' (Fahrenheit) meaning temperature.  Parameter n is number of the sensor. See /sys/bus/i2c/devices/ on your local computer.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>i8k_ac_status</option></command>
+                       <option></option>
+               </term>
+               <listitem>
+                       If running the i8k kernel driver for Inspiron laptops, displays whether ac power is on, as listed in /proc/i8k (translated to human-readable). Beware that this is by default not enabled by i8k itself.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>i8k_bios</option></command>
+                       <option></option>
+               </term>
+               <listitem>
+                       If running the i8k kernel driver for Inspiron laptops, displays the bios version as listed in /proc/i8k.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>i8k_buttons_status</option></command>
+                       <option></option>
+               </term>
+               <listitem>
+                       If running the i8k kernel driver for Inspiron laptops, displays the volume buttons status as listed in /proc/i8k.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>i8k_cpu_temp</option></command>
+                       <option></option>
+               </term>
+               <listitem>
+                       If running the i8k kernel driver for Inspiron laptops, displays the cpu temperature in Celsius, as reported by /proc/i8k.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>i8k_cpu_tempf</option></command>
+                       <option></option>
+               </term>
+               <listitem>
+                       If running the i8k kernel driver for Inspiron laptops, displays the cpu temperature in Fahrenheit, as reported by /proc/i8k.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>i8k_left_fan_rpm</option></command>
+                       <option></option>
+               </term>
+               <listitem>
+                       If running the i8k kernel driver for Inspiron laptops, displays the left fan's rate of rotation, in revolutions per minute as listed in /proc/i8k. Beware, some laptops i8k reports these fans in reverse order.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>i8k_left_fan_status</option></command>
+                       <option></option>
+               </term>
+               <listitem>
+                       If running the i8k kernel driver for Inspiron laptops, displays the left fan status as listed in /proc/i8k (translated to human-readable). Beware, some laptops i8k reports these fans in reverse order.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>i8k_right_fan_rpm</option></command>
+                       <option></option>
+               </term>
+               <listitem>
+                       If running the i8k kernel driver for Inspiron laptops, displays the right fan's rate of rotation, in revolutions per minute as listed in /proc/i8k. Beware, some laptops i8k reports these fans in reverse order.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>i8k_right_fan_status</option></command>
+                       <option></option>
+               </term>
+               <listitem>
+                       If running the i8k kernel driver for Inspiron laptops, displays the right fan status as listed in /proc/i8k (translated to human-readable). Beware, some laptops i8k reports these fans in reverse order.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>i8k_serial</option></command>
+                       <option></option>
+               </term>
+               <listitem>
+                       If running the i8k kernel driver for Inspiron laptops, displays your laptop serial number as listed in /proc/i8k.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>i8k_version</option></command>
+                       <option></option>
+               </term>
+               <listitem>
+                       If running the i8k kernel driver for Inspiron laptops, displays the version formatting of /proc/i8k.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>ibm_fan</option></command>
+               </term>
+               <listitem>
+                       If running the IBM ACPI, displays the fan speed.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>ibm_temps</option></command>
+                       <option>N</option>
+               </term>
+               <listitem>
+                       If running the IBM ACPI, displays the temperatures
+                       from the IBM temperature sensors (N=0..7) Sensor 0 is
+                       on the CPU, 3 is on the GPU.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>ibm_volume</option></command>
+               </term>
+               <listitem>
+                       If running the IBM ACPI, displays the "master" volume,
+                       controlled by the volume keys (0-14).
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>ibm_brightness</option></command>
+               </term>
+               <listitem>
+                       If running the IBM ACPI, displays the brigtness of the
+                       laptops's LCD (0-7).
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>if_empty</option></command>
+                       <option>(var)</option>
+               </term>
+               <listitem>
+                       if conky variable VAR is empty, display everything between $if_empty and the matching $endif
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>if_gw</option></command>
+               </term>
+               <listitem>
+                       if there is at least one default gateway, display everything between $if_gw and the matching $endif
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>if_running</option></command>
+                       <option>(process)</option>
+               </term>
+               <listitem>
+                       if PROCESS is running, display everything $if_running and the matching $endif
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>if_existing</option></command>
+                       <option>file (string)</option>
+               </term>
+               <listitem>
+                       if FILE exists, display everything between if_existing and the matching $endif.  The optional second paramater checks for FILE containing the specified string and prints everything between $if_existing and the matching $endif.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>if_mounted</option></command>
+                       <option>(mountpoint)</option>
+               </term>
+               <listitem>
+                       if MOUNTPOINT is mounted, display everything between $if_mounted and the matching $endif
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>if_smapi_bat_installed</option></command>
+                       <option>(INDEX)</option>
+               </term>
+               <listitem>
+                       when using smapi, if the battery with index INDEX is installed, display everything between $if_smapi_bat_installed and the matching $endif
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>if_up</option></command>
+                       <option>(interface)</option>
+               </term>
+               <listitem>
+                       if INTERFACE exists and is up, display everything between $if_up and the matching $endif
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>imap_messages</option></command>
+                       <option>(args)</option>
+               </term>
+               <listitem>
+                       Displays the number of messages in your global IMAP inbox by default.  You can define individual IMAP inboxes seperately by passing arguments to this object.  Arguments are: "host user pass [-i interval] [-p port] [-e command]".  Default port is 143, default interval is 5 minutes.  If the password is supplied as '*', you will be prompted to enter the password when Conky starts.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>imap_unseen</option></command>
+                       <option>(args)</option>
+               </term>
+               <listitem>
+                       Displays the number of unseen messages in your global IMAP inbox by default.  You can define individual IMAP inboxes seperately by passing arguments to this object.  Arguments are: "host user pass [-i interval] [-p port] [-e command]".  Default port is 143, default interval is 5 minutes.  If the password is supplied as '*', you will be prompted to enter the password when Conky starts.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>ioscheduler</option></command>
+                       <option>disk</option>
+               </term>
+               <listitem>
+                       Prints the current ioscheduler used for the given disk name (i.e. e.g. "hda" or "sdb")
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>kernel</option></command>
+               </term>
+               <listitem>
+                       Kernel version
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>laptop_mode</option></command>
+               </term>
+               <listitem>
+                       The value of /proc/sys/vm/laptop_mode
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>loadavg</option></command>
+               </term>
+               <listitem>
+                       (1,2,3)> System load average, 1 is for past 1 minute, 2 for past 5 minutes and 3 for past 15 minutes.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>machine</option></command>
+               </term>
+               <listitem>
+                       Machine, i686 for example
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>mails</option></command>
+                       <option>(mailbox)</option>
+                       <option>(interval)</option>
+               </term>
+               <listitem>
+                       Mail count in the specified mailbox or your mail spool if not.
+                       Both mbox and maildir type mailboxes are supported. You can
+                       use a program like fetchmail to get mails from some server
+                       using your favourite protocol. See also new_mails.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>mboxscan</option></command>
+                       <option>(-n number of messages to print) (-fw from width) (-sw subject width) mbox</option>
+               </term>
+               <listitem>
+                       Print a summary of recent messages in an mbox format mailbox.  mbox parameter is the filename of the mailbox (can be encapsulated using '"', ie. ${mboxscan -n 10 "/home/brenden/some box"}
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>mem</option></command>
+               </term>
+               <listitem>
+                       Amount of memory in use
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>membar</option></command>
+                       <option>(height),(width)</option>
+               </term>
+               <listitem>
+                       Bar that shows amount of memory in use
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>memmax</option></command>
+               </term>
+               <listitem>
+                       Total amount of memory
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>memperc</option></command>
+               </term>
+               <listitem>
+                       Percentage of memory in use
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>mpd_artist</option></command>
+               </term>
+               <listitem>
+                       Artist in current MPD song must be enabled at compile
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>mpd_album</option></command>
+               </term>
+               <listitem>
+                       Album in current MPD song
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>mpd_bar</option></command>
+                       <option>(height),(width)</option>
+               </term>
+               <listitem>
+                       Bar of mpd's progress
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>mpd_bitrate</option></command>
+               </term>
+               <listitem>
+                       Bitrate of current song
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>mpd_status</option></command>
+               </term>
+               <listitem>
+                       Playing, stopped, et cetera.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>mpd_title</option></command>
+                       <option>(max length)</option>
+               </term>
+               <listitem>
+                       Title of current MPD song
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>mpd_vol</option></command>
+               </term>
+               <listitem>
+                       MPD's volume
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>mpd_elapsed</option></command>
+               </term>
+               <listitem>
+                       Song's elapsed time
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>mpd_length</option></command>
+               </term>
+               <listitem>
+                       Song's length
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>mpd_percent</option></command>
+               </term>
+               <listitem>
+                       Percent of song's progress
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>mpd_random</option></command>
+               </term>
+               <listitem>
+                       Random status (On/Off)
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>mpd_repeat</option></command>
+               </term>
+               <listitem>
+                       Repeat status (On/Off)
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>mpd_track</option></command>
+               </term>
+               <listitem>
+                       Prints the MPD track field
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>mpd_name</option></command>
+               </term>
+               <listitem>
+                       Prints the MPD name field
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>mpd_file</option></command>
+               </term>
+               <listitem>
+                       Prints the file name of the current MPD song
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>mpd_smart</option></command>
+               </term>
+               <listitem>
+                       Prints the song name in either the form "artist - title" or file name, depending on whats available
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>nameserver</option></command>
+                       <option>(index)</option>
+               </term>
+               <listitem>
+                       Print a nameserver from /etc/resolv.conf. Index starts at and defaults to 0.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>new_mails</option></command>
+                       <option>(mailbox)</option>
+                       <option>(interval)</option>
+               </term>
+               <listitem>
+                       Unread mail count in the specified mailbox or mail spool if
+                       not. Both mbox and maildir type mailboxes are supported.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>nodename</option></command>
+               </term>
+               <listitem>
+                       Hostname
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>outlinecolor</option></command>
+                       <option>(color)</option>
+               </term>
+               <listitem>
+                       Change outline color
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>pb_battery</option></command>
+                       <option>item</option>
+               </term>
+               <listitem>
+                       If running on Apple powerbook/ibook, display
+                       information on battery status. The item parameter
+                       specifies, what information to display. Exactly one item
+                       must be specified. Valid items are:
+                       <simplelist>
+                               <member><command>status</command>:
+                                       Display if battery is fully charged, charging,
+                                       discharging or absent (running on AC)
                                </member>
-                       <member><command>rip</command> - remote ip address
+                               <member><command>percent</command>:
+                                       Display charge of battery in percent, if
+                                       charging or discharging. Nothing will be
+                                       displayed, if battery is fully charged
+                                       or absent.
                                </member>
-                       <member><command>rhost</command> - remote host name
+                               <member><command>time</command>:
+                                       Display the time remaining until the battery
+                                       will be fully charged or discharged at current
+                                       rate.  Nothing is displayed, if battery is
+                                       absent or if it's present but fully charged
+                                       and not discharging.
                                </member>
-                       <member><command>rport</command> - remote port number
+                       </simplelist>
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>platform</option></command>
+                       <option>(dev) type n</option>
+               </term>
+               <listitem>
+                       Platform sensor from sysfs (Linux 2.6). Parameter dev may be omitted if you have only one platform device. Platform type is either 'in' or 'vol' meaning voltage; 'fan' meaning fan; 'temp' (Celsius) or 'tempf' (Fahrenheit) meaning temperature. Parameter n is number of the sensor. See /sys/bus/platform/devices/ on your local computer.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>pop3_unseen</option></command>
+                       <option>(args)</option>
+               </term>
+               <listitem>
+                       Displays the number of unseen messages in your global POP3 inbox by default.  You can define individual POP3 inboxes seperately by passing arguments to this object.  Arguments are: "host user pass [-i interval] [-p port] [-e command]".  Default port is 110, default interval is 5 minutes.  If the password is supplied as '*', you will be prompted to enter the password when Conky starts.
+
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>pop3_used</option></command>
+                       <option>(args)</option>
+               </term>
+               <listitem>
+                       Displays the amount of space (in MiB, 2^20) used in your global POP3 inbox by default.  You can define individual POP3 inboxes seperately by passing arguments to this object.  Arguments are: "host user pass [-i interval] [-p port] [-e command]".  Default port is 110, default interval is 5 minutes.  If the password is supplied as '*', you will be prompted to enter the password when Conky starts.
+
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>pre_exec</option></command>
+                       <option>shell command</option>
+               </term>
+               <listitem>
+                       Executes a shell command one time before conky displays anything and puts output as text.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>processes</option></command>
+               </term>
+               <listitem>
+                       Total processes (sleeping and running)
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>running_processes</option></command>
+               </term>
+               <listitem>
+                       Running processes (not sleeping), requires Linux 2.6
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>shadecolor</option></command>
+                       <option>(color)</option>
+               </term>
+               <listitem>
+                       Change shading color
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>smapi</option></command>
+                       <option>(ARGS)</option>
+               </term>
+               <listitem>
+                       when using smapi, display contents of the /sys/devices/platform/smapi directory. ARGS are either '(FILENAME)' or 'bat (INDEX) (FILENAME)' to display the corresponding files' content. This is a very raw method of accessing the smapi values. When available, better use one of the smapi_* variables instead.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>smapi_bat_perc</option></command>
+                       <option>(INDEX)</option>
+               </term>
+               <listitem>
+                       when using smapi, display the remaining capacity in percent of the battery with index INDEX. This is a separate variable because it supports the 'use_spacer' configuration option.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>smapi_bat_bar</option></command>
+                       <option>(INDEX),(height),(width)</option>
+               </term>
+               <listitem>
+                       when using smapi, display the remaining capacity of the battery with index INDEX as a bar.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>stippled_hr</option></command>
+                       <option>(space)</option>
+               </term>
+               <listitem>
+                       Stippled (dashed) horizontal line
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>swapbar</option></command>
+                       <option>(height),(width)</option>
+               </term>
+               <listitem>
+                       Bar that shows amount of swap in use
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>swap</option></command>
+               </term>
+               <listitem>
+                       Amount of swap in use
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>swapmax</option></command>
+               </term>
+               <listitem>
+                       Total amount of swap
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>swapperc</option></command>
+               </term>
+               <listitem>
+                       Percentage of swap in use
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>sysname</option></command>
+               </term>
+               <listitem>
+                       System name, Linux for example
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>tcp_portmon</option></command>
+                       <option>port_begin port_end item (index)</option>
+                       <emphasis>(ip4 only at present)</emphasis>
+               </term>
+               <listitem>
+                       TCP port monitor for specified local ports.  Port numbers must be in the range 1 to 65535. Valid items are:
+                       <simplelist>
+                               <member><command>count</command> - total number of connections in the range
+                               </member>
+                               <member><command>rip</command> - remote ip address
                                </member>
-                       <member><command>rservice</command> - remote service name from /etc/services
+                               <member><command>rhost</command> - remote host name
                                </member>
-                       <member><command>lip</command> - local ip address
+                               <member><command>rport</command> - remote port number
                                </member>
-                       <member><command>lhost</command> - local host name
+                               <member><command>rservice</command> - remote service name from /etc/services
                                </member>
-                       <member><command>lport</command> - local port number
+                               <member><command>lip</command> - local ip address
                                </member>
-                       <member><command>lservice</command> - local service name from /etc/services
+                               <member><command>lhost</command> - local host name
                                </member>
-               </simplelist>The connection index provides you with access to each connection in the port monitor.  The monitor will return information for index values from 0 to n-1 connections.  Values higher than n-1 are simply ignored.  For the "count" item, the connection index must be omitted.  It is required for all other items.
-               <simplelist>
-                       <member>Examples:</member>
-                       <member><command>${tcp_portmon 6881 6999 count}</command> -
-                               displays the number of connections in the bittorrent port range</member>
-                       <member><command>${tcp_portmon 22 22 rip 0}</command> -
-                               displays the remote host ip of the first sshd connection</member>
-                       <member><command>${tcp_portmon 22 22 rip 9}</command> -
-                               displays the remote host ip of the tenth sshd connection</member>
-                       <member><command>${tcp_portmon 1 1024 rhost 0}</command> -
-                               displays the remote host name of the first connection on a privileged port</member>
-                       <member><command>${tcp_portmon 1 1024 rport 4}</command> -
-                               displays the remote host port of the fifth connection on a privileged port</member>
-                       <member><command>${tcp_portmon 1 65535 lservice 14}</command> -
-                               displays the local service name of the fifteenth connection in the range of all ports</member>
-               </simplelist>Note that port monitor variables which share the same port range actually refer to the same monitor, so many references to a single port range for different items and different indexes all use the same monitor internally.  In other words, the program avoids creating redundant monitors.
-       </listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>texeci</option></command>
-               <option>interval command</option>
-       </term>
-       <listitem>
-               Runs a command at an interval inside a thread and displays the output.  Same as $execi, except the command is run inside a thread.  Use this if you have a slow script to keep Conky updating.  You should make the interval slightly longer then the time it takes your script to execute.  For example, if you have a script that take 5 seconds to execute, you should make the interval at least 6 seconds. See also $execi.
-               <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>offset</option></command>
-               <option>(pixels)</option>
-       </term>
-       <listitem>
-               Move text over by N pixels.  See also $voffset.
-               <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>rss</option></command>
-               <option>url delay_in_minutes action item_num</option>
-       </term>
-       <listitem>
-               Download and parse RSS feeds. Action may be one of the following: feed_title, item_title (with num par), item_desc (with num par) and item_titles.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>tab</option></command>
-               <option>(width, (start))</option>
-       </term>
-       <listitem>
-        Puts a tab of the specified width, starting from column 'start'.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>tail</option></command>
-               <option>logfile lines (interval)</option>
-       </term>
-       <listitem>
-               Displays last N lines of supplied text text file. If interval is not supplied, Conky assumes 2x Conky's interval. Max of 30 lines can be displayed, or until the text buffer is filled.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>time</option></command>
-       <option>(format)</option>
-       </term>
-       <listitem>
-               Local time, see man strftime to get more information about format
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>utime</option></command>
-       <option>(format)</option>
-       </term>
-       <listitem>
-               Display time in UTC (universal coordinate time).
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>tztime</option></command>
-       <option>(timezone) (format)</option>
-       </term>
-       <listitem>
-               Local time for specified timezone, see man strftime to get more information about format. The timezone argument is  specified in similar fashion as TZ environment variable. For hints, look in /usr/share/zoneinfo. e.g. US/Pacific, Europe/Zurich, etc.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>totaldown</option></command>
-       <option>net</option>
-       </term>
-       <listitem>
-               Total download, overflows at 4 GB on Linux with 32-bit arch and there doesn't seem to be a way to know how many times it has already done that before conky has started.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>top</option></command>
-       <option>type, num</option>
-       </term>
-       <listitem>
-               This takes arguments in the form:top (name) (number) Basically, processes are ranked from highest to lowest in terms of cpu usage, which is what (num) represents. The types are: "name", "pid", "cpu", "mem", "mem_res", "mem_vsize", and "time". There can be a max of 10 processes listed.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>top_mem</option></command>
-       <option>type, num</option>
-       </term>
-       <listitem>
-               Same as top, except sorted by mem usage instead of cpu
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>totalup</option></command>
-       <option>net</option>
-       </term>
-       <listitem>
-               Total upload, this one too, may overflow
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>updates</option></command>
-       <option>Number of updates</option>
-       </term>
-       <listitem>
-               for debugging
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>upspeed</option></command>
-       <option>net</option>
-       </term>
-       <listitem>
-               Upload speed in kilobytes
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>upspeedf</option></command>
-       <option>net</option>
-       </term>
-       <listitem>
-               Upload speed in kilobytes with one decimal
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>upspeedgraph</option></command>
-               <option>net (height),(width) (gradient colour 1) (gradient colour 2) (scale)</option>
-       </term>
-       <listitem>
-               Upload speed graph, colours defined in hex, minus the #.  If scale is non-zero, it becomes the scale for the graph.
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>uptime</option></command>
-       </term>
-       <listitem>
-               Uptime
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>uptime_short</option></command>
-       </term>
-       <listitem>
-               Uptime in a shorter format
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>user_number</option></command>
-       </term>
-       <listitem>
-               Number of users logged in
-               <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>user_names</option></command>
-       </term>
-       <listitem>
-               Lists the names of the users logged in
-               <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>user_terms</option></command>
-       </term>
-       <listitem>
-               Lists the consoles in use
-               <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>user_times</option></command>
-       </term>
-       <listitem>
-               Lists how long users have been logged in for
-               <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>voffset</option></command>
-               <option>(pixels)</option>
-       </term>
-       <listitem>
-               Change vertical offset by N pixels.  Negative values will cause text to overlap.  See also $offset.
-               <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>voltage_mv</option></command>
-               <option>(n)</option>
-       </term>
-       <listitem>
-               Returns CPU #n's voltage in mV. CPUs are
-               counted from 1. If omitted, the parameter
-               defaults to 1.
-               <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>voltage_v</option></command>
-               <option>(n)</option>
-       </term>
-       <listitem>
-               Returns CPU #n's voltage in V. CPUs are
-               counted from 1. If omitted, the parameter
-               defaults to 1.
-               <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>wireless_essid</option></command>
-               <option>net</option>
-       </term>
-       <listitem>
-               Wireless access point ESSID (Linux only)
-               <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>wireless_mode</option></command>
-               <option>net</option>
-       </term>
-       <listitem>
-               Wireless mode (Managed/Ad-Hoc/Master) (Linux only)
-               <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>wireless_bitrate</option></command>
-               <option>net</option>
-       </term>
-       <listitem>
-               Wireless bitrate (ie 11 Mb/s) (Linux only)
-               <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>wireless_ap</option></command>
-               <option>net</option>
-       </term>
-       <listitem>
-               Wireless access point MAC address (Linux only)
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>wireless_link_qual</option></command>
-               <option>net</option>
-       </term>
-       <listitem>
-               Wireless link quality (Linux only)
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>wireless_link_qual_max</option></command>
-               <option>net</option>
-       </term>
-       <listitem>
-               Wireless link quality maximum value (Linux only)
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>wireless_link_qual_perc</option></command>
-               <option>net</option>
-       </term>
-       <listitem>
-               Wireless link quality in percents (Linux only)
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>wireless_link_bar</option></command>
-               <option>(height), (width) net</option>
-       </term>
-       <listitem>
-               Wireless link quality bar (Linux only)
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>xmms2_artist</option></command>
-       </term>
-       <listitem>
-               Artist in current XMMS2 song
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>xmms2_album</option></command>
-       </term>
-       <listitem>
-               Album in current XMMS2 song
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>xmms2_title</option></command>
-       </term>
-       <listitem>
-               Title in current XMMS2 song
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>xmms2_genre</option></command>
-       </term>
-       <listitem>
-               Genre in current XMMS2 song
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>xmms2_comment</option></command>
-       </term>
-       <listitem>
-               Comment in current XMMS2 song
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>xmms2_decoder</option></command>
-       </term>
-       <listitem>
-               Decoder plugin used
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>xmms2_transport</option></command>
-       </term>
-       <listitem>
-               Transport plugin used
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>xmms2_url</option></command>
-       </term>
-       <listitem>
-               Full path to current song
-<para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>xmms2_tracknr</option></command>
-       </term>
-       <listitem>
-               Track number in current XMMS2 song
-<para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>xmms2_bitrate</option></command>
-       </term>
-       <listitem>
-       Bitrate of current song
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>xmms2_id</option></command>
-       </term>
-       <listitem>
-               XMMS2 id of current song
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>xmms2_duration</option></command>
-       </term>
-       <listitem>
-               Duration of current song
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>xmms2_elapsed</option></command>
-       </term>
-       <listitem>
-               Song's elapsed time
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>xmms2_size</option></command>
-       </term>
-       <listitem>
-       Size of current song
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>xmms2_percent</option></command>
-       </term>
-       <listitem>
-               Percent of song's progress
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>xmms2_status</option></command>
-       </term>
-       <listitem>
-               XMMS2 status (Playing, Paused, Stopped, or Disconnected)
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>xmms2_bar</option></command>
-       <option>(height),(width)</option>
-       </term>
-       <listitem>
-               Bar of XMMS2's progress
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>xmms2_smart</option></command>
-       </term>
-       <listitem>
-               Prints the song name in either the form "artist - title" or file name, depending on whats available
-       <para></para></listitem>
-</varlistentry>
+                               <member><command>lport</command> - local port number
+                               </member>
+                               <member><command>lservice</command> - local service name from /etc/services
+                               </member>
+                       </simplelist>The connection index provides you with access to each connection in the port monitor.  The monitor will return information for index values from 0 to n-1 connections.  Values higher than n-1 are simply ignored.  For the "count" item, the connection index must be omitted.  It is required for all other items.
+                       <simplelist>
+                               <member>Examples:</member>
+                               <member><command>${tcp_portmon 6881 6999 count}</command> -
+                                       displays the number of connections in the bittorrent port range</member>
+                               <member><command>${tcp_portmon 22 22 rip 0}</command> -
+                                       displays the remote host ip of the first sshd connection</member>
+                               <member><command>${tcp_portmon 22 22 rip 9}</command> -
+                                       displays the remote host ip of the tenth sshd connection</member>
+                               <member><command>${tcp_portmon 1 1024 rhost 0}</command> -
+                                       displays the remote host name of the first connection on a privileged port</member>
+                               <member><command>${tcp_portmon 1 1024 rport 4}</command> -
+                                       displays the remote host port of the fifth connection on a privileged port</member>
+                               <member><command>${tcp_portmon 1 65535 lservice 14}</command> -
+                                       displays the local service name of the fifteenth connection in the range of all ports</member>
+                       </simplelist>Note that port monitor variables which share the same port range actually refer to the same monitor, so many references to a single port range for different items and different indexes all use the same monitor internally.  In other words, the program avoids creating redundant monitors.
+               </listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>texeci</option></command>
+                       <option>interval command</option>
+               </term>
+               <listitem>
+                       Runs a command at an interval inside a thread and displays the output.  Same as $execi, except the command is run inside a thread.  Use this if you have a slow script to keep Conky updating.  You should make the interval slightly longer then the time it takes your script to execute.  For example, if you have a script that take 5 seconds to execute, you should make the interval at least 6 seconds. See also $execi.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>offset</option></command>
+                       <option>(pixels)</option>
+               </term>
+               <listitem>
+                       Move text over by N pixels.  See also $voffset.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>rss</option></command>
+                       <option>url delay_in_minutes action item_num</option>
+               </term>
+               <listitem>
+                       Download and parse RSS feeds. Action may be one of the following: feed_title, item_title (with num par), item_desc (with num par) and item_titles.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>tab</option></command>
+                       <option>(width, (start))</option>
+               </term>
+               <listitem>
+                       Puts a tab of the specified width, starting from column 'start'.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>tail</option></command>
+                       <option>logfile lines (interval)</option>
+               </term>
+               <listitem>
+                       Displays last N lines of supplied text text file. If interval is not supplied, Conky assumes 2x Conky's interval. Max of 30 lines can be displayed, or until the text buffer is filled.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>time</option></command>
+                       <option>(format)</option>
+               </term>
+               <listitem>
+                       Local time, see man strftime to get more information about format
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>utime</option></command>
+                       <option>(format)</option>
+               </term>
+               <listitem>
+                       Display time in UTC (universal coordinate time).
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>tztime</option></command>
+                       <option>(timezone) (format)</option>
+               </term>
+               <listitem>
+                       Local time for specified timezone, see man strftime to get more information about format. The timezone argument is  specified in similar fashion as TZ environment variable. For hints, look in /usr/share/zoneinfo. e.g. US/Pacific, Europe/Zurich, etc.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>totaldown</option></command>
+                       <option>net</option>
+               </term>
+               <listitem>
+                       Total download, overflows at 4 GB on Linux with 32-bit arch and there doesn't seem to be a way to know how many times it has already done that before conky has started.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>top</option></command>
+                       <option>type, num</option>
+               </term>
+               <listitem>
+                       This takes arguments in the form:top (name) (number) Basically, processes are ranked from highest to lowest in terms of cpu usage, which is what (num) represents. The types are: "name", "pid", "cpu", "mem", "mem_res", "mem_vsize", and "time". There can be a max of 10 processes listed.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>top_mem</option></command>
+                       <option>type, num</option>
+               </term>
+               <listitem>
+                       Same as top, except sorted by mem usage instead of cpu
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>totalup</option></command>
+                       <option>net</option>
+               </term>
+               <listitem>
+                       Total upload, this one too, may overflow
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>updates</option></command>
+                       <option>Number of updates</option>
+               </term>
+               <listitem>
+                       for debugging
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>upspeed</option></command>
+                       <option>net</option>
+               </term>
+               <listitem>
+                       Upload speed in kilobytes
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>upspeedf</option></command>
+                       <option>net</option>
+               </term>
+               <listitem>
+                       Upload speed in kilobytes with one decimal
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>upspeedgraph</option></command>
+                       <option>net (height),(width) (gradient colour 1) (gradient colour 2) (scale)</option>
+               </term>
+               <listitem>
+                       Upload speed graph, colours defined in hex, minus the #.  If scale is non-zero, it becomes the scale for the graph.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>uptime</option></command>
+               </term>
+               <listitem>
+                       Uptime
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>uptime_short</option></command>
+               </term>
+               <listitem>
+                       Uptime in a shorter format
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>user_number</option></command>
+               </term>
+               <listitem>
+                       Number of users logged in
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>user_names</option></command>
+               </term>
+               <listitem>
+                       Lists the names of the users logged in
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>user_terms</option></command>
+               </term>
+               <listitem>
+                       Lists the consoles in use
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>user_times</option></command>
+               </term>
+               <listitem>
+                       Lists how long users have been logged in for
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>voffset</option></command>
+                       <option>(pixels)</option>
+               </term>
+               <listitem>
+                       Change vertical offset by N pixels.  Negative values will cause text to overlap.  See also $offset.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>voltage_mv</option></command>
+                       <option>(n)</option>
+               </term>
+               <listitem>
+                       Returns CPU #n's voltage in mV. CPUs are
+                       counted from 1. If omitted, the parameter
+                       defaults to 1.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>voltage_v</option></command>
+                       <option>(n)</option>
+               </term>
+               <listitem>
+                       Returns CPU #n's voltage in V. CPUs are
+                       counted from 1. If omitted, the parameter
+                       defaults to 1.
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>wireless_essid</option></command>
+                       <option>net</option>
+               </term>
+               <listitem>
+                       Wireless access point ESSID (Linux only)
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>wireless_mode</option></command>
+                       <option>net</option>
+               </term>
+               <listitem>
+                       Wireless mode (Managed/Ad-Hoc/Master) (Linux only)
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>wireless_bitrate</option></command>
+                       <option>net</option>
+               </term>
+               <listitem>
+                       Wireless bitrate (ie 11 Mb/s) (Linux only)
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>wireless_ap</option></command>
+                       <option>net</option>
+               </term>
+               <listitem>
+                       Wireless access point MAC address (Linux only)
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>wireless_link_qual</option></command>
+                       <option>net</option>
+               </term>
+               <listitem>
+                       Wireless link quality (Linux only)
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>wireless_link_qual_max</option></command>
+                       <option>net</option>
+               </term>
+               <listitem>
+                       Wireless link quality maximum value (Linux only)
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>wireless_link_qual_perc</option></command>
+                       <option>net</option>
+               </term>
+               <listitem>
+                       Wireless link quality in percents (Linux only)
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>wireless_link_bar</option></command>
+                       <option>(height), (width) net</option>
+               </term>
+               <listitem>
+                       Wireless link quality bar (Linux only)
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>xmms2_artist</option></command>
+               </term>
+               <listitem>
+                       Artist in current XMMS2 song
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>xmms2_album</option></command>
+               </term>
+               <listitem>
+                       Album in current XMMS2 song
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>xmms2_title</option></command>
+               </term>
+               <listitem>
+                       Title in current XMMS2 song
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>xmms2_genre</option></command>
+               </term>
+               <listitem>
+                       Genre in current XMMS2 song
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>xmms2_comment</option></command>
+               </term>
+               <listitem>
+                       Comment in current XMMS2 song
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>xmms2_decoder</option></command>
+               </term>
+               <listitem>
+                       Decoder plugin used
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>xmms2_transport</option></command>
+               </term>
+               <listitem>
+                       Transport plugin used
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>xmms2_url</option></command>
+               </term>
+               <listitem>
+                       Full path to current song
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>xmms2_tracknr</option></command>
+               </term>
+               <listitem>
+                       Track number in current XMMS2 song
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>xmms2_bitrate</option></command>
+               </term>
+               <listitem>
+                       Bitrate of current song
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>xmms2_id</option></command>
+               </term>
+               <listitem>
+                       XMMS2 id of current song
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>xmms2_duration</option></command>
+               </term>
+               <listitem>
+                       Duration of current song
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>xmms2_elapsed</option></command>
+               </term>
+               <listitem>
+                       Song's elapsed time
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>xmms2_size</option></command>
+               </term>
+               <listitem>
+                       Size of current song
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>xmms2_percent</option></command>
+               </term>
+               <listitem>
+                       Percent of song's progress
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>xmms2_status</option></command>
+               </term>
+               <listitem>
+                       XMMS2 status (Playing, Paused, Stopped, or Disconnected)
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>xmms2_bar</option></command>
+                       <option>(height),(width)</option>
+               </term>
+               <listitem>
+                       Bar of XMMS2's progress
+                       <para></para></listitem>
+       </varlistentry>
+
+       <varlistentry>
+               <term>
+                       <command><option>xmms2_smart</option></command>
+               </term>
+               <listitem>
+                       Prints the song name in either the form "artist - title" or file name, depending on whats available
+                       <para></para></listitem>
+       </varlistentry>
 
 </variablelist>

diff --git a/src/bmpx.c b/src/bmpx.c
index 9e12492..ebb7902 100644 (file)
--- a/src/bmpx.c
+++ b/src/bmpx.c
@@ -6,7 +6,7 @@
  *
  * Please see COPYING for details
  *
- * Copyright (c) 2005-2007 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2008 Brenden Matthews, Philip Kovacs, et. al.
  *     (see AUTHORS)
  * All rights reserved.
  *

diff --git a/src/common.c b/src/common.c
index dfd911b..516ce53 100644 (file)
--- a/src/common.c
+++ b/src/common.c
@@ -7,7 +7,7 @@
  * Please see COPYING for details
  *
  * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
- * Copyright (c) 2005-2007 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2008 Brenden Matthews, Philip Kovacs, et. al.
  *     (see AUTHORS)
  * All rights reserved.
  *

diff --git a/src/conky.c b/src/conky.c
index 5bd4da5..5f53160 100644 (file)
--- a/src/conky.c
+++ b/src/conky.c
@@ -7,7 +7,7 @@
  * Please see COPYING for details
  *
  * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
- * Copyright (c) 2005-2007 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2008 Brenden Matthews, Philip Kovacs, et. al.
  *     (see AUTHORS)
  * All rights reserved.
  *

diff --git a/src/conky.h b/src/conky.h
index 84f1cb0..b3dbfdb 100644 (file)
--- a/src/conky.h
+++ b/src/conky.h
@@ -7,7 +7,7 @@
  * Please see COPYING for details
  *
  * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
- * Copyright (c) 2005-2007 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2008 Brenden Matthews, Philip Kovacs, et. al.
  *     (see AUTHORS)
  * All rights reserved.
  *

diff --git a/src/diskio.c b/src/diskio.c
index dbd8164..a4105ac 100644 (file)
--- a/src/diskio.c
+++ b/src/diskio.c
@@ -8,7 +8,7 @@
  * Please see COPYING for details
  *
  * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
- * Copyright (c) 2005-2007 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2008 Brenden Matthews, Philip Kovacs, et. al.
  * (see AUTHORS)
  * All rights reserved.
  *

diff --git a/src/diskio.h b/src/diskio.h
index 410a6e0..1ef2b4b 100644 (file)
--- a/src/diskio.h
+++ b/src/diskio.h
@@ -8,7 +8,7 @@
  * Please see COPYING for details
  *
  * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
- * Copyright (c) 2005-2007 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2008 Brenden Matthews, Philip Kovacs, et. al.
  * (see AUTHORS)
  * All rights reserved.
  *

diff --git a/src/freebsd.c b/src/freebsd.c
index a8afc1a..e0ed9f7 100644 (file)
--- a/src/freebsd.c
+++ b/src/freebsd.c
@@ -6,7 +6,7 @@
  *
  * Please see COPYING for details
  *
- * Copyright (c) 2005-2007 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2008 Brenden Matthews, Philip Kovacs, et. al.
  *     (see AUTHORS)
  * All rights reserved.
  *

diff --git a/src/fs.c b/src/fs.c
index 650be32..ce59be0 100644 (file)
--- a/src/fs.c
+++ b/src/fs.c
@@ -7,7 +7,7 @@
  * Please see COPYING for details
  *
  * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
- * Copyright (c) 2005-2007 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2008 Brenden Matthews, Philip Kovacs, et. al.
  *     (see AUTHORS)
  * All rights reserved.
  *

diff --git a/src/hddtemp.c b/src/hddtemp.c
index ec0d701..36c1410 100644 (file)
--- a/src/hddtemp.c
+++ b/src/hddtemp.c
@@ -7,7 +7,7 @@
  * Please see COPYING for details
  *
  * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
- * Copyright (c) 2005-2007 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2008 Brenden Matthews, Philip Kovacs, et. al.
  *     (see AUTHORS)
  * All rights reserved.
  *

diff --git a/src/linux.c b/src/linux.c
index d8dd5d1..b5b82a7 100644 (file)
--- a/src/linux.c
+++ b/src/linux.c
@@ -8,7 +8,7 @@
  *
  * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
  * Copyright (c) 2007 Toni Spets
- * Copyright (c) 2005-2007 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2008 Brenden Matthews, Philip Kovacs, et. al.
  *     (see AUTHORS)
  * All rights reserved.
  *

diff --git a/src/mail.c b/src/mail.c
index 04929e7..b4cb6bf 100644 (file)
--- a/src/mail.c
+++ b/src/mail.c
@@ -7,7 +7,7 @@
  * Please see COPYING for details
  *
  * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
- * Copyright (c) 2005-2007 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2008 Brenden Matthews, Philip Kovacs, et. al.
  *     (see AUTHORS)
  * All rights reserved.
  *

diff --git a/src/mboxscan.c b/src/mboxscan.c
index 135cff8..275d4cc 100644 (file)
--- a/src/mboxscan.c
+++ b/src/mboxscan.c
@@ -7,7 +7,7 @@
  * Please see COPYING for details
  *
  * Copyright (c) 2006 Marco Candrian <mac@calmar.ws>
- * Copyright (c) 2005-2007 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2008 Brenden Matthews, Philip Kovacs, et. al.
  *     (see AUTHORS)
  * All rights reserved.
  *

diff --git a/src/mboxscan.h b/src/mboxscan.h
index 0d3c601..db1d69d 100644 (file)
--- a/src/mboxscan.h
+++ b/src/mboxscan.h
@@ -7,7 +7,7 @@
  * Please see COPYING for details
  *
  * Copyright (c) 2006 Marco Candrian <mac@calmar.ws>
- * Copyright (c) 2005-2007 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2008 Brenden Matthews, Philip Kovacs, et. al.
  *     (see AUTHORS)
  * All rights reserved.
  *

diff --git a/src/mixer.c b/src/mixer.c
index 674e89b..6585ef9 100644 (file)
--- a/src/mixer.c
+++ b/src/mixer.c
@@ -7,7 +7,7 @@
  * Please see COPYING for details
  *
  * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
- * Copyright (c) 2005-2007 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2008 Brenden Matthews, Philip Kovacs, et. al.
  *     (see AUTHORS)
  * All rights reserved.
  *

diff --git a/src/mpd.c b/src/mpd.c
index 667b981..8a7a785 100644 (file)
--- a/src/mpd.c
+++ b/src/mpd.c
@@ -6,7 +6,7 @@
  *
  * Please see COPYING for details
  *
- * Copyright (c) 2005-2007 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2008 Brenden Matthews, Philip Kovacs, et. al.
  *     (see AUTHORS)
  * All rights reserved.
  *

diff --git a/src/netbsd.c b/src/netbsd.c
index 01feed5..82bcacf 100644 (file)
--- a/src/netbsd.c
+++ b/src/netbsd.c
@@ -7,7 +7,7 @@
  * Please see COPYING for details
  *
  * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
- * Copyright (c) 2005-2007 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2008 Brenden Matthews, Philip Kovacs, et. al.
  *     (see AUTHORS)
  * All rights reserved.
  *

diff --git a/src/openbsd.c b/src/openbsd.c
index 2c18b14..e12df2a 100644 (file)
--- a/src/openbsd.c
+++ b/src/openbsd.c
@@ -7,7 +7,7 @@
  * Please see COPYING for details
  *
  * Copyright (c) 2007 Toni Spets
- * Copyright (c) 2005-2007 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2008 Brenden Matthews, Philip Kovacs, et. al.
  *     (see AUTHORS)
  * All rights reserved.
  *

diff --git a/src/rss.c b/src/rss.c
index e185669..a233e5d 100644 (file)
--- a/src/rss.c
+++ b/src/rss.c
@@ -7,7 +7,7 @@
  * Please see COPYING for details
  *
  * Copyright (c) 2007 Toni Spets
- * Copyright (c) 2005-2007 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2008 Brenden Matthews, Philip Kovacs, et. al.
  *     (see AUTHORS)
  * All rights reserved.
  *

diff --git a/src/solaris.c b/src/solaris.c
index ffa7f20..635665d 100644 (file)
--- a/src/solaris.c
+++ b/src/solaris.c
@@ -6,7 +6,7 @@
  *
  * Please see COPYING for details
  *
- * Copyright (c) 2005-2007 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2008 Brenden Matthews, Philip Kovacs, et. al.
  *     (see AUTHORS)
  * All rights reserved.
  *

diff --git a/src/top.c b/src/top.c
index bf37670..5bf7b03 100644 (file)
--- a/src/top.c
+++ b/src/top.c
@@ -8,7 +8,7 @@
  *
  * Copyright (c) 2005 Adi Zaimi, Dan Piponi <dan@tanelorn.demon.co.uk>,
  *                                       Dave Clark <clarkd@skynet.ca>
- * Copyright (c) 2005-2007 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2008 Brenden Matthews, Philip Kovacs, et. al.
  *     (see AUTHORS)
  * All rights reserved.
  *

diff --git a/src/top.h b/src/top.h
index 4573043..cf0fccf 100644 (file)
--- a/src/top.h
+++ b/src/top.h
@@ -8,7 +8,7 @@
  *
  * Copyright (c) 2005 Adi Zaimi, Dan Piponi <dan@tanelorn.demon.co.uk>,
  *                                       Dave Clark <clarkd@skynet.ca>
- * Copyright (c) 2005-2007 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2008 Brenden Matthews, Philip Kovacs, et. al.
  *     (see AUTHORS)
  * All rights reserved.
  *

diff --git a/src/users.c b/src/users.c
index 8db86ae..04e5564 100644 (file)
--- a/src/users.c
+++ b/src/users.c
@@ -7,7 +7,7 @@
  * Please see COPYING for details
  *
  * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
- * Copyright (c) 2005-2007 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2008 Brenden Matthews, Philip Kovacs, et. al.
  *     (see AUTHORS)
  * All rights reserved.
  *

diff --git a/src/x11.c b/src/x11.c
index 1d8c751..5a18791 100644 (file)
--- a/src/x11.c
+++ b/src/x11.c
@@ -7,7 +7,7 @@
  * Please see COPYING for details
  *
  * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
- * Copyright (c) 2005-2007 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2008 Brenden Matthews, Philip Kovacs, et. al.
  *     (see AUTHORS)
  * All rights reserved.
  *

diff --git a/src/xmms2.c b/src/xmms2.c
index c6215f4..63786cc 100644 (file)
--- a/src/xmms2.c
+++ b/src/xmms2.c
@@ -6,7 +6,7 @@
  *
  * Please see COPYING for details
  *
- * Copyright (c) 2005-2007 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2008 Brenden Matthews, Philip Kovacs, et. al.
  *     (see AUTHORS)
  * All rights reserved.
  *