Changeset 6e9ae72 for doc/user-guide


Ignore:
Timestamp:
2011-12-17T13:50:01Z (13 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
18c6d36
Parents:
87dddee (diff), 17f057d (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:

Mainline merge.

Location:
doc/user-guide
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • doc/user-guide/commands.xml

    r87dddee r6e9ae72  
    852852
    853853                        <variablelist>
    854                                 <varlistentry><term>undo [&lt;id&gt;]</term><listitem><para>Delete your last Tweet (or one with the given ID)</para></listitem></varlistentry>
    855                                 <varlistentry><term>rt &lt;screenname|id&gt;</term><listitem><para>Retweet someone's last Tweet (or one with the given ID)</para></listitem></varlistentry>
    856                                 <varlistentry><term>reply &lt;screenname|id&gt;</term><listitem><para>Reply to a Tweet (with a reply-to reference)</para></listitem></varlistentry>
     854                                <varlistentry><term>undo #[&lt;id&gt;]</term><listitem><para>Delete your last Tweet (or one with the given ID)</para></listitem></varlistentry>
     855                                <varlistentry><term>rt &lt;screenname|#id&gt;</term><listitem><para>Retweet someone's last Tweet (or one with the given ID)</para></listitem></varlistentry>
     856                                <varlistentry><term>reply &lt;screenname|#id&gt;</term><listitem><para>Reply to a Tweet (with a reply-to reference)</para></listitem></varlistentry>
    857857                                <varlistentry><term>follow &lt;screenname&gt;</term><listitem><para>Start following a person</para></listitem></varlistentry>
    858858                                <varlistentry><term>unfollow &lt;screenname&gt;</term><listitem><para>Stop following a person</para></listitem></varlistentry>

  • doc/user-guide/help.xsl

    r87dddee r6e9ae72  
    7373
    7474        <xsl:template match="command-list">
     75                <xsl:text>These are all root commands. See _b_help &lt;command name&gt;_b_ for more details on each command.&#10;&#10;</xsl:text>
    7576                <xsl:for-each select="../bitlbee-command">
    7677                        <xsl:text> * _b_</xsl:text><xsl:value-of select="@name"/><xsl:text>_b_ - </xsl:text><xsl:value-of select="short-description"/><xsl:text>&#10;</xsl:text>
    7778                </xsl:for-each>
     79                <xsl:text>&#10;Most commands can be shortened. For example instead of _b_account list_b_, try _b_ac l_b_.&#10;</xsl:text>
    7880                <xsl:text>&#10;</xsl:text>
    7981        </xsl:template>

  • doc/user-guide/misc.xml

    r87dddee r6e9ae72  
    191191
    192192<ircexample>
    193         <ircline nick="wilmer">chan set &amp;wlm fill_by account</ircline>
     193        <ircline nick="wilmer">chan &amp;wlm set fill_by account</ircline>
    194194        <ircline nick="root">fill_by = `account'</ircline>
    195         <ircline nick="wilmer">chan set &amp;wlm account msn</ircline>
     195        <ircline nick="wilmer">chan &amp;wlm set account msn</ircline>
    196196        <ircline nick="root">account = `msn'</ircline>
    197197</ircexample>
    … …  
    204204
    205205<ircexample>
    206         <ircline nick="wilmer">chan set &amp;offline show_users offline</ircline>
     206        <ircline nick="wilmer">chan &amp;offline set show_users offline</ircline>
    207207        <ircline nick="root">show_users = `offline'</ircline>
    208208</ircexample>

  • doc/user-guide/quickstart.xml

    r87dddee r6e9ae72  
    5353
    5454<sect1 id="quickstart3">
    55 <title>Managing Contact Lists: Rename</title>
    56 
    57 <!--quickstart3-->
    58 <para>
    59 <emphasis>Step Three: Managing Contact Lists: Rename</emphasis>
    60 </para>
    61 
    62 <para>
    63 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.
    64 </para>
    65 
    66 <para>
    67 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.
    68 </para>
    69 
    70 <para>
    71 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 &lt;oldnick&gt; &lt;newnick&gt;</emphasis>
    72 </para>
    73 
    74 <ircexample>
    75         <ircline nick="you">rename tux_ bitlbeetux</ircline>
    76         <ircaction nick="tux_">is now known as <emphasis>bitlbeetux</emphasis></ircaction>
    77         <ircline nick="root">Nick successfully changed</ircline>
    78 </ircexample>
    79 
    80 <para>
    81 When finished, type <emphasis>help quickstart4</emphasis> to continue.
    82 </para>
    83 
    84 </sect1>
    85 
    86 <sect1 id="quickstart4">
    87 <title>Step Four: Managing Contact Lists: Add and Remove.</title>
    88 
    89 <para>
    90 <emphasis>Step Four: Managing Contact Lists: Add and Remove.</emphasis>
    91 </para>
     55<title>Step Four: Managing Contact Lists: Add, Remove and Rename</title>
    9256
    9357<para>
    … …  
    10569
    10670<para>
    107 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 &lt;nick&gt;</emphasis>
     71Lets 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>
    10872</para>
    10973
    11074<para>
    111 When finished, type <emphasis>help quickstart5</emphasis> to continue.
     75Finally, 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>
     76</para>
     77
     78<para>
     79When finished, type <emphasis>help quickstart4</emphasis> to continue.
    11280</para>
    11381
    11482</sect1>
    11583
    116 <sect1 id="quickstart5">
     84<sect1 id="quickstart4">
    11785<title>Chatting</title>
    11886
    … …  
    139107
    140108<para>
    141 You know the basics. If you want to get to know more about BitlBee, please type <emphasis>help quickstart6</emphasis>.
     109You know the basics. If you want to know about some of the neat features BitlBee offers, please type <emphasis>help quickstart5</emphasis>.
    142110</para>
    143111
    144112</sect1>
    145113
    146 <sect1 id="quickstart6">
     114<sect1 id="quickstart5">
    147115<title>Further Resources</title>
    148116
    149117<para>
    150 <emphasis>So you want more than just chatting? Or maybe you're just looking for a feature?</emphasis>
     118<emphasis>So you want more than just chatting? Or maybe you're just looking for more features?</emphasis>
     119</para>
     120
     121<para>
     122With multiple channel support you can have contacts for specific protocols in their own channels, for instance, if you <emphasis>/join &amp;msn</emphasis> you will join a channel that only contains your MSN contacts.
     123</para>
     124
     125<para>
     126Account 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.
    151127</para>
    152128
Note: See TracChangeset for help on using the changeset viewer.