add emacs indentation variables to source files in line with current vim settings

[monky] / doc / config_settings.xml

diff --git a/doc/config_settings.xml b/doc/config_settings.xml
index fc5f8c1..2d9ad35 100644 (file)
--- a/doc/config_settings.xml
+++ b/doc/config_settings.xml
@@ -242,6 +242,16 @@
     <varlistentry>
         <term>
             <command>
+                <option>extra_newline</option>
+            </command>
+        </term>
+        <listitem>Put an extra newline at the end when writing to
+        stdout, useful for writing to awesome's wiboxes. 
+        <para /></listitem>
+    </varlistentry>
+    <varlistentry>
+        <term>
+            <command>
                 <option>font</option>
             </command>
         </term>
@@ -333,6 +343,36 @@
     <varlistentry>
         <term>
             <command>
+                <option>lua_draw_hook_post</option>
+            </command>
+            <option>function_name [function arguments]</option>
+        </term>
+        <listitem>
+            <para>This function, if defined, will be called by
+            Conky through each iteration after drawing to the
+            window. Requires X support. Takes any number of
+            optional arguments. Use this hook for drawing things on
+            top of what Conky draws.</para>
+        </listitem>
+    </varlistentry>
+    <varlistentry>
+        <term>
+            <command>
+                <option>lua_draw_hook_pre</option>
+            </command>
+            <option>function_name [function arguments]</option>
+        </term>
+        <listitem>
+            <para>This function, if defined, will be called by
+            Conky through each iteration before drawing to the
+            window. Requires X support. Takes any number of
+            optional arguments. Use this hook for drawing things on
+            top of what Conky draws.</para>
+        </listitem>
+    </varlistentry>
+    <varlistentry>
+        <term>
+            <command>
                 <option>lua_load</option>
             </command>
         </term>
@@ -578,13 +618,16 @@
             </command>
         </term>
         <listitem>if own_window is yes, you may specify type
-        normal, desktop, dock or override (default: normal).
+        normal, desktop, dock, panel 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. 
+        workspaces. Panel windows reserve space along a desktop
+        edge, just like panels and taskbars, preventing maximized
+        windows from overlapping them. The edge is chosen based on
+        the alignment option. 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 /></listitem>
     </varlistentry>
     <varlistentry>
@@ -730,8 +773,19 @@
             <command>
                 <option>update_interval</option>
             </command>
+            <option>seconds</option>
+        </term>
+        <listitem>Update interval 
+        <para /></listitem>
+    </varlistentry>
+    <varlistentry>
+        <term>
+            <command>
+                <option>update_interval_on_battery</option>
+            </command>
+            <option>seconds</option>
         </term>
-        <listitem>Update interval in seconds 
+        <listitem>Update interval when running on batterypower 
         <para /></listitem>
     </varlistentry>
     <varlistentry>