diff options
| author | Marius Halden <marius.h@lden.org> | 2018-04-19 10:23:08 +0200 |
|---|---|---|
| committer | Marius Halden <marius.h@lden.org> | 2018-04-19 10:23:08 +0200 |
| commit | db02ac8971379f9fee2f3a618bb08b8076d1a83d (patch) | |
| tree | 0e7d46bad6162509300aa73ae6d77e571a5b26d0 /doc/user-guide/quickstart.xml | |
| parent | 6dc54671e368d03ed447d0fbd2d662af6c36b7fd (diff) | |
| parent | 246b98bbdf221448fd7a638fea04373ed1612de5 (diff) | |
Merge branch 'master' into patched-master
Diffstat (limited to 'doc/user-guide/quickstart.xml')
| -rw-r--r-- | doc/user-guide/quickstart.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/user-guide/quickstart.xml b/doc/user-guide/quickstart.xml index 2eda6be1..6de9b953 100644 --- a/doc/user-guide/quickstart.xml +++ b/doc/user-guide/quickstart.xml @@ -42,7 +42,7 @@ For instance, suppose you have a Jabber account at jabber.org with handle <empha </ircexample> <para> -Other built-in IM protocols include msn, oscar and twitter. OSCAR is the protocol used by ICQ and AOL. Some protocols may be available as plugins that you can install, such as facebook, steam, discord and omegle. And you can get even more protocols by using the libpurple variant of BitlBee. +Other built-in IM protocols include oscar and twitter. OSCAR is the protocol used by ICQ and AOL. Some protocols may be available as plugins that you can install, such as facebook, steam, discord and omegle. And you can get even more protocols by using the libpurple variant of BitlBee. </para> <para> @@ -123,7 +123,7 @@ You know the basics. If you want to know about some of the neat features BitlBee </para> <para> -With multiple channel support you can have contacts for specific protocols in their own channels, for instance, if you <emphasis>/join &msn</emphasis> you will join a channel that only contains your MSN contacts. +With multiple channel support you can have contacts for specific protocols in their own channels, for instance, if you <emphasis>/join &jabber</emphasis> you will join a channel that only contains your jabber contacts. </para> <para> |