From f26d9a3e54a89b640902d6ffad4f3d32b76dc97e Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Sat, 24 Nov 2012 14:10:34 +0000
Subject: Add help info for "stream" setting. Also, disable it for non-Twitter
 accounts.

---
 doc/user-guide/commands.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'doc/user-guide')

diff --git a/doc/user-guide/commands.xml b/doc/user-guide/commands.xml
index 7a4baa73..1f463815 100644
--- a/doc/user-guide/commands.xml
+++ b/doc/user-guide/commands.xml
@@ -1022,6 +1022,21 @@
 		</description>
 
 	</bitlbee-setting>
+
+	<bitlbee-setting name="stream" type="boolean" scope="account">
+		<default>true</default>
+
+		<description>
+			<para>
+				For Twitter accounts, this setting enables use of the Streaming API. This automatically gives you incoming DMs as well.
+			</para>
+			
+			<para>
+				For other Twitter-like services, this setting is not supported.
+			</para>
+		</description>
+
+	</bitlbee-setting>
 	
 	<bitlbee-setting name="target_url_length" type="integer" scope="account">
 		<default>20</default>
-- 
cgit v1.2.3


From e9bdfbc7906507289a5ce95fb1704e7cdbbb564c Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Sun, 25 Nov 2012 01:05:53 +0000
Subject: Fix documentation for show_ids setting, it's on by default for a
 while already.

---
 doc/user-guide/commands.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc/user-guide')

diff --git a/doc/user-guide/commands.xml b/doc/user-guide/commands.xml
index 1f463815..82501261 100644
--- a/doc/user-guide/commands.xml
+++ b/doc/user-guide/commands.xml
@@ -1352,7 +1352,7 @@
 	</bitlbee-setting>
 
 	<bitlbee-setting name="show_ids" type="boolean" scope="account">
-		<default>false</default>
+		<default>true</default>
 
 		<description>
 			<para>
-- 
cgit v1.2.3


From 3592b95ac23e243425e20ff9f69f407cb5ec4a74 Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Sun, 25 Nov 2012 20:21:24 +0000
Subject: To address #991, adding a strict commands mode, where one has to use
 "post" to post tweets.

---
 doc/user-guide/commands.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'doc/user-guide')

diff --git a/doc/user-guide/commands.xml b/doc/user-guide/commands.xml
index 82501261..c5c9689a 100644
--- a/doc/user-guide/commands.xml
+++ b/doc/user-guide/commands.xml
@@ -834,6 +834,7 @@
 
 	<bitlbee-setting name="commands" type="boolean" scope="account">
 		<default>true</default>
+		<possible-values>true, false, strict</possible-values>
 
 		<description>
 			<para>
@@ -852,7 +853,7 @@
 			</variablelist>
 
 			<para>
-				Anything that doesn't look like a command will be treated as a tweet. Watch out for typos! :-)
+				Anything that doesn't look like a command will be treated as a tweet. Watch out for typos, or to avoid this behaviour, you can set this setting to <emphasis>strict</emphasis>, which causes the <emphasis>post</emphasis> command to become mandatory for posting a tweet.
 			</para>
 		</description>
 	</bitlbee-setting>
-- 
cgit v1.2.3