Merge tag 'upstream/033'

Upstream version 033

Conflicts:
	bti.1

diff --combined bti.xml
index 7bc1e855662ac6e02cc52ee852d2869dd79a8a68,a2efd60eb52bb17699ef6e14b2a6f22e8d3f8840..05b8181a3950a2cf082ce6634400d9a65a7d5fa0
--- 1/bti.xml
--- 2/bti.xml
+++ b/bti.xml
@@@ -78,8 -78,9 +78,9 @@@
                Specify the action which you want to perform.  Valid options
                are "update" to send a message, "friends" to see your friends
                timeline, "public" to track public timeline, "replies" to see
-               replies to your messages and "user" to see a specific user's
-               timeline.  Default is "update".
+               replies to your messages, "user" to see a specific user's
+               timeline and "direct" to send a direct message to a friend.
+               Default is "update".
                </para>
              </listitem>
            </varlistentry>
@@@ -88,7 -89,9 +89,9 @@@
              <listitem>
                <para>
                Specify the user whose messages you want to see when the
-               action is "user".
+               action is "user", and the reciever of the direct message when
+               the action is "direct" (the sender must be following the 
+               receiver).
                </para>
              </listitem>
            </varlistentry>
@@@ -405,9 -408,9 +408,9 @@@
             </varlistentry>
          </variablelist>
           <para>
 -           There is an example config file called
 -           <filename>bti.example</filename> in the source tree that shows
 -           the structure of the file if you need an example to work off of.
 +           There is an example config file in
 +           <filename>/usr/share/doc/bti/examples/bti.example</filename> that shows
 +           the structure of the file.
           </para>
           <para>
             Configuration options have the following priority: