diff --git a/doc/conky-howto.xml b/doc/conky-howto.xml
index 1f41ab96..c717c549 100644
--- a/doc/conky-howto.xml
+++ b/doc/conky-howto.xml
@@ -98,11 +98,11 @@ By default, Conky will look for a configuration file in the users home directory
 </p>
 
 <pre caption="Copying the sample configuration to your home directory">
-$ <i>zcat /usr/share/conky-1.4.0/conkyrc.sample.gz >> ~/.conkyrc</i>
+$ <i>zcat /usr/share/conky-1.6.0/conkyrc.sample.gz >> ~/.conkyrc</i>
 </pre>
 
 <note>
-Make sure to replace "1.4.0" with the specific version of Conky you have installed.
+Make sure to replace "1.6.0" with the specific version of Conky you have installed.
 </note>
 
 <p>
diff --git a/doc/conky.1 b/doc/conky.1
index 827f1951..bcaf293d 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 2006-05-13  
+.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
@@ -631,6 +631,42 @@ Download speed in kilobytes with one decimal
 \fB\*(T<\fBdownspeedgraph\fR\*(T>\fR \*(T<\fBnet (height),(width) (gradient colour 1) (gradient colour 2) (scale)\fR\*(T> 
 Download speed graph, colours defined in hex, minus the #. If scale is non-zero, it becomes the scale for the graph.
 
+.TP 
+\fB\*(T<\fBwireless_essid\fR\*(T>\fR \*(T<\fBnet\fR\*(T> 
+Wireless access point ESSID (Linux only)
+
+.TP 
+\fB\*(T<\fBwireless_mode\fR\*(T>\fR \*(T<\fBnet\fR\*(T> 
+Wireless mode (Managed/Ad-Hoc/Master) (Linux only)
+
+.TP 
+\fB\*(T<\fBwireless_bitrate\fR\*(T>\fR \*(T<\fBnet\fR\*(T> 
+Wireless bitrate (ie 11 Mb/s) (Linux only)
+
+.TP 
+\fB\*(T<\fBwireless_ap\fR\*(T>\fR \*(T<\fBnet\fR\*(T> 
+Wireless access point MAC address (Linux only)
+
+.TP 
+\fB\*(T<\fBwireless_link_qual\fR\*(T>\fR \*(T<\fBnet\fR\*(T> 
+Wireless link quality (Linux only)
+
+.TP 
+\fB\*(T<\fBwireless_link_qual_max\fR\*(T>\fR \*(T<\fBnet\fR\*(T> 
+Wireless link quality maximum value (Linux only)
+
+.TP 
+\fB\*(T<\fBwireless_link_qual_perc\fR\*(T>\fR \*(T<\fBnet\fR\*(T> 
+Wireless link quality in percents (Linux only)
+
+.TP 
+\fB\*(T<\fBwireless_link_bar\fR\*(T>\fR \*(T<\fB(height), (width) net\fR\*(T> 
+Wireless link quality bar (Linux only)
+
+.TP 
+\fB\*(T<\fBrss\fR\*(T>\fR \*(T<\fBurl delay_in_minutes action item_num\fR\*(T> 
+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.
+
 .TP 
 \fB\*(T<\fBelse\fR\*(T>\fR 
 Text to show if any of the above are not true
diff --git a/doc/docs.xml b/doc/docs.xml
index 62463ece..f49df587 100644
--- a/doc/docs.xml
+++ b/doc/docs.xml
@@ -16,7 +16,7 @@
       <firstname>Brenden</firstname>
       <surname>Matthews</surname>
     </author>
-    <date>2006-05-13</date>
+    <date>2007-08-08</date>
   </refentryinfo>
 
   <refmeta>
diff --git a/doc/variables.xml b/doc/variables.xml
index 9a3c3ef0..51729a02 100644
--- a/doc/variables.xml
+++ b/doc/variables.xml
@@ -559,6 +559,96 @@
 	<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>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>else</option></command>