Merge branch 'master' into wip/gsettings

2 files changed, 7 insertions, 4 deletions

diff --git a/help/C/import-supported-file-formats.page b/help/C/import-supported-file-formats.page
index 8f50d125d7..a36ea54579 100644
--- a/help/C/import-supported-file-formats.page
+++ b/help/C/import-supported-file-formats.page
@@ -6,7 +6,7 @@
     
     <link type="guide" xref="import-data" />
 
-    <revision pkgversion="3.0.2" version="0.2" date="2011-07-31" status="final"/>
+    <revision pkgversion="3.0.2" version="0.3" date="2011-10-13" status="final"/>
     <credit type="author">
       <name>Andre Klapper</name>
       <email>ak-47@gmx.net</email>
@@ -78,8 +78,8 @@ Evolution/Mozilla/Outlook CSV/Tab (.csv, .tab):</p>
 <p>CSV (Comma-separated values) or Tabulator files saved by using Evolution, Microsoft Outlook and Mozilla.
 </p></item>
 <item><p>
-Personal Storage Table (.pst):</p>
-<p>A file format used to store local copies of messages, calendar events, and other items within Microsoft software such as Microsoft Exchange Client, Windows Messaging, and Microsoft Outlook.
+Outlook Personal Folders (.pst):</p>
+<p>A file format used to store local copies of messages, calendar events, and other items within Microsoft software such as Microsoft Exchange Client, Windows Messaging, and Microsoft Outlook. It is also called "Personal Storage Table".
 </p></item>
 </list>
 </section>
diff --git a/help/C/mail-encryption-s-mime-manage.page b/help/C/mail-encryption-s-mime-manage.page
index f146fb78fd..2ebad5f483 100644
--- a/help/C/mail-encryption-s-mime-manage.page
+++ b/help/C/mail-encryption-s-mime-manage.page
@@ -6,7 +6,7 @@
 
     <link type="guide" xref="mail-encryption#s-mime"/>
 
-    <revision pkgversion="2.32.1" version="0.1" date="2011-01-05" status="draft"/>
+    <revision pkgversion="3.2.0" version="0.2" date="2011-10-13" status="draft"/>
     <credit type="author">
       <name>Andre Klapper</name>
       <email>ak-47@gmx.net</email>
@@ -24,6 +24,9 @@
 
 <p>Certificates allow you to communicate with others securely over an encrypted connection, or sign a message confirming your identity to the contact. These settings only apply to S/MIME encryption.</p>
 <p>You can import, view, edit (except for your own certificates), and delete your certificates under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Certificates</gui></guiseq>.</p>
+
+<note style="tip"><p>If you get the error "Peer's certificate issuer has been marked as not trusted by the user. (-8172) - Cannot add SMIMEEncKeyPrefs attribute" after adding your mail certificate, go to <gui>Authorities</gui> and enable <gui>Trust this CA to identify email users</gui> for the certificate.</p></note>
+
 <p><gui>Your Certificates</gui> displays a list of certificates that you own. To add a signing certificate, click <gui style="button">Import</gui>, select the file to import, then click <gui style="button">Open</gui> and enter a password.</p>
 <p><gui>Contact Certificates</gui> displays a list of certificates that you have for contacts. These certificates allow you to decrypt messages as well verify signed messages.</p>
 <p><gui>Authorities</gui> displays a list of trusted certificate authorities who verify that your own certificate is valid.</p>