Changeset 3fbce97 for doc/user-guide/misc.xml

Timestamp:

2016-09-24T20:14:34Z (8 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

ba52ac5

Parents:

63cad66 (diff), 82cb190 (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 branch 'master' into parson

File:

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

doc/user-guide/misc.xml

@@ -90 +90 @@
 
 <para>
-Away states have different names accross different protocols. BitlBee will try to pick the best available option for every connection:
+Away states have different names across different protocols. BitlBee will try to pick the best available option for every connection:
 </para>
 
@@ -146 +146 @@
 
 <para>
-Control channels are where you see your contacts. By default, you will have one control channel called &amp;bitlbee, containing all your contacts. But you can create more, if you want, and divide your contact list accross several channels.
+Control channels are where you see your contacts. By default, you will have one control channel called &amp;bitlbee, containing all your contacts. But you can create more, if you want, and divide your contact list across several channels.
 </para>