Changeset e8c8d00 for doc/user-guide/misc.xml

Timestamp:

2010-03-17T15:15:19Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

60e4df3

Parents:

1c3008a (diff), f9928cb (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:

Merging mainline.

File:

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

doc/user-guide/misc.xml

@@ -86 +86 @@
 
 <para>
-As you might've expected, you can just use the <emphasis>/away</emphasis> command in your IRC client to set an away-state. BitlBee supports most away-states supported by the protocols.
+To mark yourself as away, you can just use the <emphasis>/away</emphasis> command in your IRC client. BitlBee supports most away-states supported by the protocols.
 </para>
 
 <para>
-Not all away states are supported by all protocols, and some protocols have different names for them. BitlBee will try to pick the best available alias from this list for every connection:
+Away states have different names accross different protocols. BitlBee will try to pick the best available option for every connection:
 </para>
 
 <simplelist>
-        <member>Away from computer, Away, Extended away</member>
-        <member>NA, N/A, Not available</member>
-        <member>Busy, Do not disturb, DND, Occupied</member>
-        <member>Be right back, BRB</member>
-        <member>On the phone, Phone, On phone</member>
-        <member>Out to lunch, Lunch, Food</member>
+        <member>Away</member>
+        <member>NA</member>
+        <member>Busy, DND</member>
+        <member>BRB</member>
+        <member>Phone</member>
+        <member>Lunch, Food</member>
         <member>Invisible, Hidden</member>
 </simplelist>
 
 <para>
-So <emphasis>/away Food</emphasis> will set your state to "Out to lunch" on your MSN connection, and for most other connections the default, "Away" or "Away from computer" will be chosen.
+So <emphasis>/away Food</emphasis> will set your state to "Out to lunch" on your MSN connection, and for most other connections the default, "Away" will be chosen.
 </para>
 
@@ -111 +111 @@
 </para>
 
+<para>
+If you want to set an away state for only one of your connections, you can use the per-account <emphasis>away</emphasis> setting. See <emphasis>help set away</emphasis>.
+</para>
+
 </sect1>