diff --git a/README b/README index 13e4c96e..4b9ccb63 100644 --- a/README +++ b/README @@ -651,6 +651,44 @@ VARIABLES scale is non-zero, it becomes the scale for the graph. + wireless_essid net + Wireless access point ESSID (Linux only) + + + wireless_mode net + Wireless mode (Managed/Ad-Hoc/Master) (Linux only) + + + wireless_bitrate net + Wireless bitrate (ie 11 Mb/s) (Linux only) + + + wireless_ap net + Wireless access point MAC address (Linux only) + + + wireless_link_qual net + Wireless link quality (Linux only) + + + wireless_link_qual_max net + Wireless link quality maximum value (Linux only) + + + wireless_link_qual_perc net + Wireless link quality in percents (Linux only) + + + wireless_link_bar (height), (width) net + Wireless link quality bar (Linux only) + + + rss url delay_in_minutes action item_num + Download and parse RSS feeds. Action may be one of the follow- + ing: feed_title, item_title (with num par), item_desc (with num + par) and item_titles. + + else Text to show if any of the above are not true @@ -1358,4 +1396,4 @@ AUTHORS - 2006-05-13 conky(1) + 2007-08-08 conky(1) diff --git a/configure.ac.in b/configure.ac.in index 75b424c7..89e8533d 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -3,8 +3,8 @@ dnl $Id$ dnl major, minor and micro version macros. m4_define([conky_version_major], [1]) m4_define([conky_version_minor], [4]) -m4_define([conky_version_micro], [6]) -m4_define([conky_version_tag], []) dnl [] for releases +m4_define([conky_version_micro], [7]) +m4_define([conky_version_tag], [svn]) dnl [] for releases m4_define([conky_version_revision],[r@REVISION@]) m4_define([conky_version], [conky_version_major().conky_version_minor().conky_version_micro()ifelse( diff --git a/doc/conky.1 b/doc/conky.1 index bcaf293d..6cabcc24 100644 --- a/doc/conky.1 +++ b/doc/conky.1 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH conky 1 2007-08-08 "" "" +.TH conky 1 2007-08-08 .SH NAME conky \- A system monitor for X originally based on the torsmo code, but more kickass. It just keeps on given'er. Yeah. .SH SYNOPSIS