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

Timestamp:

2015-05-09T19:50:30Z (10 years ago)

Author:

dequis <dx@…>

Children:

ec8b369

Parents:

356e2dd (diff), 5014380 (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 'develop' into feat/hip-cat

Conflicts:

protocols/jabber/hipchat.c
protocols/jabber/iq.c
protocols/jabber/jabber.h

File:

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

doc/user-guide/commands.xml

@@ -121 +121 @@
                         <description>
                                 <para>
-                                        This commands deletes an account from your account list. You should signoff the account before deleting it.
+                                        This command deletes an account from your account list. You should signoff the account before deleting it.
                                 </para>
 
@@ -853 +853 @@
                                 <varlistentry><term>favourite &lt;screenname|#id&gt;</term><listitem><para>Favo<emphasis>u</emphasis>rite the given user's most recent tweet, or the given tweet ID.</para></listitem></varlistentry>
                                 <varlistentry><term>post &lt;message&gt;</term><listitem><para>Post a tweet</para></listitem></varlistentry>
+                                <varlistentry><term>url &lt;screenname|#id&gt;</term><listitem><para>Show URL for a tweet to open it in a browser (and see context)</para></listitem></varlistentry>
                         </variablelist>