X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=doc%2Fconfig_settings.xml;h=760c3fefc0dc27e4f38094a7faebe292886e037e;hb=f5259295cf4ae642fc3c90151e5aab218aedf85b;hp=2bffbe02c63cad1d98f6fd2c990c9381248cd0d0;hpb=312d3d6de85cb9e3dea42f9ffe86a7e18615b449;p=monky

diff --git a/doc/config_settings.xml b/doc/config_settings.xml
index 2bffbe0..760c3fe 100644
--- a/doc/config_settings.xml
+++ b/doc/config_settings.xml
@@ -137,7 +137,7 @@
 	<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.
+			Default global IMAP server.  Arguments are: "host user pass [-i interval] [-f folder] [-p port] [-e command] [-r retries]".  Default port is 143, default folder is 'INBOX', default interval is 5 minutes, and default number of retries before giving up is 5.  If the password is supplied as '*', you will be prompted to enter the password when Conky starts.
 			<para></para></listitem>
 	</varlistentry>
 
@@ -325,7 +325,7 @@
 	<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.
+			Default global POP3 server.  Arguments are: "host user pass [-i interval] [-p port] [-e command] [-r retries]".  Default port is 110, default interval is 5 minutes, and default number of retries before giving up is 5.  If the password is supplied as '*', you will be prompted to enter the password when Conky starts.
 			<para></para></listitem>
 	</varlistentry>
 
@@ -358,6 +358,30 @@
 	</varlistentry>
 
 	<varlistentry>
+		<term><command><option>temperature_unit</option></command></term>
+		<listitem>
+			Desired output unit of all objects displaying a temperature.
+			Parameters are either "fahrenheit" or "celsius". The default
+			unit is degree Celsius.
+			<para></para></listitem>
+	</varlistentry>
+
+	<varlistentry>
+		<term><command><option>templateN</option></command></term>
+		<listitem>
+			Define a template for later use inside TEXT segments. Substitute N by a digit between 0 and 9, inclusively.
+			The value of the variable is being inserted into the stuff below TEXT at the corresponding position,
+			but before some substitutions are applied:
+			<simplelist>
+				<member>'\n' -> newline</member>
+				<member>'\\' -> backslash</member>
+				<member>'\ ' -> space</member>
+				<member>'\N' -> template argument N</member>
+			</simplelist>
+			<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