[seahorse/mallard-help] Fix all link conflicts because of renaming pages.

From: Aruna Sankaranarayanan <arunasank src gnome org>
To: commits-list gnome org
Cc:
Subject: [seahorse/mallard-help] Fix all link conflicts because of renaming pages.
Date: Sun, 25 Aug 2013 16:44:39 +0000 (UTC)
commit f95ad08bcbc2753ab8704e2353e134061bbe226e
Author: Aruna Sankaranarayanan <arunasank src gnome org>
Date:   Sun Aug 25 22:11:56 2013 +0530

    Fix all link conflicts because of renaming pages.
    
    Fix all links to keyring pages/passwords-stored-new-create-page/
    subkey-revoke page.

 help/C/about-subkeys.page           |    2 +-
 help/C/introduction.page            |    4 ++--
 help/C/keyring-change-default.page  |    6 +++---
 help/C/keyring-create.page          |    5 +++--
 help/C/keyring-lock.page            |    6 +++---
 help/C/keyring-unlock.page          |    6 +++---
 help/C/keyring-update-password.page |    6 +++---
 help/C/misc-key-delete.page         |    6 ++++--
 help/C/passwords-stored-create.page |    4 ++--
 help/C/passwords-view.page          |    4 ++--
 help/C/pgp-expired.page             |    2 +-
 help/C/subkeys-revoke.page          |    2 +-
 12 files changed, 28 insertions(+), 25 deletions(-)
---
diff --git a/help/C/about-subkeys.page b/help/C/about-subkeys.page
index 1317eee..86be4b9 100644
--- a/help/C/about-subkeys.page
+++ b/help/C/about-subkeys.page
@@ -38,7 +38,7 @@
       <item>
        <p>The <em>master key</em> is used for
        <link xref="about-key-signing">signing</link> other keys, creating subkeys
-       and <link xref="misc-key-revoke">revoking</link> subkeys. Your master key
+       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
        revoke it and all the subkeys attached to it.</p>
diff --git a/help/C/introduction.page b/help/C/introduction.page
index f7beeb1..1ddfdb4 100644
--- a/help/C/introduction.page
+++ b/help/C/introduction.page
@@ -38,9 +38,9 @@
 
   <list>
     <item>
-      <p>Copy and <link xref="passwords-stored-new-create">save</link>
+      <p>Copy and <link xref="passwords-stored-create">save</link>
       passwords that are difficult to remember. You can also
-      <link xref="passwords-keyring-create">create keyrings</link> to group
+      <link xref="keyring-create">create keyrings</link> to group
       related passwords.</p>
     </item>
     <item>
diff --git a/help/C/keyring-change-default.page b/help/C/keyring-change-default.page
index 597ea9e..6cb6ee8 100644
--- a/help/C/keyring-change-default.page
+++ b/help/C/keyring-change-default.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="passwords-keyring-change-default">
+      id="keyring-change-default">
 
   <info>
-    <link type="guide" xref="passwords"/>
+    <link type="guide" xref="about-keyring"/>
 
     <revision pkgversion="3.9" version="0.1" date="2013-07-18" status="review"/>
 
@@ -23,7 +23,7 @@
   <title>Change the default password keyring</title>
 
   <p>When you
-  <link xref="passwords-stored-new-create">create a new stored password</link>,
+  <link xref="passwords-stored-create">create a new stored password</link>,
   the default keyring is the first choice in the password creation dialog to
   store the newly created password. Though the <gui>Login</gui> keyring is the
   default choice in <app>Passwords and Keys</app>, you can make any other
diff --git a/help/C/keyring-create.page b/help/C/keyring-create.page
index 18ed1a7..c5e36c1 100644
--- a/help/C/keyring-create.page
+++ b/help/C/keyring-create.page
@@ -1,11 +1,12 @@
 <page xmlns="http://projectmallard.org/1.0/";
       xmlns:its="http://www.w3.org/2005/11/its";
       type="topic" style="task"
-      id="passwords-keyring-create">
+      id="keyring-create">
 
   <info>
     <link type="guide" xref="passwords"/>
-    <link type="seealso" xref="passwords-keyring-update-password" />
+    <link type="seealso" xref="keyring-update-password"/>
+    <link type="guide" xref="about-keyring"/>
 
     <revision version="0.1" date="2011-10-23" status="draft"/>
     <revision pkgversion="3.10" date="2013-08-21" status="review"/>
diff --git a/help/C/keyring-lock.page b/help/C/keyring-lock.page
index c1540f4..338157f 100644
--- a/help/C/keyring-lock.page
+++ b/help/C/keyring-lock.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-lock">
+      id="keyring-lock">
 
   <info>
     <link type="guide" xref="about-keyring"/>
@@ -26,12 +26,12 @@
   keyring which contains them. This can be done by using a password-protected
   keyring to store the password. When a password-protected keyring is locked,
   the passwords in it are kept hidden till someone
-  <link xref="passwords-keyring-unlock">unlocks</link> the keyring with the
+  <link xref="keyring-unlock">unlocks</link> the keyring with the
   correct password.</p>
 
   <note style="tip">
     <p>You can choose whether or not to protect your keyring with a password
-    while <link xref="passwords-keyring-create">creating</link> it.</p>
+    while <link xref="keyring-create">creating</link> it.</p>
   </note>
 
   <steps>
diff --git a/help/C/keyring-unlock.page b/help/C/keyring-unlock.page
index c9fe6c3..bf74459 100644
--- a/help/C/keyring-unlock.page
+++ b/help/C/keyring-unlock.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-unlock">
+      id="keyring-unlock">
 
   <info>
     <link type="guide" xref="about-keyring"/>
@@ -22,7 +22,7 @@
 
   <title>Unlock your keyrings</title>
     <p>A keyring may often be
-    <link xref="passwords-keyring-lock">locked</link> to hide the passwords
+    <link xref="keyring-lock">locked</link> to hide the passwords
     it contains, sort of like locking important things safely inside a trunk.
     In order to look at your passwords, you must unlock the keyring first.</p>
 
@@ -47,7 +47,7 @@
 
   <note style="tip">
     <p>You can choose to password-protect your keyrings while
-    <link xref="passwords-keyring-create">creating</link> them.</p>
+    <link xref="keyring-create">creating</link> them.</p>
   </note>
 
 </page>
diff --git a/help/C/keyring-update-password.page b/help/C/keyring-update-password.page
index a1ca53a..4b285a1 100644
--- a/help/C/keyring-update-password.page
+++ b/help/C/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="keyring-update-password">
 
   <info>
     <link type="guide" xref="passwords"/>
@@ -24,7 +24,7 @@
 
   <title>Update the keyring password</title>
 
-  <p>Your <link xref="passwords-keyring-create">password keyring</link> can be
+  <p>Your <link xref="about-keyring">password keyring</link> can be
   updated at any time.</p>
 
   <steps>
@@ -38,7 +38,7 @@
       </item>
       <item>
        <p>Type your old password to authenticate yourself and press
-       <gui style="continue">Continue</gui>.</p>
+       <gui style="button">Continue</gui>.</p>
       </item>
       <item>
        <p>In the new dialog, type your new password, retype it to confirm the
diff --git a/help/C/misc-key-delete.page b/help/C/misc-key-delete.page
index 9154196..d1d5ee9 100644
--- a/help/C/misc-key-delete.page
+++ b/help/C/misc-key-delete.page
@@ -53,8 +53,10 @@
     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>
+    only when it <link xref="pgp-expired">expires</link>.</p>
+    <!-- or when you
+    <link xref="misc-key-revoke">revoke</link> it.- No revoking feature yet for
+    SSH keys/PGP master keys-->
   </note>
 
 </page>
diff --git a/help/C/passwords-stored-create.page b/help/C/passwords-stored-create.page
index 4951915..ef46bef 100644
--- a/help/C/passwords-stored-create.page
+++ b/help/C/passwords-stored-create.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-stored-new-create">
+      id="passwords-stored-create">
 
   <info>
     <link type="guide" xref="passwords"/>
@@ -57,7 +57,7 @@
   <note style="tip">
     <p>The default keyring is displayed as the first choice in the
     <gui>Keyring</gui> drop down menu. You can
-    <link xref="passwords-keyring-change-default">change the default
+    <link xref="keyring-change-default">change the default
     keyring</link>.</p>
   </note>
 
diff --git a/help/C/passwords-view.page b/help/C/passwords-view.page
index dfa444a..456c98d 100644
--- a/help/C/passwords-view.page
+++ b/help/C/passwords-view.page
@@ -25,7 +25,7 @@
 
   <p>Some of your passwords are automatically stored in
   <app>Passwords and Keys</app> while others have to be
-  <link xref="passwords-stored-new-create">manually stored</link>.</p>
+  <link xref="passwords-stored-create">manually stored</link>.</p>
 
   <steps>
     <title>To view your passwords:</title>
@@ -37,7 +37,7 @@
       <gui style="menuitem">By keyring</gui></guiseq>.</p>
     </item>-->
     <item>
-      <p><link xref="passwords-keyring-unlock">Unlock</link> the password
+      <p><link xref="keyring-unlock">Unlock</link> the password
       keyring that contains your password. A list of passwords stored in the
       keyring will be displayed.</p>
     </item>
diff --git a/help/C/pgp-expired.page b/help/C/pgp-expired.page
index 15f4257..62794b4 100644
--- a/help/C/pgp-expired.page
+++ b/help/C/pgp-expired.page
@@ -43,7 +43,7 @@
   <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
-  <link xref="misc-key-revoke">revoke</link> it.</p>
+  <link xref="subkeys-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/subkeys-revoke.page b/help/C/subkeys-revoke.page
index a545bc3..76f0535 100644
--- a/help/C/subkeys-revoke.page
+++ b/help/C/subkeys-revoke.page
@@ -57,7 +57,7 @@
     </item>
     <item>
       <p>You will have to unlock the key with its
-      <link xref="passwords-passphrases">passphrase.</p>
+      <link xref="passwords-passphrases">passphrase.</link></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]