Changeset 29ff5c2 for doc/user-guide/misc.xml

Timestamp:

2015-11-21T00:01:50Z (8 years ago)

Author:

dequis <dx@…>

Parents:

e4f08bf (diff), 8fdeaa5 (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 feat/hip-cat

File:

• doc/user-guide/misc.xml (modified) (3 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>
 
@@ -433 +433 @@
 </sect1>
 
+<sect1 id="whatsnew030401">
+<title>New stuff in BitlBee 3.4.1</title>
+
+<simplelist>
+        <member><emphasis>msn:</emphasis> Upgraded protocol version to MSNP21, works again</member>
+        <member><emphasis>jabber:</emphasis> Add "hipchat" protocol, for smoother login. Takes the same username as the official client. Note that unlike the 'hip-cat' branch, this doesn't preload channels. See the <emphasis>HowtoHipchat</emphasis> wiki page for details</member>
+        <member><emphasis>jabber:</emphasis> Gmail notifications support</member>
+        <member><emphasis>twitter:</emphasis> Show quoted tweets inline. Added "url" command, can be used to quote tweets.</member>
+</simplelist>
+
+</sect1>
+
 </chapter>