diff options
Diffstat (limited to 'doc/user-guide')
-rw-r--r-- | doc/user-guide/commands.xml | 6 | ||||
-rw-r--r-- | doc/user-guide/help.xsl | 2 | ||||
-rw-r--r-- | doc/user-guide/misc.xml | 6 | ||||
-rw-r--r-- | doc/user-guide/quickstart.xml | 62 |
4 files changed, 27 insertions, 49 deletions
diff --git a/doc/user-guide/commands.xml b/doc/user-guide/commands.xml index a3b68fa9..3329c9b3 100644 --- a/doc/user-guide/commands.xml +++ b/doc/user-guide/commands.xml @@ -851,9 +851,9 @@ </para> <variablelist> - <varlistentry><term>undo [<id>]</term><listitem><para>Delete your last Tweet (or one with the given ID)</para></listitem></varlistentry> - <varlistentry><term>rt <screenname|id></term><listitem><para>Retweet someone's last Tweet (or one with the given ID)</para></listitem></varlistentry> - <varlistentry><term>reply <screenname|id></term><listitem><para>Reply to a Tweet (with a reply-to reference)</para></listitem></varlistentry> + <varlistentry><term>undo #[<id>]</term><listitem><para>Delete your last Tweet (or one with the given ID)</para></listitem></varlistentry> + <varlistentry><term>rt <screenname|#id></term><listitem><para>Retweet someone's last Tweet (or one with the given ID)</para></listitem></varlistentry> + <varlistentry><term>reply <screenname|#id></term><listitem><para>Reply to a Tweet (with a reply-to reference)</para></listitem></varlistentry> <varlistentry><term>follow <screenname></term><listitem><para>Start following a person</para></listitem></varlistentry> <varlistentry><term>unfollow <screenname></term><listitem><para>Stop following a person</para></listitem></varlistentry> <varlistentry><term>post <message></term><listitem><para>Post a tweet</para></listitem></varlistentry> diff --git a/doc/user-guide/help.xsl b/doc/user-guide/help.xsl index b7e3c371..5aa16e4f 100644 --- a/doc/user-guide/help.xsl +++ b/doc/user-guide/help.xsl @@ -72,9 +72,11 @@ </xsl:template> <xsl:template match="command-list"> + <xsl:text>These are all root commands. See _b_help <command name>_b_ for more details on each command. </xsl:text> <xsl:for-each select="../bitlbee-command"> <xsl:text> * _b_</xsl:text><xsl:value-of select="@name"/><xsl:text>_b_ - </xsl:text><xsl:value-of select="short-description"/><xsl:text> </xsl:text> </xsl:for-each> + <xsl:text> Most commands can be shortened. For example instead of _b_account list_b_, try _b_ac l_b_. </xsl:text> <xsl:text> </xsl:text> </xsl:template> diff --git a/doc/user-guide/misc.xml b/doc/user-guide/misc.xml index 1aceab56..e081fc74 100644 --- a/doc/user-guide/misc.xml +++ b/doc/user-guide/misc.xml @@ -190,9 +190,9 @@ also have to set the <emphasis>account</emphasis> setting. Example: </para> <ircexample> - <ircline nick="wilmer">chan set &wlm fill_by account</ircline> + <ircline nick="wilmer">chan &wlm set fill_by account</ircline> <ircline nick="root">fill_by = `account'</ircline> - <ircline nick="wilmer">chan set &wlm account msn</ircline> + <ircline nick="wilmer">chan &wlm set account msn</ircline> <ircline nick="root">account = `msn'</ircline> </ircexample> @@ -203,7 +203,7 @@ also/just offline contacts. Example: </para> <ircexample> - <ircline nick="wilmer">chan set &offline show_users offline</ircline> + <ircline nick="wilmer">chan &offline set show_users offline</ircline> <ircline nick="root">show_users = `offline'</ircline> </ircexample> diff --git a/doc/user-guide/quickstart.xml b/doc/user-guide/quickstart.xml index 80c16ffb..23b0bf9b 100644 --- a/doc/user-guide/quickstart.xml +++ b/doc/user-guide/quickstart.xml @@ -52,43 +52,7 @@ When you are finished adding your account(s) use the <emphasis>account on</empha </sect1> <sect1 id="quickstart3"> -<title>Managing Contact Lists: Rename</title> - -<!--quickstart3--> -<para> -<emphasis>Step Three: Managing Contact Lists: Rename</emphasis> -</para> - -<para> -Now BitlBee logs in and downloads the contact list from the IM server. In a few seconds, all your on-line buddies should show up in the control channel. -</para> - -<para> -BitlBee will convert names into IRC-friendly form (for instance: tux@example.com will be given the nickname tux). If you have more than one person who would have the same name by this logic (for instance: tux@example.com and tux@bitlbee.org) the second one to log on will be tux_. The same is true if you have a tux log on to AOL and a tux log on from Yahoo. -</para> - -<para> -It would be easy to get these two mixed up, so BitlBee has a <emphasis>rename</emphasis> command to change the nickname into something more suitable: <emphasis>rename <oldnick> <newnick></emphasis> -</para> - -<ircexample> - <ircline nick="you">rename tux_ bitlbeetux</ircline> - <ircaction nick="tux_">is now known as <emphasis>bitlbeetux</emphasis></ircaction> - <ircline nick="root">Nick successfully changed</ircline> -</ircexample> - -<para> -When finished, type <emphasis>help quickstart4</emphasis> to continue. -</para> - -</sect1> - -<sect1 id="quickstart4"> -<title>Step Four: Managing Contact Lists: Add and Remove.</title> - -<para> -<emphasis>Step Four: Managing Contact Lists: Add and Remove.</emphasis> -</para> +<title>Step Four: Managing Contact Lists: Add, Remove and Rename</title> <para> Now you might want to add some contacts, to do this we will use the <emphasis>add</emphasis> command. It needs two arguments: a connection ID (which can be a number (try <emphasis>account list</emphasis>), protocol name or (part of) the screenname) and the user's handle. It is used in the following way: <emphasis>add <connection> <handle></emphasis> @@ -104,16 +68,20 @@ In this case r2d2 is online, since he/she joins the channel immediately. If the </para> <para> -Lets say you accidentally added r2d3@example.com rather than r2d2@example.com, or maybe you just want to remove a user from your list because you never talk to them. To remove a name you will want to use the <emphasis>remove</emphasis> command: <emphasis>remove <nick></emphasis> +Lets say you accidentally added r2d3@example.com rather than r2d2@example.com, or maybe you just want to remove a user from your list because you never talk to them. To remove a name you will want to use the <emphasis>remove</emphasis> command: <emphasis>remove r2d3</emphasis> </para> <para> -When finished, type <emphasis>help quickstart5</emphasis> to continue. +Finally, if you have multiple users with similar names you may use the <emphasis>rename</emphasis> command to make it easier to remember: <emphasis>rename r2d2_ r2d2_aim</emphasis> +</para> + +<para> +When finished, type <emphasis>help quickstart4</emphasis> to continue. </para> </sect1> -<sect1 id="quickstart5"> +<sect1 id="quickstart4"> <title>Chatting</title> <para> @@ -138,16 +106,24 @@ If you prefer chatting in a separate window, use the <emphasis>/msg</emphasis> o </para> <para> -You know the basics. If you want to get to know more about BitlBee, please type <emphasis>help quickstart6</emphasis>. +You know the basics. If you want to know about some of the neat features BitlBee offers, please type <emphasis>help quickstart5</emphasis>. </para> </sect1> -<sect1 id="quickstart6"> +<sect1 id="quickstart5"> <title>Further Resources</title> <para> -<emphasis>So you want more than just chatting? Or maybe you're just looking for a feature?</emphasis> +<emphasis>So you want more than just chatting? Or maybe you're just looking for more features?</emphasis> +</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. +</para> + +<para> +Account tagging allows you to use the given account name rather than a number when referencing your account. If you wish to turn off your gtalk account, you may <emphasis>account gtalk off</emphasis> rather than <emphasis>account 3 off</emphasis> where "3" is the account number. </para> <para> |