[svn-upgrade] Integrating new upstream version, bti (010)
[debian/bti.git] / bti.xml
diff --git a/bti.xml b/bti.xml
index d4d73fd..96f424a 100644 (file)
--- a/bti.xml
+++ b/bti.xml
@@ -81,7 +81,8 @@
                only needed by systems that are behind a http proxy.
               </para>
               <para>
-               If no host is specified, the default is to send to twitter.com.
+               If --proxy is not specified but the environment variable
+                'http_proxy' is set the latter will be used.
               </para>
             </listitem>
           </varlistentry>
            <filename>bti.example</filename> in the source tree that shows
            the structure of the file if you need an example to work off of.
          </para>
+         <para>
+           Configuration options have the following priority:
+        </para>
+         <variablelist>
+           <varlistentry>
+             <term></term>
+             <listitem><para>command line option</para></listitem>
+           </varlistentry>
+           <varlistentry>
+            <term></term>
+            <listitem><para>config file option</para></listitem>
+           </varlistentry>
+           <varlistentry>
+             <term></term>
+             <listitem><para>environment variables</para></listitem>
+           </varlistentry>
+         </variablelist>
+        <para>
+          For example, command line options always override any config file
+          option, or any environment variables.
+         </para>
        </refsect1>
 
        <refsect1><title>AUTHOR</title>