aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/CHANGES4
-rw-r--r--doc/HACKING2
-rw-r--r--doc/user-guide/Installation.xml2
-rw-r--r--doc/user-guide/commands.xml6
-rw-r--r--doc/user-guide/misc.xml4
5 files changed, 9 insertions, 9 deletions
diff --git a/doc/CHANGES b/doc/CHANGES
index c0581832..06e7874a 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -428,7 +428,7 @@ Version 1.2.1:
- Preserving case in Jabber resources of buddies, since these should
officially be treated as case sensitive.
- Fully stripping spaces from AIM screennames, this didn't happen completely
- which severly breaks the IRC protocol.
+ which severely breaks the IRC protocol.
- Removed all the yellow tape around daemon mode, it's pretty mature by now:
testing.bitlbee.org serves all (~30) SSL users from one daemon mode
process without any serious stability issues.
@@ -628,7 +628,7 @@ Version 0.99:
- Most likely fixed the bug that caused BitlBee to use 100% CPU time in
some situations.
- Outgoing MSN typing notifications are now understood correctly by the
- orignal MS Mac/Windows clients (again).
+ original MS Mac/Windows clients (again).
- Added "account add $protocol" to the documentation, got rid of a lot
of over-markup (i.e. overuse of bold-tags), reviewed some other parts.
- Small changes to help.xsl to fix small flaws in the help.txt formatting.
diff --git a/doc/HACKING b/doc/HACKING
index 9d064d58..4fda15f2 100644
--- a/doc/HACKING
+++ b/doc/HACKING
@@ -13,7 +13,7 @@ The API is gone for a while already - which wasn't incredibly intrusive,
just a few functions renamed for slightly better consistency, added some
calls and arguments where that seemed useful, etc.
-However, up to late in the 1.2 series, the IRC core was still spread accross
+However, up to late in the 1.2 series, the IRC core was still spread across
several files, mostly irc.c + irc_commands.c and pieces and bits in
nogaim.c. If you're looking for a textbook example of layer violation, start
there.
diff --git a/doc/user-guide/Installation.xml b/doc/user-guide/Installation.xml
index 6980ba3c..75568936 100644
--- a/doc/user-guide/Installation.xml
+++ b/doc/user-guide/Installation.xml
@@ -72,7 +72,7 @@ root.
<para>
By default, BitlBee runs as the user nobody. You might want
-to run it as a seperate user (some computers run named or apache as nobody).
+to run it as a separate user (some computers run named or apache as nobody).
</para>
<para>
diff --git a/doc/user-guide/commands.xml b/doc/user-guide/commands.xml
index 8c246d5e..403946f6 100644
--- a/doc/user-guide/commands.xml
+++ b/doc/user-guide/commands.xml
@@ -181,7 +181,7 @@
</para>
<para>
- For more infomation about a setting, see <emphasis>help set &lt;setting&gt;</emphasis>.
+ For more information about a setting, see <emphasis>help set &lt;setting&gt;</emphasis>.
</para>
<para>
@@ -239,7 +239,7 @@
</para>
<para>
- For more infomation about a setting, see <emphasis>help set &lt;setting&gt;</emphasis>.
+ For more information about a setting, see <emphasis>help set &lt;setting&gt;</emphasis>.
</para>
<para>
@@ -1890,7 +1890,7 @@
<syntax>transfer &lt;reject&gt;</syntax>
<description>
- <para>Rejects all incoming (not already transferring) file transfers. Since you probably have only one incoming transfer at a time, no id is neccessary. Or is it?</para>
+ <para>Rejects all incoming (not already transferring) file transfers. Since you probably have only one incoming transfer at a time, no id is necessary. Or is it?</para>
</description>
<ircexample>
diff --git a/doc/user-guide/misc.xml b/doc/user-guide/misc.xml
index 4ec80a72..7b1e3951 100644
--- a/doc/user-guide/misc.xml
+++ b/doc/user-guide/misc.xml
@@ -89,7 +89,7 @@ To mark yourself as away, you can just use the <emphasis>/away</emphasis> comman
</para>
<para>
-Away states have different names accross different protocols. BitlBee will try to pick the best available option for every connection:
+Away states have different names across different protocols. BitlBee will try to pick the best available option for every connection:
</para>
<simplelist>
@@ -145,7 +145,7 @@ You can create two kinds of channels. Control channels, and groupchat channels.
</para>
<para>
-Control channels are where you see your contacts. By default, you will have one control channel called &amp;bitlbee, containing all your contacts. But you can create more, if you want, and divide your contact list accross several channels.
+Control channels are where you see your contacts. By default, you will have one control channel called &amp;bitlbee, containing all your contacts. But you can create more, if you want, and divide your contact list across several channels.
</para>
<para>