Changeset cfcc587 for doc/user-guide/commands.xml

Timestamp:

2005-11-28T01:14:35Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

ed165fe

Parents:

cf13671 (diff), b20b32f (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 from Wilmer

File:

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

doc/user-guide/commands.xml

@@ -154 +154 @@
                 <ircexample>
                         <ircline nick="ctrlsoft">add 3 gryp@jabber.org grijp</ircline>
-                        <ircaction nick="grijp" hostmask="gryp@jabber.org">has joined <emphasis>#bitlbee</emphasis></ircaction>
+                        <ircaction nick="grijp" hostmask="gryp@jabber.org">has joined <emphasis>&amp;bitlbee</emphasis></ircaction>
                 </ircexample>
         </bitlbee-command>
@@ -357 +357 @@
                 <description>
                         <para>
-                                Some people prefer themself and root to have operator status in #bitlbee, other people don't. You can change these states using this setting.
+                                Some people prefer themself and root to have operator status in &amp;bitlbee, other people don't. You can change these states using this setting.
                         </para>