X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=blobdiff_plain;f=manual%2Faccount.xml;h=baecb52903b75c8f2b5349e1db3fde02a3c9f859;hp=cabc6bb17a209a02fbb8f0e821b7a5fa77946997;hb=e0f41407ce397eed880ba0360d9b5725f9176ed8;hpb=a8576b6fe029dd59075b7abda7e8ae949d2cbab1

diff --git a/manual/account.xml b/manual/account.xml
index cabc6bb17..baecb5290 100644
--- a/manual/account.xml
+++ b/manual/account.xml
@@ -8,17 +8,17 @@
 	The first tab of the account preferences, <quote>Basic</quote>,
 	contains, as its name indicates, basic account data. In this tab you can
 	specify your name, email address, organization and basic connection
-	information.  The name of the account is just the name Sylpheed-Claws
+	information.  The name of the account is just the name Claws Mail
 	will use when referring to this account, for example, in the account
 	switcher at the lower right-hand corner of the main window.  The server
 	information lets you specify the receiving protocol to use (which is
 	not modifiable for existing accounts), the server(s) used to receive or
-	send your emails (usually pop.isp.com and smtp.isp.com) and your login
-	on the receiving server.  
+	send your emails (usually <literal>pop.isp.com</literal> and <literal
+	>smtp.isp.com</literal>) and your login on the receiving server.  
     </para>
     <para>
 	In the <quote>Receive</quote> tab you are able to change the default
-	behaviour of Sylpheed-Claws. For example, leaving messages on the server
+	behaviour of Claws Mail. For example, leaving messages on the server
 	for a while, preventing downloading of mails that are too large, or
 	specifying whether you want the filtering rules to apply to this
 	account's mails. The <quote>Receive size limit</quote> is used to limit
@@ -147,7 +147,7 @@
   <section id="account_multiple">
     <title>Multiple accounts</title>
     <para>
-	You can easily create multiple accounts in Sylpheed-Claws. For POP
+	You can easily create multiple accounts in Claws Mail. For POP
 	accounts, you can choose to store all email from your different accounts
 	in the same folder(s), using the Receive tab preference.  IMAP and News
 	accounts each get their own mailbox in the folder tree.
@@ -163,15 +163,21 @@
   <section id="account_morefilt">
     <title>More filtering</title>
     <para>
-	The filtering rules are global. This means that mails from various
-	accounts can be filtered into another account's folders, for example a
-	mail received by POP3 could be filtered into an IMAP account's folder,
-	and vice-versa. This is either a useful feature or an annoying one,
-	depending on what you want to do.  If you'd rather avoid that, but
-	still want to auomatically sort your incoming mail, the best thing to
-	do is to disable Filtering on the accounts, and use Processing rules in
-	the various Inbox folders you specified. Processing rules are applied
-	when entering the folder.
+	By default filtering rules are global, but they can also be assigned to
+	a specific account. When fetching mail, any rules that are assigned to
+	a specific account will only be applied to mails that are retrieved from
+	that account.   
+    </para>
+    <para>
+	Mail from any account can be filtered into another account's folders,
+	for example, a mail received by POP3 could be filtered into an IMAP
+	account's folder, and vice-versa. This is either a useful feature or an
+	annoying one, depending on what you want to achieve. If you'd rather
+	avoid that, but still want to automatically sort your incoming mail, the
+	best thing to do is to disable Filtering on certain accounts, and use
+	Processing rules in the Inbox folders that you specified, as Processing
+	rules are automatically applied when entering a folder and can be
+	manually applied from a folder's context menu.
     </para>
   </section>