Changeset 9c8ae50 for doc/user-guide/commands.xml

Timestamp:

2005-11-19T15:24:46Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

cf13671

Parents:

cc9079e (diff), 2cdd8ce (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge Wilmer

File:

• doc/user-guide/commands.xml (modified) (2 diffs)

doc/user-guide/commands.xml

@@ -303 +303 @@
         </bitlbee-setting>
 
-        <bitlbee-setting name="html" type="string">
-                <default>nostrip</default>
-                <possible-values>strip, nostrip</possible-values>
-
-                <description>
-                        <para>
-                                Determines what BitlBee should do with HTML in messages. If set to nostrip, HTML in messages will not be touched. If set to strip, all HTML will be stripped from messages. Unfortunately this sometimes strips too much.
+        <bitlbee-setting name="strip_html" type="boolean">
+                <default>True</default>
+
+                <description>
+                        <para>
+                                Determines what BitlBee should do with HTML in messages. Normally this is turned on and HTML will be stripped from messages, if BitlBee thinks there is HTML.
+                        </para>
+                        <para>
+                                If BitlBee fails to detect this sometimes (most likely in AIM messages over an ICQ connection), you can set this setting to <emphasis>always</emphasis>, but this might sometimes accidentally strip non-HTML things too.
                         </para>
                 </description>
@@ -462 +464 @@
 
         <bitlbee-setting name="buddy_sendbuffer_delay" type="integer">
-                <description>
-
-                        <para>
-                                Tell BitlBee after how many seconds a buffered message should be sent.
+                <default>200</default>
+
+                <description>
+
+                        <para>
+                                Tell BitlBee after how many (mili)seconds a buffered message should be sent. Values greater than 5 will be interpreted as miliseconds, 5 and lower as seconds.
                         </para>