[seahorse/mallard-help: 293/337] Rename pages so they're easy to work with.



commit f01aefab5042fb5cbb1cfd97b9277e7987b5d2f2
Author: Aruna Sankaranarayanan <arunasank src gnome org>
Date:   Tue Aug 13 02:27:58 2013 +0530

    Rename pages so they're easy to work with.
    
    All pages about PGP keys - pgp-*.page
    All pages about SSH keys - ssh-*.page
    All pages COMMON to all topics - misc-*.page
    All pages to do with LEARN ABOUT KEYS - about-*.page

 help/C/about-diff-private-public.page         |    4 +-
 help/C/about-key-fingerprint.page             |    9 +--
 help/C/about-key-servers.page                 |   43 ++++++-----
 help/C/about-key-signing.page                 |   22 +++---
 help/C/about-key-strength.page                |   15 ++---
 help/C/about-keyring.page                     |    1 -
 help/C/about-pgp.page                         |    7 +-
 help/C/about-ssh.page                         |    3 +-
 help/C/backup-keys.page                       |   49 -------------
 help/C/connect-other-computer.page            |   37 ----------
 help/C/create-pgp-key.page                    |   55 ---------------
 help/C/create-ssh-key.page                    |   56 ---------------
 help/C/index.page                             |    7 +--
 help/C/key-delete.page                        |   63 -----------------
 help/C/key-disabling.page                     |   31 --------
 help/C/key-expiration-date-change.page        |   59 ----------------
 help/C/key-expiration-date-set.page           |   43 -----------
 help/C/key-expired.page                       |   53 --------------
 help/C/key-fingerprint.page                   |   81 ---------------------
 help/C/key-photoid.page                       |   69 ------------------
 help/C/key-recommend-description.page         |   38 ----------
 help/C/key-select-type.page                   |   27 -------
 help/C/key-servers-what-are-they.page         |   61 ----------------
 help/C/key-signing.page                       |   85 ----------------------
 help/C/key-strength-define.page               |   52 --------------
 help/C/key-strength-select.page               |   59 ----------------
 help/C/key-userid.page                        |   35 ---------
 help/C/keys-export.page                       |   93 -------------------------
 help/C/keys-import.page                       |   65 -----------------
 help/C/keys-keep-secure.page                  |   37 ----------
 help/C/keys-publish.page                      |   76 --------------------
 help/C/keys-retrieve-remote.page              |   72 -------------------
 help/C/keys-subkeys.page                      |   57 ---------------
 help/C/keys-sync.page                         |   54 --------------
 help/C/misc-key-backup.page                   |    9 +--
 help/C/misc-key-delete.page                   |   27 ++++---
 help/C/misc-key-description.page              |    3 +-
 help/C/misc-key-export.page                   |    7 +-
 help/C/misc-key-import.page                   |    3 +-
 help/C/misc-key-revoke.page                   |    3 +-
 help/C/misc-key-secure.page                   |    2 +-
 help/C/passwords-keyring-update-password.page |    2 +-
 help/C/passwords-update-keyring-password.page |   50 -------------
 help/C/pgp-advanced-expiration-set.page       |   13 ++--
 help/C/pgp-advanced-options.page              |   11 ++--
 help/C/pgp-advanced-select-type.page          |   42 +----------
 help/C/pgp-advanced-strength-select.page      |   18 +++---
 help/C/pgp-create.page                        |    7 +-
 help/C/pgp-expiration-change.page             |    4 +-
 help/C/pgp-expired.page                       |   15 ++--
 help/C/pgp-key-advanced-options.page          |   30 --------
 help/C/pgp-photoid.page                       |   22 +++---
 help/C/pgp-publish.page                       |   73 ++++++++++++--------
 help/C/pgp-retrieve-remote.page               |   84 +++++++++++-----------
 help/C/pgp-sync.page                          |   35 +++++-----
 help/C/pgp-userid-add.page                    |    4 +-
 help/C/pgp-userid-primary.page                |    4 +-
 help/C/pgp-userid-remove.page                 |    4 +-
 help/C/pgp-userid.page                        |    4 +-
 help/C/ssh-connect-remote.page                |    4 +-
 help/C/ssh-create.page                        |   11 ++--
 help/C/ssh-key-create-vs-setup.page           |   35 ---------
 help/C/userid-add.page                        |   64 -----------------
 help/C/userid-primary.page                    |   46 ------------
 help/C/userid-remove.page                     |   44 ------------
 help/C/what-diff-private-public.page          |   45 ------------
 help/C/what-is-certificate-key.page.stub      |   32 ---------
 help/C/what-is-keyring.page                   |   51 --------------
 help/C/what-is-pgp-key.page                   |   46 ------------
 help/C/what-is-ssh-key.page                   |   54 --------------
 70 files changed, 242 insertions(+), 2184 deletions(-)
---
diff --git a/help/C/about-diff-private-public.page b/help/C/about-diff-private-public.page
index ceefa39..82d3983 100644
--- a/help/C/about-diff-private-public.page
+++ b/help/C/about-diff-private-public.page
@@ -1,10 +1,10 @@
 <page xmlns="http://projectmallard.org/1.0/";
       xmlns:its="http://www.w3.org/2005/11/its";
       type="topic" style="task"
-      id="about-diff-private-public">
+      id="what-diff-private-public">
   <info>
     <link type="guide" xref="learn-about-keys" group="second"/>
-    <link type="seealso" xref="about-ssh"/>
+    <link type="seealso" xref="what-is-ssh-key"/>
 
     <revision pkgversion="3.8" date="2013-02-26" status="incomplete"/>
 
diff --git a/help/C/about-key-fingerprint.page b/help/C/about-key-fingerprint.page
index 4287352..822ced6 100644
--- a/help/C/about-key-fingerprint.page
+++ b/help/C/about-key-fingerprint.page
@@ -2,7 +2,6 @@
       xmlns:its="http://www.w3.org/2005/11/its";
       type="topic" style="task"
       id="about-key-fingerprint">
-
   <info>
     <link type="guide" xref="learn-about-keys" group="first"/>
 
@@ -34,10 +33,10 @@
   identify the key you are looking for is to compare the fingerprints of the
   two keys with the fingerprint of the key you require.</p>
 
-  <p>It is the fingerprint of a key that is verified when you try to login to a
-  remote computer using <link xref="about-ssh">SSH</link>. While signing a
-  <link xref="about-pgp">PGP</link> key, you must always check the key
-  fingerprint to ensure that you are signing the correct key.</p>
+  <p>It is the fingerprint of a key that is verified when you try to login to
+  a remote computer using <link xref="what-is-ssh-key">SSH</link>. While
+  signing a <link xref="what-is-pgp-key">PGP</link> key, you must always check
+  the key fingerprint to ensure that you are signing the correct key.</p>
 
 <section id="fingerprint-ui">
   <title>Fingerprints on <app>Passwords and Keys</app></title>
diff --git a/help/C/about-key-servers.page b/help/C/about-key-servers.page
index 9a014b5..e794914 100644
--- a/help/C/about-key-servers.page
+++ b/help/C/about-key-servers.page
@@ -2,7 +2,6 @@
       xmlns:its="http://www.w3.org/2005/11/its";
       type="topic" style="task"
       id="about-key-servers">
-
   <info>
     <link type="guide" xref="learn-about-keys"/>
 
@@ -17,37 +16,41 @@
       <years>2013</years>
     </credit>
 
-    <desc>Use key servers to <link xref="pgp-publish">publish</link> keys and
-    <link xref="pgp-retrieve-remote">retrieve</link> remote keys.</desc>
+    <desc>Use key servers to <link xref="keys-publish">publish</link> keys and
+    <link xref="keys-retrieve-remote">retrieve</link> remote keys.</desc>
   </info>
 
   <title>Key servers</title>
 
-  <p>Key servers are computers that store public encryption keys, and share
-  copies of them with other key servers. When you create a new public key you
-  can submit it to a key server via the Internet. When you do this, the key
-  server stores your public key and also shares it with other key servers. This
-  makes it easy for people to <link xref="misc-key-import">import</link> your
-  public key from any key server and use it to encrypt and send files and
-  messages to you. Every key server can be accessed through an Internet
+  <p>Key servers are storage spaces on the Internet that help you to store and
+  retrieve public keys. When you create a new public key you can choose to
+  submit it to a key server. When you do this, the key server notifies the
+  location of your public key to other key servers. This makes it easier for
+  people to import your public key and use it to encrypt all of their
+  communication with you. You can also import someone's public key if you have
+  certain details about them, like their user ID or key ID. There are several
+  key servers present globally, and each of them is equipped with an Internet
   address(URL) which can be used to submit or import public keys.</p>
 
   <p><app>Passwords and Keys</app> provides you an interface to
-  <link xref="pgp-publish">publish</link> your public keys or to
-  find and <link xref="pgp-retrieve-remote">retrieve a remote key</link>.
+  <link xref="keys-publish">publish</link> your public keys or to
+  find and <link xref="keys-retrieve-remote">retrieve a remote key</link>.
   You can also use <app>Passwords and Keys</app> to sync the keys in your
   keyring with the key server so that they are updated when someone
-  <link xref="about-key-signing">signs</link> them or modifies them in some
-  other way.</p>
+  <link xref="key-signing">signs</link> them or modifies them in some other
+  way.</p>
 
   <list>
     <title>Default key servers on <app>Passwords and Keys</app></title>
-    <item>
-      <p>hkp://pool.sks-keyservers.net</p>
-    </item>
-    <item>
-      <p>ldap://keyserver.pgp.com</p>
-    </item>
+      <item>
+        <p>hkp://keyserver.ubuntu.com:11371</p>
+      </item>
+      <item>
+        <p>hkp://pool.sks-keyservers.net</p>
+      </item>
+      <item>
+        <p>ldap://keyserver.pgp.com</p>
+      </item>
   </list>
 
   <note style="info">
diff --git a/help/C/about-key-signing.page b/help/C/about-key-signing.page
index 9c7f020..ad0f13d 100644
--- a/help/C/about-key-signing.page
+++ b/help/C/about-key-signing.page
@@ -23,12 +23,12 @@
 
   <title>Why do keys require a signature?</title>
 
-  <p>Public keys that have been <link xref="pgp-publish">published</link> on
-  <link xref="about-key-servers">key servers</link> contain the
-  <link xref="pgp-userid">user ID</link> of the key owner. It is quite easy for
-  someone to create a fake key with a user ID obtained from a key server. To
-  help people in verifying that your key is indeed genuinely yours, you can
-  sign your key and also ask people you know to sign your key.</p>
+  <p>Public keys that have been <link xref="keys-publish">published</link> on
+  key servers contain the <link xref="key-userid">user ID</link> of the key
+  owner. It is quite easy for someone to create a fake key with a user ID
+  obtained from a key server. To help people in verifying that your key is
+  indeed genuinely yours, you can sign your key and also ask people you know to
+  sign your key.</p>
 
   <p>A <em>web of trust</em> on the Internet is a group of people who have
   verified and signed each other's public keys. You can also establish a web of
@@ -40,12 +40,12 @@
   <title>How do I sign keys?</title>
 
   <p>When you generate a new key, it is automatically signed by you. Any new
-  <link xref="about-subkeys">subkeys</link> that you generate are signed
+  <link xref="keys-subkeys">subkeys</link> that you generate are signed
   automatically too. You can sign a key that you have
-  <link xref="pgp-retrieve-remote">retrieved</link> from a key server or
-  <link xref="misc-key-import">imported</link> into
-  <app>Passwords and Keys</app>.  When you sign a key you are vouching for the
-  it, so carefully verify the details of a key before signing it.</p>
+  <link xref="keys-retrieve-remote">retrieved</link> from a key server or
+  <link xref="keys-import">imported</link> into <app>Passwords and Keys</app>.
+  When you sign a key you are vouching for the it, so carefully verify the
+  details of a key before signing it.</p>
 
   <steps>
     <title>To sign an imported key:</title>
diff --git a/help/C/about-key-strength.page b/help/C/about-key-strength.page
index be0482d..af86952 100644
--- a/help/C/about-key-strength.page
+++ b/help/C/about-key-strength.page
@@ -31,15 +31,12 @@
   <p>It is difficult and more time consuming to break a strong key, but
   stronger keys also slow down the encryption and signing process. You should
   choose your key strength in <app>Passwords and Keys</app> depending on how
-  long you want to use they key. A small key is sufficient if you are going to
-  be using it for a short period of time, but a longer key would be more secure
-  if you are going to be using it for a long period of time.</p>
-
-  <note style="tip">
-    <p>It would take the average computer more than 14 billion years to crack a
-    key that is 2048 bits long, thus a 2048 bit key is usually sufficient for
-    general usage.</p>
-  </note>
+  long you want to use they key. If you are going to be using the key for a
+  very short period, a small key is sufficient while stronger keys should be
+  generated if you are going to use them for longer periods of time. It would
+  take the average computer more than 14 billion years to crack a key that is
+  2048 bits long, thus a 2048 bit key is usually sufficient for general
+  usage.</p>
 
   <!-- stefw: I would suggest basing this page off the current
     reccomendations for key strength. The basic concepts for key
diff --git a/help/C/about-keyring.page b/help/C/about-keyring.page
index 3dc2309..2d36dcb 100644
--- a/help/C/about-keyring.page
+++ b/help/C/about-keyring.page
@@ -5,7 +5,6 @@
 
   <info>
     <link type="guide" xref="learn-about-keys" group="first"/>
-    <link type="guide" xref="index#passwords" group="#first"/>
 
     <revision version="0.1" date="2011-10-23" status="stub"/>
 
diff --git a/help/C/about-pgp.page b/help/C/about-pgp.page
index 7ec3975..bb80739 100644
--- a/help/C/about-pgp.page
+++ b/help/C/about-pgp.page
@@ -1,11 +1,10 @@
 <page xmlns="http://projectmallard.org/1.0/";
       xmlns:its="http://www.w3.org/2005/11/its";
       type="topic" style="task"
-      id="about-pgp">
-
+      id="what-is-pgp-key">
   <info>
     <link type="guide" xref="learn-about-keys" group="first"/>
-    <link type="seealso" xref="about-ssh"/>
+
     <revision version="0.1" date="2011-10-23" status="stub"/>
     <revision pkgversion="3.9" version="0.1" date="2013-07-03" status="review"/>
 
@@ -35,7 +34,7 @@
 
   <p><app>Passwords and Keys</app> is a key management application. Though it
   cannot be used to encrypt or sign files and messages, you can use it to
-  <link xref="about-key-signing">sign</link> trustworthy keys.</p>
+  <link xref="key-signing">sign</link> trustworthy keys.</p>
 
   <p>To secure your communication, you can use email clients like
   <app>Evolution</app> that provide
diff --git a/help/C/about-ssh.page b/help/C/about-ssh.page
index 1df04ae..1e6867f 100644
--- a/help/C/about-ssh.page
+++ b/help/C/about-ssh.page
@@ -1,8 +1,7 @@
 <page xmlns="http://projectmallard.org/1.0/";
       xmlns:its="http://www.w3.org/2005/11/its";
       type="topic" style="task"
-      id="about-ssh">
-
+      id="what-is-ssh-key">
   <info>
     <link type="guide" xref="learn-about-keys" group="first"/>
 
diff --git a/help/C/index.page b/help/C/index.page
index 8e55a98..455c854 100644
--- a/help/C/index.page
+++ b/help/C/index.page
@@ -16,7 +16,7 @@
       <email its:translate="no">jwcampbell gmail com</email>
       <years>2013</years>
     </credit>
-    <credit type="author copyight">
+    <credit type="author copyright">
       <name>Aruna Sankaranarayanan</name>
       <email its:translate="no">aruna evam gmail com</email>
       <years>2013</years>
@@ -30,11 +30,6 @@
     Passwords and Keys
   </title>
 
-  <p>Welcome to the <app>Passwords and Keys</app> help guide. <app>Passwords
-  and Keys</app> creates and stores security tokens, helping
-  to keep your information secure on your computer, and secure when you send
-  information over a network.</p>
-
   <section id="pgp-keys" style="2column">
     <title>PGP keys</title>
 
diff --git a/help/C/misc-key-backup.page b/help/C/misc-key-backup.page
index 4b5f779..9a34f46 100644
--- a/help/C/misc-key-backup.page
+++ b/help/C/misc-key-backup.page
@@ -1,8 +1,7 @@
 <page xmlns="http://projectmallard.org/1.0/";
       xmlns:its="http://www.w3.org/2005/11/its";
       type="topic" style="task"
-      id="misc-key-backup">
-
+      id="backup-keys">
   <info>
     <link type="guide" xref="index#misc"/>
 
@@ -31,15 +30,15 @@
 
   <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
+    <link xref="keys-publish">published</link>, save a copy of it because
+    sometimes a <link xref="key-servers-what-are-they">key server</link> may be
     corrupted or may not be available.</p>
   </note>
 
   <steps>
     <title>To back-up your keys:</title>
     <item>
-      <p><link xref="misc-key-export">Export</link> the key of your choice from
+      <p><link xref="keys-export">Export</link> the key of your choice from
       the list.</p>
     </item>
     <item>
diff --git a/help/C/misc-key-delete.page b/help/C/misc-key-delete.page
index 9154196..14813d8 100644
--- a/help/C/misc-key-delete.page
+++ b/help/C/misc-key-delete.page
@@ -1,8 +1,7 @@
 <page xmlns="http://projectmallard.org/1.0/";
       xmlns:its="http://www.w3.org/2005/11/its";
       type="topic" style="task"
-      id="misc-key-delete">
-
+      id="key-delete">
   <info>
     <link type="guide" xref="index#misc"/>
 
@@ -26,7 +25,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 <link xref="key-servers-what-are-they">key server</link>.</p>
 
   <steps>
     <title>To delete a key:</title>
@@ -34,9 +33,11 @@
         <p>Select the key.</p>
       </item>
       <item>
-       <p>Right click, and choose <gui>Delete</gui>. Alternatively you can
-       also select <guiseq><gui style="menu">Edit</gui>
-       <gui style="menuitem">Delete</gui></guiseq> to delete the key.</p>
+        <p>Right click, and choose <gui>Delete</gui>.</p>
+        <note style="tip">
+          <p>You can also select <guiseq><gui style="menu">Edit</gui>
+         <gui style="menuitem">Delete</gui></guiseq> to delete the key.</p>
+        </note>
       </item>
       <item>
        <p>In the new dialog that opens up, confirm the deletion by ticking
@@ -49,12 +50,14 @@
 
   <note style="important">
     <p>When you delete a key that has been published on a key-server, you
-    delete only the local copy of the key on your computer. The deleted key can
-    still be retrieved from a key server and used to encrypt messages to you.
-    You can also <link xref="misc-key-import">import</link> the deleted key
-    from a key server if you wish to restore it. Such a key stops being valid
-    only when it <link xref="pgp-expired">expires</link> or when you
-    <link xref="misc-key-revoke">revoke</link> it.</p>
+    delete only the local copy of the key on your computer. The
+    deleted key can still be retrieved from a key server and used to encrypt
+    messages to you. You can also
+    <link xref="keys-import">import</link> the deleted key from a
+    key server if you wish to restore it. Such a key can be prevented from
+    being used only when it
+    <link xref="key-expired">expires</link> or when you
+    <link xref="key-disabling">revoke</link> it.</p>
   </note>
 
 </page>
diff --git a/help/C/misc-key-description.page b/help/C/misc-key-description.page
index 8b86953..14de22c 100644
--- a/help/C/misc-key-description.page
+++ b/help/C/misc-key-description.page
@@ -1,8 +1,7 @@
 <page xmlns="http://projectmallard.org/1.0/";
       xmlns:its="http://www.w3.org/2005/11/its";
       type="topic" style="task"
-      id="misc-key-description">
-
+      id="key-recommend-description">
   <info>
     <link type="guide" xref="index#misc"/>
 
diff --git a/help/C/misc-key-export.page b/help/C/misc-key-export.page
index 1c6cf7d..d4a9444 100644
--- a/help/C/misc-key-export.page
+++ b/help/C/misc-key-export.page
@@ -1,8 +1,7 @@
 <page xmlns="http://projectmallard.org/1.0/";
       xmlns:its="http://www.w3.org/2005/11/its";
       type="topic" style="task"
-      id="misc-key-export">
-
+      id="keys-export">
   <info>
     <link type="guide" xref="index#misc"/>
 
@@ -31,7 +30,7 @@
   binary format or an ASCII format. This creates key files on your computer
   which contain all the information about the exported key. This can be useful
   when you want to mail a copy of your key to someone or
-  <link xref="misc-key-backup">backup your keys</link>.</p>
+  <link xref="backup-keys">backup your keys</link>.</p>
 
 <section id="binary">
   <title>Export keys to binary files</title>
@@ -82,7 +81,7 @@
         <p>Expand the <gui>Subkeys</gui> panel.</p>
       </item>
       <item>
-       <p>From the list of <link xref="about-subkeys">subkeys</link>, select
+       <p>From the list of <link xref="keys-subkeys">subkeys</link>, select
        the key you wish to export.</p>
       </item>
       <item>
diff --git a/help/C/misc-key-import.page b/help/C/misc-key-import.page
index 3cd5e64..bf355c2 100644
--- a/help/C/misc-key-import.page
+++ b/help/C/misc-key-import.page
@@ -1,8 +1,7 @@
 <page xmlns="http://projectmallard.org/1.0/";
       xmlns:its="http://www.w3.org/2005/11/its";
       type="topic" style="task"
-      id="misc-key-import">
-
+      id="keys-import">
   <info>
     <link type="guide" xref="index#misc"/>
 
diff --git a/help/C/misc-key-revoke.page b/help/C/misc-key-revoke.page
index d804506..1df7078 100644
--- a/help/C/misc-key-revoke.page
+++ b/help/C/misc-key-revoke.page
@@ -1,8 +1,7 @@
 <page xmlns="http://projectmallard.org/1.0/";
       xmlns:its="http://www.w3.org/2005/11/its";
       type="topic" style="task"
-      id="misc-key-revoke">
-
+      id="key-disabling">
   <info>
     <link type="guide" xref="index#misc"/>
 
diff --git a/help/C/misc-key-secure.page b/help/C/misc-key-secure.page
index 39649b4..5ce65f3 100644
--- a/help/C/misc-key-secure.page
+++ b/help/C/misc-key-secure.page
@@ -1,7 +1,7 @@
 <page xmlns="http://projectmallard.org/1.0/";
       xmlns:its="http://www.w3.org/2005/11/its";
       type="topic" style="task"
-      id="misc-key-secure">
+      id="keys-keep-secure">
   <info>
     <link type="guide" xref="index#misc"/>
 
diff --git a/help/C/passwords-keyring-update-password.page b/help/C/passwords-keyring-update-password.page
index d8096e7..25ea94c 100644
--- a/help/C/passwords-keyring-update-password.page
+++ b/help/C/passwords-keyring-update-password.page
@@ -1,7 +1,7 @@
 <page xmlns="http://projectmallard.org/1.0/";
       xmlns:its="http://www.w3.org/2005/11/its";
       type="topic" style="task"
-      id="passwords-keyring-update-password">
+      id="passwords-update-keyring-password">
 
   <info>
     <link type="guide" xref="index#passwords"/>
diff --git a/help/C/pgp-advanced-expiration-set.page b/help/C/pgp-advanced-expiration-set.page
index 8964e01..9d99d8b 100644
--- a/help/C/pgp-advanced-expiration-set.page
+++ b/help/C/pgp-advanced-expiration-set.page
@@ -1,10 +1,10 @@
 <page xmlns="http://projectmallard.org/1.0/";
       xmlns:its="http://www.w3.org/2005/11/its";
       type="topic" style="task"
-      id="pgp-advanced-expiration-set">
+      id="key-expiration-date-set">
 
   <info>
-    <link type="guide" xref="pgp-advanced-options" group="second"/>
+    <link type="guide" xref="pgp-key-advanced-options" group="second"/>
 
     <revision version="0.1" date="2011-10-23" status="stub"/>
     <revision pkgversion="3.9" version="0.1" date="2013-07-06" status="review"/>
@@ -24,8 +24,8 @@
 
   <p><app>Passwords and Keys</app> creates PGP keys that are valid forever, by
   default. However, you can set your PGP keys to
-  <link xref="pgp-expired">expire</link> while creating them. You can also
-  <link xref="pgp-expiration-change">change</link> the expiry date on your
+  <link xref="key-expired">expire</link> while creating them. You can also
+  <link xref="key-expiration-date-change">change</link> the expiry date on your
   keys.</p>
 
   <steps>
@@ -34,8 +34,9 @@
       <p>Untick the <gui style="checkbox">Never Expires</gui> checkbox.</p>
     </item>
     <item>
-      <p>Choose the new expiry date and time from the drop down menus. You can
-      also manually enter the expiry date and time for your key.</p>
+      <p>Choose the new expiry date and time from the drop down menus
+      displaying the date and time. You can also manually enter the expiry date
+      and time for your key.</p>
     </item>
   </steps>
 
diff --git a/help/C/pgp-advanced-options.page b/help/C/pgp-advanced-options.page
index 9efe191..9da504a 100644
--- a/help/C/pgp-advanced-options.page
+++ b/help/C/pgp-advanced-options.page
@@ -1,8 +1,7 @@
 <page xmlns="http://projectmallard.org/1.0/";
       xmlns:its="http://www.w3.org/2005/11/its";
       type="guide" style="task"
-      id="pgp-advanced-options">
-
+      id="pgp-key-advanced-options">
   <info>
     <link type="guide" xref="index#pgp-keys" group="second"/>
 
@@ -22,10 +21,10 @@
   <title>Advanced PGP key options</title>
 
   <p> Expand the <gui>Advanced key options</gui> panel while
-  <link xref="pgp-create">creating</link> a PGP key to change the default
-  <link xref="pgp-advanced-select-type">key type</link>,
-  <link xref="pgp-advanced-expiration-set">key expiration date</link> and
-  <link xref="pgp-advanced-strength-select">key strength</link>.
+  <link xref="create-pgp-key">creating</link> a PGP key to change the default
+  <link xref="key-select-type">key type</link>,
+  <link xref="key-expiration-date-set">key expiration date</link> and
+  <link xref="key-strength-select">key strength</link>.
   </p>
 
 </page>
diff --git a/help/C/pgp-advanced-select-type.page b/help/C/pgp-advanced-select-type.page
index 75a54a3..764a0dd 100644
--- a/help/C/pgp-advanced-select-type.page
+++ b/help/C/pgp-advanced-select-type.page
@@ -1,10 +1,10 @@
 <page xmlns="http://projectmallard.org/1.0/";
       xmlns:its="http://www.w3.org/2005/11/its";
       type="guide" style="task"
-      id="pgp-advanced-select-type">
-
+      id="key-select-type">
   <info>
-    <link type="guide" xref="pgp-advanced-options"/>
+    <link type="guide" xref="index#pgp-keys"/>
+    <link type="guide" xref="pgp-key-advanced-options"/>
 
     <revision version="0.1" date="2011-06-17" status="draft"/>
     <revision pkgversion="3.9" version="0.1" date="2011-07-18" status="draft"/>
@@ -17,45 +17,11 @@
       <years>2013</years>
     </credit>
 
-    <desc>Depending on your needs, create keys that can be used for signing
-    only or for both encryption and signing.</desc>
+    <desc>DSA-Elgamal or RSA? What are sign only keys?</desc>
   </info>
 
   <title>Select key encryption type</title>
 
   <!--To explain selection betwen RSA, DSA-Elgamal, RSA Sign only, DSA Sign only-->
 
-  <p>Using <app>Passwords and Keys</app>, you can create keys for encryption
-  and <link xref="about-key-signing">signing</link>, or for signing-only.</p>
-
-  <terms>
-  <title>Key types:</title>
-    <item>
-    <title>RSA</title>
-      <p>This key type can be used to sign and encrypt. It uses the RSA
-      algorithm for both.</p>
-    </item>
-    <item>
-    <title>DSA-ELGamal</title>
-      <p>This key type can be used to sign and encrypt. It uses the DSA
-      algorithm while signing keys and the ELGamal algorithm for
-      encryption.</p>
-    </item>
-    <item>
-    <title>RSA(sign only)</title>
-      <p>This key type can only be used to sign other keys. It uses the RSA
-      algorithm for the same.</p>
-    </item>
-    <item>
-    <title>DSA(sign only)</title>
-      <p>This key type can only be used to sign other keys. It uses the DSA
-      algorithm for the same.</p>
-    </item>
-  </terms>
-
-  <note style="tip">
-    <p>Both the RSA and DSA-ELGamal algorithms generate equally strong keys.
-    For all general purposes, any one of the two can be chosen.</p>
-  </note>
-
 </page>
diff --git a/help/C/pgp-advanced-strength-select.page b/help/C/pgp-advanced-strength-select.page
index 623a396..e9d9776 100644
--- a/help/C/pgp-advanced-strength-select.page
+++ b/help/C/pgp-advanced-strength-select.page
@@ -1,9 +1,9 @@
 <page xmlns="http://projectmallard.org/1.0/";
       xmlns:its="http://www.w3.org/2005/11/its";
       type="topic" style="task"
-      id="pgp-advanced-strength-select">
+      id="key-strength-select">
   <info>
-    <link type="guide" xref="pgp-advanced-options"/>
+    <link type="guide" xref="pgp-key-advanced-options"/>
 
     <revision version="0.1" date="2011-10-23" status="stub"/>
     <revision pkgversion="3.9" version="0.1" date="2013-07-02" status="review"/>
@@ -29,14 +29,14 @@
   <title>What key strength should I use?</title>
 
   <p>When you create a key or a subkey you can choose its
-  <link xref="about-key-strength">key strength</link>.
+  <link xref="key-strength-define">key strength</link>.
   <app>Passwords and Keys</app> gives you a key strength of 2048 bits by
   default.</p>
 
   <steps>
     <title>Selecting your key strength:</title>
       <item>
-       <p>While <link xref="pgp-create">creating a PGP key</link>, you
+       <p>When <link xref="create-pgp-key">creating a PGP key</link>, you
        can expand the <gui>Advanced key options</gui> panel to select settings
        for key strength.</p>
       </item>
@@ -48,12 +48,12 @@
        bits to 4096 bits.</p>
       </item>
   </steps>
-
   <note style="info">
-    <p>You can also manually enter the key strength in the textbox next to
-    <gui>Key Strength(bits)</gui>. If the value you enter is not divisible by
-    32, <app>Passwords and Keys</app> will change the value you enter to the
-    nearest multiple of 32. This number will be used as the key strength.</p>
+         <p>You can also manually enter the key strength in the textbox provided
+         next to <gui>Key Strength(bits)</gui>. If the value you enter is not
+         divisible by 32, <app>Passwords and Keys</app> will change the value you
+         enter to the nearest multiple of 32. This number will be used as the key
+         strength.</p>
   </note>
 
 </page>
diff --git a/help/C/pgp-create.page b/help/C/pgp-create.page
index 5607fa4..b7e2eef 100644
--- a/help/C/pgp-create.page
+++ b/help/C/pgp-create.page
@@ -2,7 +2,6 @@
       xmlns:its="http://www.w3.org/2005/11/its";
       type="topic" style="task"
       id="pgp-create">
-
   <info>
     <link type="guide" xref="index#pgp-keys" group="#first"/>
 
@@ -21,7 +20,7 @@
 
   <title>Create a new PGP key</title>
 
-  <p>A <link xref="about-pgp"><em>PGP key</em></link> will allow to
+  <p>A <link xref="what-is-pgp-key"><em>PGP key</em></link> will allow to
   encrypt your email and files. Here is how to create a new key:</p>
 
   <steps>
@@ -32,7 +31,7 @@
     add a comment, such as whether the key is a personal key or a key for work,
     your date of birth, or the date you created the key. These details when
     taken together are called your
-    <link xref="pgp-userid">user ID</link>.</p></item>
+    <link xref="key-userid">user ID</link>.</p></item>
     <item><p>Click <gui>Create</gui>.</p></item>
     <item><p>Enter a password, then confirm the password and click
     <gui>Create</gui>.</p></item>
@@ -41,7 +40,7 @@
   <note style="info">
     <p>You can change default settings for key expiration, key strength and
     key type by expanding the
-    <link xref="pgp-advanced-options"><gui>Advanced key options</gui></link>
+    <link xref="pgp-key-advanced-options"><gui>Advanced key options</gui></link>
     panel.</p>
   </note>
 
diff --git a/help/C/pgp-expiration-change.page b/help/C/pgp-expiration-change.page
index ec47d2b..ff1dd57 100644
--- a/help/C/pgp-expiration-change.page
+++ b/help/C/pgp-expiration-change.page
@@ -1,7 +1,7 @@
 <page xmlns="http://projectmallard.org/1.0/";
       xmlns:its="http://www.w3.org/2005/11/its";
       type="topic" style="task"
-      id="pgp-expiration-change">
+      id="key-expiration-date-change">
 
   <info>
     <link type="guide" xref="index#pgp-keys"/>
@@ -46,7 +46,7 @@
         </item>
         <item>
          <p>To change the expiration date of a
-         <link xref="about-subkeys">subkey</link>, expand the
+         <link xref="keys-subkeys">subkey</link>, expand the
          <gui>Subkeys</gui> panel and select the subkey of your choice from
          the list. Press the <gui style="button">Expire</gui> button on the
          left of the panel and select the new expiration date of your
diff --git a/help/C/pgp-expired.page b/help/C/pgp-expired.page
index 2225671..17a0a59 100644
--- a/help/C/pgp-expired.page
+++ b/help/C/pgp-expired.page
@@ -1,8 +1,7 @@
 <page xmlns="http://projectmallard.org/1.0/";
       xmlns:its="http://www.w3.org/2005/11/its";
       type="topic" style="task"
-      id="pgp-expired">
-
+      id="key-expired">
   <info>
     <link type="guide" xref="index#pgp-keys"/>
 
@@ -35,15 +34,15 @@
   </list>
 
   <p>Depending on how long you want your key to be valid, you can
-  <link xref="pgp-advanced-expiration-set">set an expiration date</link> for
-  it. By default, <app>Passwords and Keys</app> sets all keys to be valid
-  forever. That is, the keys never expire.</p>
+  <link xref="key-expiration-date-set">set an expiration date</link> for it. By
+  default, <app>Passwords and Keys</app> sets all keys to be valid forever,
+  that is the keys never expire.</p>
 
   <p>The expiration date on a key can be
-  <link xref="pgp-expiration-change">changed</link> anytime, even after
+  <link xref="key-expiration-date-change">changed</link> anytime, even after
   the key has expired. However, if you want to stop using the expired key, you
-  should <link xref="misc-key-delete">delete</link> or
-  <link xref="misc-key-revoke">revoke</link> it.</p>
+  should <link xref="key-delete">delete</link> or
+  <link xref="key-disabling">revoke</link> it.</p>
 
   <note style="info">
     <p>If you have any messages encrypted with an expired key, you must change
diff --git a/help/C/pgp-photoid.page b/help/C/pgp-photoid.page
index 351b8dc..73349c6 100644
--- a/help/C/pgp-photoid.page
+++ b/help/C/pgp-photoid.page
@@ -1,8 +1,7 @@
 <page xmlns="http://projectmallard.org/1.0/";
       xmlns:its="http://www.w3.org/2005/11/its";
       type="topic" style="task"
-      id="pgp-photoid">
-
+      id="key-photoid">
   <info>
     <link type="guide" xref="index#pgp-keys"/>
 
@@ -27,8 +26,8 @@
   ownership of your keys after looking at your photo. Though a key with an
   attached photo will provide a slightly better level of security than a key
   with no photo, checking the photo on a key is not as safe as checking the
-  <link xref="about-key-fingerprint">fingerprint of the key</link> because
-  anyone having your photos can create a key with your photo ID while the key
+  <link xref="key-fingerprint">fingerprint of the key</link> because anyone
+  having your photos can create a key with your photo ID while the key
   fingerprint cannot be mimicked.</p>
 
   <note style="info">
@@ -54,18 +53,17 @@
       </item>
       <item>
         <p>Select the photo of your choice from anywhere on your computer.</p>
+        <note style="info">
+          <p>The photos you select should be small in size, preferably about
+         120 by 150 pixels. Since a photo ID is always attached to its key, a
+         large photo will increase the key size and slow down all operations
+         that use the key. <app>Passwords and Keys</app> resizes large photos
+         to the optimal size after asking for your confirmation.</p>
+        </note>
       </item>
       <item>
         <p>Click <gui style="button">Close</gui> to finish.</p>
       </item>
   </steps>
 
-  <note style="tip">
-    <p>The photos you select should be small in size, preferably about 120 by
-    150 pixels. Since a photo ID is always attached to its key, a large photo
-    will increase the key size and slow down all operations that use the key.
-    <app>Passwords and Keys</app> resizes large photos to the optimal size
-    after asking for your confirmation.</p>
-  </note>
-
 </page>
diff --git a/help/C/pgp-publish.page b/help/C/pgp-publish.page
index 252136b..9cfed21 100644
--- a/help/C/pgp-publish.page
+++ b/help/C/pgp-publish.page
@@ -1,8 +1,7 @@
 <page xmlns="http://projectmallard.org/1.0/";
       xmlns:its="http://www.w3.org/2005/11/its";
       type="topic" style="task"
-      id="pgp-publish">
-
+      id="keys-publish">
   <info>
     <link type="guide" xref="index#pgp-keys"/>
 
@@ -23,40 +22,56 @@
   <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
+  <link xref="what-is-pgp-key">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
+  <link xref="import-keys">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>
 
   <steps>
     <title>How do I publish my key?</title>
-    <item>
-      <p>Select the PGP key you want to publish.</p>
-    </item>
-    <item>
-      <p>Select <guiseq><gui style="menu">Remote</gui>
-      <gui style="menuitem">Sync and Publish Keys…</gui></guiseq>.</p>
-    </item>
-    <item>
-      <p>Click the <gui style="button">Key Servers</gui> button to see the list
-      of key servers on which you can publish your public key.</p>
-    </item>
-    <item>
-      <p>From the <gui style="group">Publish keys to</gui> menu, select the key
-      server that you want to publish your key on.</p>
-    </item>
-    <item>
-      <p>Tick the
-      <gui style="checkbox">Automatically retrieve keys from key servers</gui>
-      checkbox to retrieve any key that is published on the server you have
-      selected in the previous step. You can also tick the
-      <gui style="checkbox">Automatically sync modified keys with key servers</gui>
-      checkbox to ensure that any modifications to a key on the key server,
-      like a signature, are updated on your copy of the key too.</p>
-      <!--Not sure about this - Aruna 18/08/2013-->
-    </item>
+      <item>
+        <p>Select the PGP key you want to publish.</p>
+      </item>
+      <item>
+       <p>Select <guiseq><gui style="menu">Remote</gui>
+       <gui style="menuitem">Sync and Publish Keys…</gui></guiseq>.</p>
+      </item>
+      <item>
+       <p>Click the <gui style="button">Key Servers</gui> button.</p>
+      </item>
+      <item>
+       <p>Three <link xref="key-servers-what-are-they">key servers</link>
+       will already be listed by <app>Passwords and Keys</app>.</p>
+       <note style="tip">
+         <p>You can also add the key server of your choice to the list by
+         clicking the <gui style="add">Add</gui> button. Select the
+         appropriate key server type. Key servers are identified by the
+         protocol they use to communicate. Look for the first few letters in
+         the Internet URL of your key server to identify its type. In the
+         <gui style="input">Host</gui> field, paste the Internet URL of your
+         key server, and click <gui style="button">OK</gui>. To remove a key
+         server from the list, select it with your mouse and click
+         <gui style="button">Remove</gui>.</p>
+       </note>
+      </item>
+      <item>
+       <p>From the drop down box next to
+       <gui style="group">Publish keys to</gui>, select the key server that
+       you want to publish your key on.</p>
+      </item>
+      <item>
+       <p>Check the
+       <gui style="checkbox">Automatically retrieve keys from key servers</gui>
+       checkbox to retrieve any key that is published on the
+       server you have selected in the previous step. You can also check the
+       <gui style="checkbox">Automatically sync modified keys with key servers</gui>
+       checkbox to ensure that any modifications to a key on the
+       key server, like a signature are updated on your copy of the key
+       too.</p>
+      </item>
   </steps>
 
 </page>
diff --git a/help/C/pgp-retrieve-remote.page b/help/C/pgp-retrieve-remote.page
index f9e2053..c59136b 100644
--- a/help/C/pgp-retrieve-remote.page
+++ b/help/C/pgp-retrieve-remote.page
@@ -1,9 +1,7 @@
 <page xmlns="http://projectmallard.org/1.0/";
       xmlns:its="http://www.w3.org/2005/11/its";
       type="topic" style="task"
-
-      id="pgp-retrieve-remote">
-
+      id="keys-retrieve-remote">
   <info>
     <link type="guide" xref="index#pgp-keys"/>
 
@@ -25,50 +23,50 @@
 
   <title>Retrieve remote keys</title>
 
-  <p>You may want to import the <em>public keys</em> of people you frequently
+  <p>You may want to import the <em>Public keys</em> of people you frequently
   communicate with to make it easier to encrypt messages to them.
-  <app>Passwords and Keys</app> helps you to import a specific key when you
-  have certain details about it, like the key ID or the owner's name or email
-  address etc.</p>
+  <app>Passwords and Keys</app> helps you to import those keys about which you
+  have specific information, like the key ID or the owner's name or email
+  address.</p>
 
   <steps>
     <title>To retrieve a remote key:</title>
-    <item>
-      <p>Select <guiseq><gui style="menu">Remote</gui>
-      <gui style="menuitem">Find Remote Keys…</gui></guiseq>.</p>
-    </item>
-    <item>
-      <p>In the new dialog that opens up, type in any information about the key
-      you wish to retrieve, in the text box next to the
-      <gui>Search for keys containing</gui> label. Details like key ID, or the
-      key owner's email address give more accurate results than the name of the
-      key owner.</p>
-    </item>
-    <item>
-      <p>You can additionally check which key servers must be searched in order
-      to find the key you are interested in by clicking the small <gui>+</gui>
-      next to <gui>Where to search</gui> and checking the key servers you are
-      interested in. All the key servers are checked, by default.</p>
-    </item>
-    <item>
-      <p>When you have specified enough information, press the
-      <gui style="button">Search</gui> button.</p>
-    </item>
-    <item>
-      <p>You will see a list of keys that are relevant search results. To
-      verify a key from the list before importing it, select it and press the
-      <gui style="button">Properties</gui> button, found at the top.
-      Alternatively you can also right click on the key and select
-      <gui style="menuitem">Properties</gui>. This opens a dialog that shows
-      you all information about the key, like the key ID, key fingerprint,
-      level of trust, owner's name, etc.</p>
-    </item>
-    <item>
-      <p>Once you have verified a key, select it from the list and press the
-      <gui style="button">Import</gui> button present at the top to import the
-      key into <app>Passwords and keys</app>. Alternatively, you can also right
-      click on the key and select <gui style="menuitem">Import</gui>.</p>
-    </item>
+      <item>
+        <p>Select <guiseq><gui style="menu">Remote</gui>
+       <gui style="menuitem">Find Remote Keys…</gui></guiseq>.</p>
+      </item>
+      <item>
+       <p>In the new dialog that opens up, type in any information about the
+       key you wish to retrieve, in the text box next to the
+       <gui>Search for keys containing</gui> label. Details like key ID, or
+       the key owner's email address give more accurate results than the name
+       of the key owner.</p>
+      </item>
+      <item>
+       <p>You can additionally check which key servers must be searched in
+       order to find the key you are interested in by clicking the small
+       <gui>+</gui> next to <gui>Where to search</gui> and checking the key
+       servers you are interested in. All the key servers are checked, by
+       default.</p>
+      </item>
+      <item>
+       <p>When you have specified enough information, press the
+       <gui style="button">Search</gui> button.</p>
+      </item>
+      <item>
+       <p>You will be presented a list of keys that are relevant search
+       results. Select the key of your choice from the results and press the
+       <gui style="button">Import</gui> button present on the toolbar to
+       import the key into your keyring. You can press the
+       <gui style="button">Properties</gui> button to verify information about
+       the key, like the key ID, key fingerprint, level of trust, owner's
+       name, etc.</p>
+       <note style="tip">
+         <p>You can also right click on the key and select
+         <gui style="menuitem">Import</gui> or
+         <gui style="menuitem">Properties</gui>.</p>
+       </note>
+      </item>
   </steps>
 
 </page>
diff --git a/help/C/pgp-sync.page b/help/C/pgp-sync.page
index 600d763..8b7bffd 100644
--- a/help/C/pgp-sync.page
+++ b/help/C/pgp-sync.page
@@ -1,8 +1,7 @@
 <page xmlns="http://projectmallard.org/1.0/";
       xmlns:its="http://www.w3.org/2005/11/its";
       type="topic" style="task"
-      id="pgp-sync">
-
+      id="keys-sync">
   <info>
     <link type="guide" xref="index#pgp-keys"/>
 
@@ -17,7 +16,7 @@
       <years>2013</years>
     </credit>
 
-    <desc>Have your local key copies update every change made to a key on a
+    <desc>Have your local key copies update every change made to the key on the
     key server.</desc>
   </info>
 
@@ -30,26 +29,26 @@
 
   <steps>
     <title>How do I sync a key?</title>
-    <item>
-      <p>Select the PGP key you wish to sync.</p>
-    </item>
-    <item>
-      <p>Select <guiseq><gui style="menu">Remote</gui>
-      <gui style="menuitem">Sync and Publish Keys…</gui></guiseq>.</p>
-    </item>
-    <item>
-      <p>Click the <gui style="button">Sync</gui> button to sync your
-      key.</p>
-    </item>
+      <item>
+        <p>Select the PGP key you wish to sync.</p>
+      </item>
+      <item>
+        <p>Select <guiseq><gui style="menu">Remote</gui>
+        <gui style="menuitem">Sync and Publish Keys…</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Click the <gui style="button">Sync</gui> button to sync your
+        key.</p>
+      </item>
   </steps>
 
   <note style="important">
     <title>Why is the <gui style="button">Sync</gui> button not
     clickable?</title>
-    <p>Only PGP keys that have been published on a key server can be synced.
-    If the <gui style="button">Sync</gui> button is not clickable, check if
-    the key has been published on a key server. In the case of syncing your
-    own keys, publish them, before syncing them.</p>
+      <p>Only PGP keys that have been published on a key server can be synced.
+      If the <gui style="button">Sync</gui> button is not clickable, check if
+      the key has been published on a key server. In the case of syncing your
+      own keys, publish them, before syncing them.</p>
   </note>
 
 </page>
diff --git a/help/C/pgp-userid-add.page b/help/C/pgp-userid-add.page
index 35fec6a..50b4367 100644
--- a/help/C/pgp-userid-add.page
+++ b/help/C/pgp-userid-add.page
@@ -1,10 +1,10 @@
 <page xmlns="http://projectmallard.org/1.0/";
       xmlns:its="http://www.w3.org/2005/11/its";
       type="topic" style="task"
-      id="pgp-userid-add">
+      id="userid-add">
 
   <info>
-    <link type="guide" xref="pgp-userid#add-remove"/>
+    <link type="guide" xref="key-userid#add-remove"/>
 
     <revision version="0.1" date="2011-10-23" status="stub"/>
     <revision pkgversion="3.9" version="0.1" date="2013-06-27" status="review"/>
diff --git a/help/C/pgp-userid-primary.page b/help/C/pgp-userid-primary.page
index 2d00228..fb89b84 100644
--- a/help/C/pgp-userid-primary.page
+++ b/help/C/pgp-userid-primary.page
@@ -1,9 +1,9 @@
 <page xmlns="http://projectmallard.org/1.0/";
       xmlns:its="http://www.w3.org/2005/11/its";
       type="topic" style="task"
-      id="pgp-userid-primary">
+      id="userid-primary">
   <info>
-    <link type="guide" xref="pgp-userid#add-remove"/>
+    <link type="guide" xref="key-userid#add-remove"/>
 
     <revision version="0.1" date="2011-10-23" status="stub"/>
     <revision pkgversion="3.9" version="0.1" date="2013-06-27" status="draft"/>
diff --git a/help/C/pgp-userid-remove.page b/help/C/pgp-userid-remove.page
index 58a91cd..36413c8 100644
--- a/help/C/pgp-userid-remove.page
+++ b/help/C/pgp-userid-remove.page
@@ -1,10 +1,10 @@
 <page xmlns="http://projectmallard.org/1.0/";
       xmlns:its="http://www.w3.org/2005/11/its";
       type="topic" style="task"
-      id="pgp-userid-remove">
+      id="userid-remove">
 
   <info>
-    <link type="guide" xref="pgp-userid#add-remove"/>
+    <link type="guide" xref="key-userid#add-remove"/>
 
     <revision version="0.1" date="2011-10-23" status="stub"/>
     <revision pkgversion="3.9" version="0.1" date="2013-06-27" status="draft"/>
diff --git a/help/C/pgp-userid.page b/help/C/pgp-userid.page
index 0024e50..843e671 100644
--- a/help/C/pgp-userid.page
+++ b/help/C/pgp-userid.page
@@ -1,7 +1,7 @@
 <page xmlns="http://projectmallard.org/1.0/";
       xmlns:its="http://www.w3.org/2005/11/its";
       type="guide" style="task"
-      id="pgp-userid">
+      id="key-userid">
   <info>
     <link type="guide" xref="index#pgp-keys"/>
 
@@ -25,7 +25,7 @@
   <p>When you create a key, you provide details, like your name, email and a
   key description. This information together constitutes a user ID. A good user
   ID helps people to recognize your key when they are trying to
-  <link xref="misc-key-import">import</link> it. It is important to
+  <link xref="keys-import">import</link> it. It is important to
   fill in authentic information while creating your user ID.</p>
 
   <section id="add-remove" style="2column">
diff --git a/help/C/ssh-connect-remote.page b/help/C/ssh-connect-remote.page
index 9d5c30a..c76d021 100644
--- a/help/C/ssh-connect-remote.page
+++ b/help/C/ssh-connect-remote.page
@@ -1,7 +1,7 @@
 <page xmlns="http://projectmallard.org/1.0/";
       xmlns:its="http://www.w3.org/2005/11/its";
       type="topic" style="task"
-      id="ssh-connect-remote">
+      id="connect-other-computer">
   <info>
     <link type="guide" xref="index#ssh-keys"/>
 
@@ -14,7 +14,7 @@
       <email its:translate="no">jwcampbell gmail com</email>
     </credit>
 
-    <credit type="author">
+    <credit> type="author">
       <name>Aruna Sankaranarayanan</name>
       <email its:translate="no">aruna evam gmail com</email>
     </credit>
diff --git a/help/C/ssh-create.page b/help/C/ssh-create.page
index 2d2eb97..d83ce18 100644
--- a/help/C/ssh-create.page
+++ b/help/C/ssh-create.page
@@ -3,7 +3,6 @@
       xmlns:ui = "http://projectmallard.org/ui/1.0/";
       type="topic" style="task"
       id="ssh-create">
-
   <info>
     <link type="guide" xref="index#ssh-keys"/>
 
@@ -25,7 +24,7 @@
   <p>An SSH key will help you to create a secure connection between computers.
   Creating an SSH key creates both a <em>Public</em> and a <em>Private</em>
   key. Here is how to create a new key:</p>
-
+  
     <steps>
       <item><p>Click <guiseq><gui>File</gui><gui>New</gui></guiseq>.</p></item>
       <item><p>Select <gui>Secure Shell Key</gui> and then click
@@ -38,20 +37,20 @@
       <item><p>You can change default settings for encryption type or key
       strength by expanding the Advanced key options panel.</p></item>
     </steps>
-
+    
   <p>At this point, you can either just create your key, or create your key
   and set it up on a remote server.</p>
-
+  
   <section id="ssh-just-create-key" ui:expanded="true">
     <title>Just create your key</title>
     <p>Instructions for just creating keys.</p>
-
+    
   </section>
 
   <section id="ssh-create-key-and-set-up" ui:expanded="false">
     <title>Create your key and install it on a remote computer</title>
     <p>Instructions to create it and set it up.</p>
-
+    
   </section>
 
 </page>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]