GNOME.org
 

[seahorse/mallard-help] help: Fixup links in all pages.

commit 9eabfdd91dbd578061f936b2ec5bbdc0ca3975ef
Author: Aruna Sankaranarayanan <arunasank src gnome org>
Date:   Sun Sep 15 07:58:12 2013 +0530

    help: Fixup links in all pages.
    
    Resolved all string conflicts arising because of renaming pages and
    moving them.

 help/C/glossary.page              |    4 ++--
 help/C/misc-key-fingerprint.page  |    4 ++--
 help/C/pgp-delete.page            |    7 +++----
 help/C/pgp-expiration-change.page |    2 +-
 help/C/pgp-expired.page           |    4 ++--
 help/C/pgp-photoid.page           |    2 +-
 help/C/pgp-publish.page           |    5 ++---
 help/C/pgp-sign.page              |    2 +-
 help/C/pgp-subkeys.page           |    6 +++---
 help/C/pgp-userid.page            |    2 +-
 help/C/subkeys-add.page           |    2 +-
 help/C/subkeys-examine.page       |    2 +-
 help/C/subkeys-revoke.page        |    5 ++---
 13 files changed, 22 insertions(+), 25 deletions(-)
---
diff --git a/help/C/glossary.page b/help/C/glossary.page
index 7b822a2..a57d069 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="about-pgp">PGP keys</link> and
-       <link xref="about-ssh">SSH keys</link>.</p>
+       <link xref="pgp">PGP keys</link> and
+       <link xref="ssh">SSH keys</link>.</p>
     </item>
     <item>
     <title>Keyring</title>
diff --git a/help/C/misc-key-fingerprint.page b/help/C/misc-key-fingerprint.page
index 959211a..0847c6c 100644
--- a/help/C/misc-key-fingerprint.page
+++ b/help/C/misc-key-fingerprint.page
@@ -36,8 +36,8 @@
   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
+  remote computer using <link xref="ssh">SSH</link>. While signing a
+  <link xref="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">
diff --git a/help/C/pgp-delete.page b/help/C/pgp-delete.page
index 2d3b41a..2121111 100644
--- a/help/C/pgp-delete.page
+++ b/help/C/pgp-delete.page
@@ -54,10 +54,9 @@
     someone can <link xref="pgp-retrieve-remote">retrieve</link> the public key
     from a key server and use it to encrypt messages to you but you will not be
     able to decrypt those messages with the corresponding secret key. To
-    prevent the published key from being used, retrieve it and
-    <link xref="misc-key-revoke">revoke</link> it. The revoked key can then be
-    <link xref="pgp-sync">synced</link> with a key server to prevent people
-    from retrieving and using it.</p>
+    prevent the published key from being used, retrieve it and revoke it. The
+    revoked key can then be <link xref="pgp-sync">synced</link> with a key
+    server to prevent people from retrieving and using it.</p>
     <!-- or when you <link xref="misc-key-revoke">revoke</link> it.- No
     revoking feature yet for SSH keys/PGP master keys-->
   </note>
diff --git a/help/C/pgp-expiration-change.page b/help/C/pgp-expiration-change.page
index 2ae9ec6..5f88bdc 100644
--- a/help/C/pgp-expiration-change.page
+++ b/help/C/pgp-expiration-change.page
@@ -46,7 +46,7 @@
         </item>
         <item>
          <p>To change the expiration date of a
-         <link xref="about-subkeys">subkey</link>, expand the
+         <link xref="pgp-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 9ceb3ce..347d7b2 100644
--- a/help/C/pgp-expired.page
+++ b/help/C/pgp-expired.page
@@ -35,14 +35,14 @@
   </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
+  <link xref="pgp-create#advanced">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
   the key has expired. However, if you want to stop using the expired key, you
-  should <link xref="misc-key-delete">delete</link> or
+  should <link xref="pgp-delete">delete</link> or
   <link xref="subkeys-revoke">revoke</link> it.</p>
 
   <note style="info">
diff --git a/help/C/pgp-photoid.page b/help/C/pgp-photoid.page
index cbcdd4a..03867eb 100644
--- a/help/C/pgp-photoid.page
+++ b/help/C/pgp-photoid.page
@@ -27,7 +27,7 @@
   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
+  <link xref="misc-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>
 
diff --git a/help/C/pgp-publish.page b/help/C/pgp-publish.page
index c770554..c3a47bb 100644
--- a/help/C/pgp-publish.page
+++ b/help/C/pgp-publish.page
@@ -18,15 +18,14 @@
     </credit>
 
     <desc>Publish your public keys on key servers, or
-    <link xref="misc-key-export">export</link> and mail them to your
-    friends.</desc>
+    <link xref="pgp-export">export</link> and mail them to your friends.</desc>
   </info>
 
   <title>Share your public keys</title>
 
   <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> it and mail
+  people, <link xref="pgp-export">export</link> it 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>
diff --git a/help/C/pgp-sign.page b/help/C/pgp-sign.page
index 61a7bcf..cad1dd9 100644
--- a/help/C/pgp-sign.page
+++ b/help/C/pgp-sign.page
@@ -30,7 +30,7 @@
     <title>To sign a key:</title>
     <item>
       <p>Import the <link xref="pgp-retrieve-remote">remote key</link> or
-      <link xref="misc-key-import">keyfile</link> of your choice into
+      <link xref="pgp-import">keyfile</link> of your choice into
       <app>Passwords and Keys</app>.</p>
     </item>
     <item>
diff --git a/help/C/pgp-subkeys.page b/help/C/pgp-subkeys.page
index 2376198..8bfc628 100644
--- a/help/C/pgp-subkeys.page
+++ b/help/C/pgp-subkeys.page
@@ -1,9 +1,9 @@
 <page xmlns="http://projectmallard.org/1.0/";
       xmlns:its="http://www.w3.org/2005/11/its";
       type="guide" style="task"
-      id="subkeys">
+      id="pgp-subkeys">
   <info>
-    <link type="guide" xref="learn-about-keys" group="second"/>
+    <link type="guide" xref="pgp" group="second"/>
 
     <revision version="0.1" date="2011-10-23" status="stub"/>
     <revision pkgversion="3.9" version="0.1" date="2013-06-28" status="review"/>
@@ -37,7 +37,7 @@
     <title>What does each key in a keypair do?</title>
       <item>
        <p>The <em>master key</em> is used for
-       <link xref="about-key-signing">signing</link> other keys, creating subkeys
+       <link xref="pgp-sign">signing</link> other keys, creating subkeys
        and <link xref="subkeys-revoke">revoking</link> subkeys. Your master key
        must be kept very safe. Signatures of trust are also collected on your
        master key. If the master key is compromised, you have no choice but to
diff --git a/help/C/pgp-userid.page b/help/C/pgp-userid.page
index cc2fe3e..6b21d4f 100644
--- a/help/C/pgp-userid.page
+++ b/help/C/pgp-userid.page
@@ -26,7 +26,7 @@
   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="pgp-retrieve-remote">retrieve</link> or
-  <link xref="misc-key-import">import</link> it. It is important to fill in
+  <link xref="pgp-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/subkeys-add.page b/help/C/subkeys-add.page
index ddb09c4..14d73ea 100644
--- a/help/C/subkeys-add.page
+++ b/help/C/subkeys-add.page
@@ -4,7 +4,7 @@
       id="subkeys-add">
 
   <info>
-    <link type="guide" xref="about-subkeys#more"/>
+    <link type="guide" xref="pgp-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 c64ac17..46a899a 100644
--- a/help/C/subkeys-examine.page
+++ b/help/C/subkeys-examine.page
@@ -4,7 +4,7 @@
       id="subkeys-examine">
 
   <info>
-    <link type="guide" xref="about-subkeys#more"/>
+    <link type="guide" xref="pgp-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"/>
diff --git a/help/C/subkeys-revoke.page b/help/C/subkeys-revoke.page
index 76f0535..99b433f 100644
--- a/help/C/subkeys-revoke.page
+++ b/help/C/subkeys-revoke.page
@@ -4,7 +4,7 @@
       id="subkeys-revoke">
 
   <info>
-    <link type="guide" xref="about-subkeys"/>
+    <link type="guide" xref="pgp-subkeys#more"/>
 
     <revision version="0.1" date="2011-10-23" status="stub"/>
     <revision pkgversion="3.9" date="2013-08-25" status="review"/>
@@ -56,8 +56,7 @@
       <p>Press the <gui style="button">Revoke</gui> button.</p>
     </item>
     <item>
-      <p>You will have to unlock the key with its
-      <link xref="passwords-passphrases">passphrase.</link></p>
+      <p>You will have to unlock the key with its passphrase.</p>
     </item>
     <item>
       <p>The <gui>Status</gui> of the subkey changes to <gui>Revoked</gui> in
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]