[seahorse/wip/userdocs: 202/270] help: Fix link conflicts

[Ekaterina Gerasimova <egerasimov src gnome org>]

commit 94cc117cf9aee8ced5715e39b57039af02ea2d77
Author: Aruna Sankaranarayanan <arunasank src gnome org>
Date:   Wed Aug 28 23:58:25 2013 +0530

    help: Fix link conflicts

 help/C/key-servers-add.page        |    2 --
 help/C/keyring-change-default.page |    2 +-
 help/C/misc-key-backup.page        |    3 +--
 help/C/misc-key-delete.page        |    2 +-
 help/C/pgp-publish.page            |   13 ++++++-------
 5 files changed, 9 insertions(+), 13 deletions(-)
---
diff --git a/help/C/key-servers-add.page b/help/C/key-servers-add.page
index 2af045c..0fc920a 100644
--- a/help/C/key-servers-add.page
+++ b/help/C/key-servers-add.page
@@ -4,8 +4,6 @@
       id="key-servers-add">
 
   <info>
-    <link type="guide" xref="about-key-servers"/>
-
     <revision version="0.1" date="2011-10-23" status="stub"/>
     <revision pkgversion="3.9" date="2013-08-18" status="draft"/>
 
diff --git a/help/C/keyring-change-default.page b/help/C/keyring-change-default.page
index d363cb6..bb707b1 100644
--- a/help/C/keyring-change-default.page
+++ b/help/C/keyring-change-default.page
@@ -21,7 +21,7 @@
 
   <title>Change the default keyring</title>
 
-  <p>When you <link xref="passwords-stored-new-create">add a new
+  <p>When you <link xref="passwords-stored-create">add a new
   password</link>, it is normally added to the default keyring. If you want to
   add it to a different keyring, you can chose another one while adding the new
   password, but you can also change the default keyring. The default keyring is
diff --git a/help/C/misc-key-backup.page b/help/C/misc-key-backup.page
index 4b5f779..49b578e 100644
--- a/help/C/misc-key-backup.page
+++ b/help/C/misc-key-backup.page
@@ -32,8 +32,7 @@
   <note style="tip">
     <p>Even if your public key has been
     <link xref="pgp-publish">published</link>, save a copy of it because
-    sometimes a <link xref="about-key-servers">key server</link> may be
-    corrupted or may not be available.</p>
+    sometimes a key server may be corrupted or may not be available.</p>
   </note>
 
   <steps>
diff --git a/help/C/misc-key-delete.page b/help/C/misc-key-delete.page
index d1d5ee9..31882ff 100644
--- a/help/C/misc-key-delete.page
+++ b/help/C/misc-key-delete.page
@@ -26,7 +26,7 @@
   <p>If you are no longer communicating with someone, you can delete the copy
   of their key on your computer using <app>Passwords and Keys</app>. You can
   also permanently delete a key you own, provided it has never been published
-  on a <link xref="about-key-servers">key server</link>.</p>
+  on a key server.</p>
 
   <steps>
     <title>To delete a key:</title>
diff --git a/help/C/pgp-publish.page b/help/C/pgp-publish.page
index ce239cd..7737435 100644
--- a/help/C/pgp-publish.page
+++ b/help/C/pgp-publish.page
@@ -22,13 +22,12 @@
 
   <title>Publish your public keys</title>
 
-  <p>After <link xref="pgp-create">creating</link> your
-  <link xref="about-pgp">PGP keypair</link> you can choose to publish the
-  <em>public key</em> on the Internet. This allows anyone to
-  <link xref="misc-key-import">import</link> your public keys and send you
-  encrypted files and communication. When you keep your public keys unpublished
-  you can selectively share them with the people you want to communicate
-  with.</p>
+  <p>If you want people to send you encrypted communication, you must share
+  your <gui>GnuPG keys</gui> with them. To share your key with a selected few
+  people, <link xref="misc-key-export">export</link> the desired key and mail
+  the resulting keyfile to them. To allow anyone to
+  <link xref="pgp-retrieve-remote">retrieve</link> and use your public key,
+  publish it on a key server.</p>
 
   <steps>
     <title>How do I publish my key?</title>