[seahorse/wip/userdocs: 129/420] Fix links resulting from name changes.



commit 1ea0792ed8e43591370d5fc0d33fac34ec64a742
Author: Aruna Sankaranarayanan <arunasank src gnome org>
Date:   Tue Aug 13 03:36:24 2013 +0530

    Fix links resulting from name changes.

 help/C/about-diff-private-public.page         |    4 ++--
 help/C/about-key-fingerprint.page             |    9 +++++----
 help/C/about-key-servers.page                 |   11 ++++++-----
 help/C/about-key-signing.page                 |   22 +++++++++++-----------
 help/C/about-pgp.page                         |    5 +++--
 help/C/about-ssh.page                         |    3 ++-
 help/C/glossary.page                          |    4 ++--
 help/C/misc-key-backup.page                   |    9 +++++----
 help/C/misc-key-delete.page                   |   11 ++++++-----
 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-control-access.page          |    3 ++-
 help/C/passwords-keyring-change-default.page  |    1 +
 help/C/passwords-keyring-create.page          |    3 ++-
 help/C/passwords-keyring-update-password.page |    2 +-
 help/C/passwords-passphrases.page             |    1 +
 help/C/passwords-stored-new-create.page       |    1 +
 help/C/passwords-view.page                    |    1 +
 help/C/pgp-advanced-expiration-set.page       |    8 ++++----
 help/C/pgp-advanced-options.page              |   11 ++++++-----
 help/C/pgp-advanced-select-type.page          |    5 +++--
 help/C/pgp-advanced-strength-select.page      |    8 ++++----
 help/C/pgp-create.page                        |    7 ++++---
 help/C/pgp-expiration-change.page             |    4 ++--
 help/C/pgp-expired.page                       |   15 ++++++++-------
 help/C/pgp-photoid.page                       |    7 ++++---
 help/C/pgp-publish.page                       |    9 +++++----
 help/C/pgp-retrieve-remote.page               |    3 ++-
 help/C/pgp-sync.page                          |    3 ++-
 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                |    2 +-
 help/C/ssh-create.page                        |   11 ++++++-----
 help/C/subkeys-add.page                       |    3 ++-
 help/C/subkeys-examine.page                   |    5 +++--
 40 files changed, 126 insertions(+), 99 deletions(-)
---
diff --git a/help/C/about-diff-private-public.page b/help/C/about-diff-private-public.page
index 82d3983..ceefa39 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="what-diff-private-public">
+      id="about-diff-private-public">
   <info>
     <link type="guide" xref="learn-about-keys" group="second"/>
-    <link type="seealso" xref="what-is-ssh-key"/>
+    <link type="seealso" xref="about-ssh"/>
 
     <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 822ced6..4287352 100644
--- a/help/C/about-key-fingerprint.page
+++ b/help/C/about-key-fingerprint.page
@@ -2,6 +2,7 @@
       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"/>
 
@@ -33,10 +34,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="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>
+  <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>
 
 <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 e794914..b1cccaa 100644
--- a/help/C/about-key-servers.page
+++ b/help/C/about-key-servers.page
@@ -2,6 +2,7 @@
       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"/>
 
@@ -16,8 +17,8 @@
       <years>2013</years>
     </credit>
 
-    <desc>Use key servers to <link xref="keys-publish">publish</link> keys and
-    <link xref="keys-retrieve-remote">retrieve</link> remote keys.</desc>
+    <desc>Use key servers to <link xref="pgp-publish">publish</link> keys and
+    <link xref="pgp-retrieve-remote">retrieve</link> remote keys.</desc>
   </info>
 
   <title>Key servers</title>
@@ -33,11 +34,11 @@
   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="keys-publish">publish</link> your public keys or to
-  find and <link xref="keys-retrieve-remote">retrieve a remote key</link>.
+  <link xref="pgp-publish">publish</link> your public keys or to
+  find and <link xref="pgp-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="key-signing">signs</link> them or modifies them in some other
+  <link xref="about-key-signing">signs</link> them or modifies them in some other
   way.</p>
 
   <list>
diff --git a/help/C/about-key-signing.page b/help/C/about-key-signing.page
index ad0f13d..9c7f020 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="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>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>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="keys-subkeys">subkeys</link> that you generate are signed
+  <link xref="about-subkeys">subkeys</link> that you generate are signed
   automatically too. You can sign a key that you have
-  <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>
+  <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>
 
   <steps>
     <title>To sign an imported key:</title>
diff --git a/help/C/about-pgp.page b/help/C/about-pgp.page
index bb80739..adc2267 100644
--- a/help/C/about-pgp.page
+++ b/help/C/about-pgp.page
@@ -1,7 +1,8 @@
 <page xmlns="http://projectmallard.org/1.0/";
       xmlns:its="http://www.w3.org/2005/11/its";
       type="topic" style="task"
-      id="what-is-pgp-key">
+      id="about-pgp">
+
   <info>
     <link type="guide" xref="learn-about-keys" group="first"/>
 
@@ -34,7 +35,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="key-signing">sign</link> trustworthy keys.</p>
+  <link xref="about-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 1e6867f..1df04ae 100644
--- a/help/C/about-ssh.page
+++ b/help/C/about-ssh.page
@@ -1,7 +1,8 @@
 <page xmlns="http://projectmallard.org/1.0/";
       xmlns:its="http://www.w3.org/2005/11/its";
       type="topic" style="task"
-      id="what-is-ssh-key">
+      id="about-ssh">
+
   <info>
     <link type="guide" xref="learn-about-keys" group="first"/>
 
diff --git a/help/C/glossary.page b/help/C/glossary.page
index 4062d3a..58e853a 100644
--- a/help/C/glossary.page
+++ b/help/C/glossary.page
@@ -56,8 +56,8 @@
       <title>Key</title>
        <p>A key is used to encrypt and decrypt files and communication. A key
        may also be used to login to a remote computer. Some types of keys are
-       <link xref="what-is-pgp-key">PGP keys</link> and
-       <link xref="what-is-ssh-key">SSH keys</link>.</p>
+       <link xref="about-pgp">PGP keys</link> and
+       <link xref="about-ssh">SSH keys</link>.</p>
     </item>
     <item>
       <title>Keyring</title>
diff --git a/help/C/misc-key-backup.page b/help/C/misc-key-backup.page
index 9a34f46..4b5f779 100644
--- a/help/C/misc-key-backup.page
+++ b/help/C/misc-key-backup.page
@@ -1,7 +1,8 @@
 <page xmlns="http://projectmallard.org/1.0/";
       xmlns:its="http://www.w3.org/2005/11/its";
       type="topic" style="task"
-      id="backup-keys">
+      id="misc-key-backup">
+
   <info>
     <link type="guide" xref="index#misc"/>
 
@@ -30,15 +31,15 @@
 
   <note style="tip">
     <p>Even if your public key has been
-    <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
+    <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>
   </note>
 
   <steps>
     <title>To back-up your keys:</title>
     <item>
-      <p><link xref="keys-export">Export</link> the key of your choice from
+      <p><link xref="misc-key-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 14813d8..18aa0f9 100644
--- a/help/C/misc-key-delete.page
+++ b/help/C/misc-key-delete.page
@@ -1,7 +1,8 @@
 <page xmlns="http://projectmallard.org/1.0/";
       xmlns:its="http://www.w3.org/2005/11/its";
       type="topic" style="task"
-      id="key-delete">
+      id="misc-key-delete">
+
   <info>
     <link type="guide" xref="index#misc"/>
 
@@ -25,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="key-servers-what-are-they">key server</link>.</p>
+  on a <link xref="about-key-servers">key server</link>.</p>
 
   <steps>
     <title>To delete a key:</title>
@@ -53,11 +54,11 @@
     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
+    <link xref="misc-key-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>
+    <link xref="pgp-expired">expires</link> or when you
+    <link xref="misc-key-revoke">revoke</link> it.</p>
   </note>
 
 </page>
diff --git a/help/C/misc-key-description.page b/help/C/misc-key-description.page
index 14de22c..8b86953 100644
--- a/help/C/misc-key-description.page
+++ b/help/C/misc-key-description.page
@@ -1,7 +1,8 @@
 <page xmlns="http://projectmallard.org/1.0/";
       xmlns:its="http://www.w3.org/2005/11/its";
       type="topic" style="task"
-      id="key-recommend-description">
+      id="misc-key-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 d4a9444..1c6cf7d 100644
--- a/help/C/misc-key-export.page
+++ b/help/C/misc-key-export.page
@@ -1,7 +1,8 @@
 <page xmlns="http://projectmallard.org/1.0/";
       xmlns:its="http://www.w3.org/2005/11/its";
       type="topic" style="task"
-      id="keys-export">
+      id="misc-key-export">
+
   <info>
     <link type="guide" xref="index#misc"/>
 
@@ -30,7 +31,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="backup-keys">backup your keys</link>.</p>
+  <link xref="misc-key-backup">backup your keys</link>.</p>
 
 <section id="binary">
   <title>Export keys to binary files</title>
@@ -81,7 +82,7 @@
         <p>Expand the <gui>Subkeys</gui> panel.</p>
       </item>
       <item>
-       <p>From the list of <link xref="keys-subkeys">subkeys</link>, select
+       <p>From the list of <link xref="about-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 bf355c2..3cd5e64 100644
--- a/help/C/misc-key-import.page
+++ b/help/C/misc-key-import.page
@@ -1,7 +1,8 @@
 <page xmlns="http://projectmallard.org/1.0/";
       xmlns:its="http://www.w3.org/2005/11/its";
       type="topic" style="task"
-      id="keys-import">
+      id="misc-key-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 1df7078..d804506 100644
--- a/help/C/misc-key-revoke.page
+++ b/help/C/misc-key-revoke.page
@@ -1,7 +1,8 @@
 <page xmlns="http://projectmallard.org/1.0/";
       xmlns:its="http://www.w3.org/2005/11/its";
       type="topic" style="task"
-      id="key-disabling">
+      id="misc-key-revoke">
+
   <info>
     <link type="guide" xref="index#misc"/>
 
diff --git a/help/C/misc-key-secure.page b/help/C/misc-key-secure.page
index 5ce65f3..39649b4 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="keys-keep-secure">
+      id="misc-key-secure">
   <info>
     <link type="guide" xref="index#misc"/>
 
diff --git a/help/C/passwords-control-access.page b/help/C/passwords-control-access.page
index 1d20a13..2605e46 100644
--- a/help/C/passwords-control-access.page
+++ b/help/C/passwords-control-access.page
@@ -2,8 +2,9 @@
       xmlns:its="http://www.w3.org/2005/11/its";
       type="topic" style="task"
       id="passwords-control-access">
+
   <info>
-    <link type="guide" xref="what-is-keyring"/>
+    <link type="guide" xref="about-keyring"/>
 
     <revision version="0.1" date="2011-06-17" status="stub"/>
     <revision pkgversion="3.9" version="0.1" date="2013-07-23" status="review"/>
diff --git a/help/C/passwords-keyring-change-default.page b/help/C/passwords-keyring-change-default.page
index ee8f01f..2480620 100644
--- a/help/C/passwords-keyring-change-default.page
+++ b/help/C/passwords-keyring-change-default.page
@@ -2,6 +2,7 @@
       xmlns:its="http://www.w3.org/2005/11/its";
       type="topic" style="task"
       id="passwords-keyring-change-default">
+
   <info>
     <link type="guide" xref="index#passwords"/>
 
diff --git a/help/C/passwords-keyring-create.page b/help/C/passwords-keyring-create.page
index 3b3ecf0..8ef5528 100644
--- a/help/C/passwords-keyring-create.page
+++ b/help/C/passwords-keyring-create.page
@@ -2,6 +2,7 @@
       xmlns:its="http://www.w3.org/2005/11/its";
       type="topic" style="task"
       id="passwords-keyring-create">
+
   <info>
     <link type="guide" xref="index#passwords"/>
 
@@ -62,7 +63,7 @@
 
   <note style="tip">
     <p>The password to protect a keyring can be
-    <link xref="passwords-update-keyring-password">updated</link> at any
+    <link xref="passwords-keyring-update-password">updated</link> at any
     time.</p>
   </note>
 
diff --git a/help/C/passwords-keyring-update-password.page b/help/C/passwords-keyring-update-password.page
index 25ea94c..d8096e7 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-update-keyring-password">
+      id="passwords-keyring-update-password">
 
   <info>
     <link type="guide" xref="index#passwords"/>
diff --git a/help/C/passwords-passphrases.page b/help/C/passwords-passphrases.page
index ba6418a..86e130c 100644
--- a/help/C/passwords-passphrases.page
+++ b/help/C/passwords-passphrases.page
@@ -2,6 +2,7 @@
       xmlns:its="http://www.w3.org/2005/11/its";
       type="topic" style="task"
       id="passwords-passphrases">
+
   <info>
     <link type="guide" xref="index#misc"/>
 
diff --git a/help/C/passwords-stored-new-create.page b/help/C/passwords-stored-new-create.page
index 2e26f31..2ae6acb 100644
--- a/help/C/passwords-stored-new-create.page
+++ b/help/C/passwords-stored-new-create.page
@@ -2,6 +2,7 @@
       xmlns:its="http://www.w3.org/2005/11/its";
       type="topic" style="task"
       id="passwords-stored-new-create">
+
   <info>
     <link type="guide" xref="index#passwords"/>
 
diff --git a/help/C/passwords-view.page b/help/C/passwords-view.page
index c9ed144..8f48151 100644
--- a/help/C/passwords-view.page
+++ b/help/C/passwords-view.page
@@ -2,6 +2,7 @@
       xmlns:its="http://www.w3.org/2005/11/its";
       type="topic" style="task"
       id="passwords-view">
+
   <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 9d99d8b..ef04b60 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="key-expiration-date-set">
+      id="pgp-advanced-expiration-set">
 
   <info>
-    <link type="guide" xref="pgp-key-advanced-options" group="second"/>
+    <link type="guide" xref="pgp-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="key-expired">expire</link> while creating them. You can also
-  <link xref="key-expiration-date-change">change</link> the expiry date on your
+  <link xref="pgp-expired">expire</link> while creating them. You can also
+  <link xref="pgp-expiration-change">change</link> the expiry date on your
   keys.</p>
 
   <steps>
diff --git a/help/C/pgp-advanced-options.page b/help/C/pgp-advanced-options.page
index 9da504a..9efe191 100644
--- a/help/C/pgp-advanced-options.page
+++ b/help/C/pgp-advanced-options.page
@@ -1,7 +1,8 @@
 <page xmlns="http://projectmallard.org/1.0/";
       xmlns:its="http://www.w3.org/2005/11/its";
       type="guide" style="task"
-      id="pgp-key-advanced-options">
+      id="pgp-advanced-options">
+
   <info>
     <link type="guide" xref="index#pgp-keys" group="second"/>
 
@@ -21,10 +22,10 @@
   <title>Advanced PGP key options</title>
 
   <p> Expand the <gui>Advanced key options</gui> panel while
-  <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>.
+  <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>.
   </p>
 
 </page>
diff --git a/help/C/pgp-advanced-select-type.page b/help/C/pgp-advanced-select-type.page
index 764a0dd..3e74ced 100644
--- a/help/C/pgp-advanced-select-type.page
+++ b/help/C/pgp-advanced-select-type.page
@@ -1,10 +1,11 @@
 <page xmlns="http://projectmallard.org/1.0/";
       xmlns:its="http://www.w3.org/2005/11/its";
       type="guide" style="task"
-      id="key-select-type">
+      id="pgp-advanced-select-type">
+
   <info>
     <link type="guide" xref="index#pgp-keys"/>
-    <link type="guide" xref="pgp-key-advanced-options"/>
+    <link type="guide" xref="pgp-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"/>
diff --git a/help/C/pgp-advanced-strength-select.page b/help/C/pgp-advanced-strength-select.page
index e9d9776..0251ea3 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="key-strength-select">
+      id="pgp-advanced-strength-select">
   <info>
-    <link type="guide" xref="pgp-key-advanced-options"/>
+    <link type="guide" xref="pgp-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="key-strength-define">key strength</link>.
+  <link xref="about-key-strength">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>When <link xref="create-pgp-key">creating a PGP key</link>, you
+       <p>When <link xref="pgp-create">creating a PGP key</link>, you
        can expand the <gui>Advanced key options</gui> panel to select settings
        for key strength.</p>
       </item>
diff --git a/help/C/pgp-create.page b/help/C/pgp-create.page
index b7e2eef..5607fa4 100644
--- a/help/C/pgp-create.page
+++ b/help/C/pgp-create.page
@@ -2,6 +2,7 @@
       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"/>
 
@@ -20,7 +21,7 @@
 
   <title>Create a new PGP key</title>
 
-  <p>A <link xref="what-is-pgp-key"><em>PGP key</em></link> will allow to
+  <p>A <link xref="about-pgp"><em>PGP key</em></link> will allow to
   encrypt your email and files. Here is how to create a new key:</p>
 
   <steps>
@@ -31,7 +32,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="key-userid">user ID</link>.</p></item>
+    <link xref="pgp-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>
@@ -40,7 +41,7 @@
   <note style="info">
     <p>You can change default settings for key expiration, key strength and
     key type by expanding the
-    <link xref="pgp-key-advanced-options"><gui>Advanced key options</gui></link>
+    <link xref="pgp-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 ff1dd57..ec47d2b 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="key-expiration-date-change">
+      id="pgp-expiration-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="keys-subkeys">subkey</link>, expand the
+         <link xref="about-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 17a0a59..69f4f21 100644
--- a/help/C/pgp-expired.page
+++ b/help/C/pgp-expired.page
@@ -1,7 +1,8 @@
 <page xmlns="http://projectmallard.org/1.0/";
       xmlns:its="http://www.w3.org/2005/11/its";
       type="topic" style="task"
-      id="key-expired">
+      id="pgp-expired">
+
   <info>
     <link type="guide" xref="index#pgp-keys"/>
 
@@ -34,15 +35,15 @@
   </list>
 
   <p>Depending on how long you want your key to be valid, you can
-  <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>
+  <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>
 
   <p>The expiration date on a key can be
-  <link xref="key-expiration-date-change">changed</link> anytime, even after
+  <link xref="pgp-expiration-change">changed</link> anytime, even after
   the key has expired. However, if you want to stop using the expired key, you
-  should <link xref="key-delete">delete</link> or
-  <link xref="key-disabling">revoke</link> it.</p>
+  should <link xref="misc-key-delete">delete</link> or
+  <link xref="misc-key-revoke">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 73349c6..79c2056 100644
--- a/help/C/pgp-photoid.page
+++ b/help/C/pgp-photoid.page
@@ -1,7 +1,8 @@
 <page xmlns="http://projectmallard.org/1.0/";
       xmlns:its="http://www.w3.org/2005/11/its";
       type="topic" style="task"
-      id="key-photoid">
+      id="pgp-photoid">
+
   <info>
     <link type="guide" xref="index#pgp-keys"/>
 
@@ -26,8 +27,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="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="about-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">
diff --git a/help/C/pgp-publish.page b/help/C/pgp-publish.page
index 9cfed21..6c8b648 100644
--- a/help/C/pgp-publish.page
+++ b/help/C/pgp-publish.page
@@ -1,7 +1,8 @@
 <page xmlns="http://projectmallard.org/1.0/";
       xmlns:its="http://www.w3.org/2005/11/its";
       type="topic" style="task"
-      id="keys-publish">
+      id="pgp-publish">
+
   <info>
     <link type="guide" xref="index#pgp-keys"/>
 
@@ -22,10 +23,10 @@
   <title>Publish your public keys</title>
 
   <p>After <link xref="pgp-create">creating</link> your
-  <link xref="what-is-pgp-key">PGP keypair</link> you can choose to publish the
+  <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="import-keys">import</link> your public keys and send you
+  <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>
@@ -43,7 +44,7 @@
        <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>
+       <p>Three <link xref="about-key-servers">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
diff --git a/help/C/pgp-retrieve-remote.page b/help/C/pgp-retrieve-remote.page
index c59136b..48a0e8c 100644
--- a/help/C/pgp-retrieve-remote.page
+++ b/help/C/pgp-retrieve-remote.page
@@ -1,7 +1,8 @@
 <page xmlns="http://projectmallard.org/1.0/";
       xmlns:its="http://www.w3.org/2005/11/its";
       type="topic" style="task"
-      id="keys-retrieve-remote">
+      id="pgp-retrieve-remote">
+
   <info>
     <link type="guide" xref="index#pgp-keys"/>
 
diff --git a/help/C/pgp-sync.page b/help/C/pgp-sync.page
index 8b7bffd..8547305 100644
--- a/help/C/pgp-sync.page
+++ b/help/C/pgp-sync.page
@@ -1,7 +1,8 @@
 <page xmlns="http://projectmallard.org/1.0/";
       xmlns:its="http://www.w3.org/2005/11/its";
       type="topic" style="task"
-      id="keys-sync">
+      id="pgp-sync">
+
   <info>
     <link type="guide" xref="index#pgp-keys"/>
 
diff --git a/help/C/pgp-userid-add.page b/help/C/pgp-userid-add.page
index 50b4367..35fec6a 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="userid-add">
+      id="pgp-userid-add">
 
   <info>
-    <link type="guide" xref="key-userid#add-remove"/>
+    <link type="guide" xref="pgp-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 fb89b84..2d00228 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="userid-primary">
+      id="pgp-userid-primary">
   <info>
-    <link type="guide" xref="key-userid#add-remove"/>
+    <link type="guide" xref="pgp-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 36413c8..58a91cd 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="userid-remove">
+      id="pgp-userid-remove">
 
   <info>
-    <link type="guide" xref="key-userid#add-remove"/>
+    <link type="guide" xref="pgp-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 843e671..0024e50 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="key-userid">
+      id="pgp-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="keys-import">import</link> it. It is important to
+  <link xref="misc-key-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 c76d021..ca75578 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="connect-other-computer">
+      id="ssh-connect-remote">
   <info>
     <link type="guide" xref="index#ssh-keys"/>
 
diff --git a/help/C/ssh-create.page b/help/C/ssh-create.page
index d83ce18..2d2eb97 100644
--- a/help/C/ssh-create.page
+++ b/help/C/ssh-create.page
@@ -3,6 +3,7 @@
       xmlns:ui = "http://projectmallard.org/ui/1.0/";
       type="topic" style="task"
       id="ssh-create">
+
   <info>
     <link type="guide" xref="index#ssh-keys"/>
 
@@ -24,7 +25,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
@@ -37,20 +38,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>
diff --git a/help/C/subkeys-add.page b/help/C/subkeys-add.page
index 45d8a29..ebc2508 100644
--- a/help/C/subkeys-add.page
+++ b/help/C/subkeys-add.page
@@ -2,8 +2,9 @@
       xmlns:its="http://www.w3.org/2005/11/its";
       type="topic" style="task"
       id="subkeys-add">
+
   <info>
-    <link type="guide" xref="keys-subkeys#more"/>
+    <link type="guide" xref="about-subkeys#more"/>
 
     <revision version="0.1" date="2011-10-23" status="stub"/>
     <revision pkgversion="3.9" version="0.1" date="2013-06-28" status="draft"/>
diff --git a/help/C/subkeys-examine.page b/help/C/subkeys-examine.page
index 1dd407a..c239d52 100644
--- a/help/C/subkeys-examine.page
+++ b/help/C/subkeys-examine.page
@@ -2,8 +2,9 @@
       xmlns:its="http://www.w3.org/2005/11/its";
       type="topic" style="task"
       id="subkeys-examine">
+
   <info>
-    <link type="guide" xref="keys-subkeys#more"/>
+    <link type="guide" xref="about-subkeys#more"/>
 
     <revision version="0.1" date="2011-10-23" status="stub"/>
     <revision pkgversion="3.9" version="0.1" date="2013-07-01" status="review"/>
@@ -19,7 +20,7 @@
     <desc>See all the subkeys listed under a PGP key.</desc>
   </info>
 
-<title>Where are my subkeys listed?</title>
+  <title>Where are my subkeys listed?</title>
 
   <p>You can check the contents of a keypair to see the properties of a
   subkey.</p>


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