[seahorse/wip/userdocs: 5/363] Included new legal.xml file
- From: Ekaterina Gerasimova <egerasimov src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [seahorse/wip/userdocs: 5/363] Included new legal.xml file
- Date: Sun, 16 Mar 2014 17:33:59 +0000 (UTC)
commit bd4e47c3cd906fcd09c4f7987115c93453a76ce1
Author: Aruna Sankaranarayanan <arunasank src gnome org>
Date: Tue Jul 2 19:25:57 2013 +0530
Included new legal.xml file
New legal.xml licenses documentation under CC-by-SA after getting
permission from stefw and j1mc.
Added an include tag in all pages.
Removed whitespace.
help/C/backup-keys.page | 3 +
help/C/connect-other-computer.page | 5 +-
help/C/create-good-password.page | 3 +
help/C/create-key-or-password.page | 8 ++-
help/C/create-pgp-key.page | 2 +-
help/C/create-ssh-key.page | 3 +
help/C/email-digitally-sign.page | 3 +
help/C/email-encrypt.page | 3 +
help/C/encryption-dsa.page | 3 +
help/C/encryption-rsa.page | 4 +-
help/C/index.page | 11 ++-
help/C/introduction.page | 10 +--
help/C/key-create-vs-setup.page | 5 +-
help/C/key-delete.page | 2 +
help/C/key-disabling.page | 3 +
help/C/key-expiration-setting.page | 4 +
help/C/key-expired.page | 3 +
help/C/key-fingerprint.page | 2 +
help/C/key-photoid.page | 2 +
help/C/key-recommend-description.page | 3 +
help/C/key-servers-what-are-they.page | 3 +
help/C/key-signing.page | 2 +
help/C/key-strength-define.page | 6 +-
help/C/key-strength-select.page | 3 +
help/C/key-subkeys.page | 2 +
help/C/key-userid.page | 2 +
help/C/keys-import-export.page | 4 +-
help/C/keys-keep-secure.page | 3 +
help/C/keys-retrieve-remote.page | 5 +-
help/C/keys-sync-publish.page | 2 +
help/C/learn-about-keys.page | 22 ++++---
help/C/legal.xml | 82 ++-----------------------
help/C/passwords-control-access.page | 3 +
help/C/passwords-update-keyring-password.page | 7 ++-
help/C/passwords-view.page | 3 +
help/C/ssh-login.page | 3 +
help/C/subkeys-add.page | 4 +-
help/C/subkeys-examine.page | 2 +
help/C/userid-add.page | 2 +
help/C/userid-primary.page | 2 +
help/C/userid-remove.page | 2 +
help/C/what-diff-private-public.page | 5 +-
help/C/what-is-certificate-key.page | 28 +++++---
help/C/what-is-keyring.page | 7 ++-
help/C/what-is-pgp-key.page | 3 +
help/C/what-is-ssh-key.page | 43 +++++++------
46 files changed, 190 insertions(+), 142 deletions(-)
---
diff --git a/help/C/backup-keys.page b/help/C/backup-keys.page
index 00f8dc0..21ee5e5 100644
--- a/help/C/backup-keys.page
+++ b/help/C/backup-keys.page
@@ -3,8 +3,11 @@
id="backup-keys">
<info>
<link type="guide" xref="index#back-up-and-secure-keys"/>
+
<revision version="0.1" date="2011-06-17" status="draft"/>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<credit type="author">
<name>Jim Campbell</name>
<email>jwcampbell gmail com</email>
diff --git a/help/C/connect-other-computer.page b/help/C/connect-other-computer.page
index fc3fd2f..f86f7cf 100644
--- a/help/C/connect-other-computer.page
+++ b/help/C/connect-other-computer.page
@@ -2,9 +2,12 @@
type="topic" style="task"
id="connect-other-computer">
<info>
- <link type="guide" xref="index#use-keys"/>
+ <link type="guide" xref="index#use-keys"/>
+
<revision version="0.1" date="2011-10-23" status="stub"/>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<credit type="author">
<name>Jim Campbell</name>
<email>jwcampbell gmail com</email>
diff --git a/help/C/create-good-password.page b/help/C/create-good-password.page
index 533e9ea..422dc14 100644
--- a/help/C/create-good-password.page
+++ b/help/C/create-good-password.page
@@ -3,8 +3,11 @@
id="create-good-password">
<info>
<link type="guide" xref="index#create-keys"/>
+
<revision version="0.1" date="2011-10-23" status="draft"/>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<credit type="author">
<name>Jim Campbell</name>
<email>jwcampbell gmail com</email>
diff --git a/help/C/create-key-or-password.page b/help/C/create-key-or-password.page
index e417bcc..c1a0997 100644
--- a/help/C/create-key-or-password.page
+++ b/help/C/create-key-or-password.page
@@ -6,18 +6,22 @@
<link type="guide" xref="index#create-keys"/>
<link type="seealso" xref="what-is-ssh-key"/>
<link type="seealso" xref="what-is-pgp-key"/>
+
<revision pkgversion="3.8" date="2013-02-25" status="draft"/>
+
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<credit type="author">
<name>Jim Campbell</name>
<email>jwcampbell gmail com</email>
</credit>
</info>
-
+
<title>Create a new key, keyring or password</title>
<p>With <app>Password and Keys</app> you can create the following types of
tokens from the same menu:</p>
-
+
<list>
<title>Token types</title>
<item><p>Password Keyring</p></item>
diff --git a/help/C/create-pgp-key.page b/help/C/create-pgp-key.page
index a747514..7dddeb9 100644
--- a/help/C/create-pgp-key.page
+++ b/help/C/create-pgp-key.page
@@ -36,7 +36,7 @@
key type by expanding the <gui>Advanced key options</gui> panel while
creating a new key.</p>
</note>
-
+
<p><app>Passwords and Keys</app> will take some time to generate your key.
While your key is being created, move your mouse around and press some keys
on your keyboard. This will help <app>Passwords and Keys</app> to create
diff --git a/help/C/create-ssh-key.page b/help/C/create-ssh-key.page
index fdfd976..f6553aa 100644
--- a/help/C/create-ssh-key.page
+++ b/help/C/create-ssh-key.page
@@ -3,8 +3,11 @@
id="create-ssh-key">
<info>
<link type="guide" xref="index#create-keys"/>
+
<revision version="0.1" date="2011-06-17" status="stub"/>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<credit type="author">
<name>Jim Campbell</name>
<email>jwcampbell gmail com</email>
diff --git a/help/C/email-digitally-sign.page b/help/C/email-digitally-sign.page
index 09d2ee9..e5a97c9 100644
--- a/help/C/email-digitally-sign.page
+++ b/help/C/email-digitally-sign.page
@@ -3,8 +3,11 @@
id="email-digitally-sign">
<info>
<link type="guide" xref="index#use-keys"/>
+
<revision version="0.1" date="2011-06-17" status="stub"/>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<credit type="author">
<name>Jim Campbell</name>
<email>jwcampbell gmail com</email>
diff --git a/help/C/email-encrypt.page b/help/C/email-encrypt.page
index 8d4cdb3..9e3f696 100644
--- a/help/C/email-encrypt.page
+++ b/help/C/email-encrypt.page
@@ -3,8 +3,11 @@
id="email-encrypt">
<info>
<link type="guide" xref="index#use-keys"/>
+
<revision version="0.1" date="2011-06-17" status="stub"/>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<credit type="author">
<name>Jim Campbell</name>
<email>jwcampbell gmail com</email>
diff --git a/help/C/encryption-dsa.page b/help/C/encryption-dsa.page
index 641190c..904be7a 100644
--- a/help/C/encryption-dsa.page
+++ b/help/C/encryption-dsa.page
@@ -3,8 +3,11 @@
id="encryption-dsa">
<info>
<link type="guide" xref="learn-about-keys" group="second"/>
+
<revision version="0.1" date="2011-10-23" status="draft"/>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<credit type="author">
<name>Jim Campbell</name>
<email>jwcampbell gmail com</email>
diff --git a/help/C/encryption-rsa.page b/help/C/encryption-rsa.page
index 7c80487..9dbb3e4 100644
--- a/help/C/encryption-rsa.page
+++ b/help/C/encryption-rsa.page
@@ -2,9 +2,10 @@
type="topic" style="task"
id="encryption-rsa">
<info>
- <desc></desc>
<link type="guide" xref="learn-about-keys" group="second"/>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<revision version="0.1" date="2011-10-23" status="draft"/>
<revision pkgversion="3.9" version="0.1" date="2013-06-17" status="draft"/>
@@ -13,6 +14,7 @@
<email>aruna evam gmail com</email>
</credit>
+ <desc></desc>
</info>
<title>What is RSA encryption?</title>
diff --git a/help/C/index.page b/help/C/index.page
index 8004111..81cb6bd 100644
--- a/help/C/index.page
+++ b/help/C/index.page
@@ -4,8 +4,11 @@
<info>
<title type="link">Passwords and Keys</title>
<title type="text">Passwords and Keys</title>
+
<revision version="0.1" date="2011-06-17" status="draft"/>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<credit type="author">
<name>Jim Campbell</name>
<email>jwcampbell gmail com</email>
@@ -27,22 +30,22 @@
<section id="create-keys" style="2column">
<title>Create keys</title>
-
+
</section>
<section id="use-keys" style="2column">
<title>Use keys</title>
-
+
</section>
<section id="back-up-and-secure-keys" style="2column">
<title>Back-up and secure your keys</title>
-
+
</section>
<section id="revoke-keys" style="2column">
<title>Revoke your keys</title>
-
+
</section>
</page>
diff --git a/help/C/introduction.page b/help/C/introduction.page
index 17b8d49..b26e690 100644
--- a/help/C/introduction.page
+++ b/help/C/introduction.page
@@ -4,14 +4,12 @@
<info>
<link type="guide" xref="index"/>
-
+
<revision pkgversion="3.8" date="2013-02-26" status="stub"/>
<revision pkgversion="3.9" date="2013-06-13" status="draft"/>
- <!--get written consent from Jim before adding this or changing the
- legal.xml file
- <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>-->
-
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<credit type="author copyright">
<name>Aruna Sankaranarayanan</name>
<email>aruna evam gmail com</email>
@@ -54,7 +52,7 @@
wish to encrypt a personal message by substituting every letter in the
message with a new letter according to some substitution set you have,
the substitution set would be a key because anyone who has the
- substitution set can decrypt your message.
+ substitution set can decrypt your message.
<app>Passwords and Keys</app> uses advanced mathematical means to
generate a key so that it is not guessable. Keys can be
<link xref="what-diff-private-public">private or public</link>.</p>
diff --git a/help/C/key-create-vs-setup.page b/help/C/key-create-vs-setup.page
index d7b9f41..7dd8c9e 100644
--- a/help/C/key-create-vs-setup.page
+++ b/help/C/key-create-vs-setup.page
@@ -3,8 +3,11 @@
id="key-create-vs-setup">
<info>
<link type="guide" xref="index#create-keys"/>
+
<revision version="0.1" date="2011-10-23" status="stub"/>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<credit type="author">
<name>Jim Campbell</name>
<email>jwcampbell gmail com</email>
@@ -27,5 +30,5 @@
an SSH key. Is there a better way to represent this option in the UI?
In any case the page on this topic should be specific to SSH keys and not
a general title.
- -->
+ -->
</page>
diff --git a/help/C/key-delete.page b/help/C/key-delete.page
index f9079fe..b873583 100644
--- a/help/C/key-delete.page
+++ b/help/C/key-delete.page
@@ -7,6 +7,8 @@
<revision version="0.1" date="2011-10-23" status="stub"/>
<revision pkgversion="3.9" version="0.1" date="2013-06-24" status="draft"/>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<credit type="author copyright">
<name>Aruna Sankaranarayanan</name>
<email>aruna evam gmail com</email>
diff --git a/help/C/key-disabling.page b/help/C/key-disabling.page
index cdca84a..2e286a0 100644
--- a/help/C/key-disabling.page
+++ b/help/C/key-disabling.page
@@ -3,8 +3,11 @@
id="key-disabling">
<info>
<link type="guide" xref="index#revoke-keys"/>
+
<revision version="0.1" date="2011-10-23" status="stub"/>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<credit type="author">
<name>Jim Campbell</name>
<email>jwcampbell gmail com</email>
diff --git a/help/C/key-expiration-setting.page b/help/C/key-expiration-setting.page
index 1d289e7..9a99793 100644
--- a/help/C/key-expiration-setting.page
+++ b/help/C/key-expiration-setting.page
@@ -1,10 +1,14 @@
<page xmlns="http://projectmallard.org/1.0/";
type="topic" style="task"
id="key-expiration-setting">
+
<info>
<link type="guide" xref="index#create-keys"/>
+
<revision version="0.1" date="2011-10-23" status="stub"/>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<credit type="author">
<name>Jim Campbell</name>
<email>jwcampbell gmail com</email>
diff --git a/help/C/key-expired.page b/help/C/key-expired.page
index 66feb2a..1e745be 100644
--- a/help/C/key-expired.page
+++ b/help/C/key-expired.page
@@ -3,8 +3,11 @@
id="key-expired">
<info>
<link type="guide" xref="index#use-keys"/>
+
<revision version="0.1" date="2011-10-23" status="stub"/>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<credit type="author">
<name>Jim Campbell</name>
<email>jwcampbell gmail com</email>
diff --git a/help/C/key-fingerprint.page b/help/C/key-fingerprint.page
index 13e45b6..ecd1430 100644
--- a/help/C/key-fingerprint.page
+++ b/help/C/key-fingerprint.page
@@ -7,6 +7,8 @@
<revision version="0.1" date="2011-10-23" status="stub"/>
<revision pkgversion="3.9" version="0.1" date="2013-06-23" status="draft"/>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<credit type="author copyright">
<name>Aruna Sankaranarayanan</name>
<email>aruna evam gmail com</email>
diff --git a/help/C/key-photoid.page b/help/C/key-photoid.page
index d4e21d2..1a325ec 100644
--- a/help/C/key-photoid.page
+++ b/help/C/key-photoid.page
@@ -7,6 +7,8 @@
<revision version="0.1" date="2011-10-23" status="stub"/>
<revision pkgversion="3.9" version="0.1" date="2013-06-24" status="draft"/>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<credit type="author copyright">
<name>Aruna Sankaranarayanan</name>
<email>aruna evam gmail com</email>
diff --git a/help/C/key-recommend-description.page b/help/C/key-recommend-description.page
index 2238a0b..a29ae7c 100644
--- a/help/C/key-recommend-description.page
+++ b/help/C/key-recommend-description.page
@@ -3,8 +3,11 @@
id="key-recommend-description">
<info>
<link type="guide" xref="index#create-keys"/>
+
<revision version="0.1" date="2011-10-23" status="stub"/>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<credit type="author">
<name>Jim Campbell</name>
<email>jwcampbell gmail com</email>
diff --git a/help/C/key-servers-what-are-they.page b/help/C/key-servers-what-are-they.page
index 524d605..d77e04a 100644
--- a/help/C/key-servers-what-are-they.page
+++ b/help/C/key-servers-what-are-they.page
@@ -3,9 +3,12 @@
id="key-servers-what-are-they">
<info>
<link type="guide" xref="learn-about-keys"/>
+
<revision version="0.1" date="2011-10-23" status="stub"/>
<revision pkgversion="3.9" version="0.1" date="2013-06-18" status="draft"/>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<credit type="author copyright">
<name>Aruna</name>
<email>aruna evam gmail com</email>
diff --git a/help/C/key-signing.page b/help/C/key-signing.page
index 18b7eca..102d537 100644
--- a/help/C/key-signing.page
+++ b/help/C/key-signing.page
@@ -7,6 +7,8 @@
<revision version="0.1" date="2011-10-23" status="stub"/>
<revision pkgversion="3.9" version="0.1" date="2013-06-18" status="draft"/>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<credit type="author copyright">
<name>Aruna Sankaranarayanan</name>
<email>aruna evam gmail com</email>
diff --git a/help/C/key-strength-define.page b/help/C/key-strength-define.page
index 081e408..db76552 100644
--- a/help/C/key-strength-define.page
+++ b/help/C/key-strength-define.page
@@ -7,6 +7,8 @@
<revision version="0.1" date="2011-10-23" status="stub"/>
<revision pkgversion="3.9" version="0.1" date="2013-06-21" status="draft"/>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<credit type="author copyright">
<name>Aruna Sankaranarayanan</name>
<email>aruna evam gmail com</email>
@@ -43,10 +45,10 @@
reccomendations for key strength. The basic concepts for key
strength, is that dependeng how long (in time, years) you want something to remain
secure, you choose a given key length.
-
+
This page might be a source for our recommendations in the help file:
http://www.keylength.com/en/3/
-
+
Note that in general in seahorse we ar etalking about the Assymetric key strength
not the Symmetric ones.
-->
diff --git a/help/C/key-strength-select.page b/help/C/key-strength-select.page
index 1f871cc..69584b8 100644
--- a/help/C/key-strength-select.page
+++ b/help/C/key-strength-select.page
@@ -3,9 +3,12 @@
id="key-strength-select">
<info>
<link type="guide" xref="index#create-keys" group="second"/>
+
<revision version="0.1" date="2011-10-23" status="stub"/>
<revision pkgversion="3.9" version="0.1" date="2013-07-02" status="draft"/>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<credit type="author copyright">
<name>Aruna Sankaranarayanan</name>
<email>aruna evam gmail com</email>
diff --git a/help/C/key-subkeys.page b/help/C/key-subkeys.page
index e234deb..5586c02 100644
--- a/help/C/key-subkeys.page
+++ b/help/C/key-subkeys.page
@@ -7,6 +7,8 @@
<revision version="0.1" date="2011-10-23" status="stub"/>
<revision pkgversion="3.9" version="0.1" date="2013-06-28" status="draft"/>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<credit type="author copyright">
<name>Aruna Sankaranarayanan</name>
<email>aruna evam gmail com</email>
diff --git a/help/C/key-userid.page b/help/C/key-userid.page
index 718d5a0..0423e7c 100644
--- a/help/C/key-userid.page
+++ b/help/C/key-userid.page
@@ -8,6 +8,8 @@
<revision version="0.1" date="2011-10-23" status="stub"/>
<revision pkgversion="3.9" version="0.1" date="2013-06-27" status="draft"/>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<credit type="author copyright">
<name>Aruna Sankaranarayanan</name>
<email>aruna evam gmail com</email>
diff --git a/help/C/keys-import-export.page b/help/C/keys-import-export.page
index 09ef49f..cdb2af4 100644
--- a/help/C/keys-import-export.page
+++ b/help/C/keys-import-export.page
@@ -7,6 +7,8 @@
<revision version="0.1" date="2011-06-17" status="stub"/>
<revision pkgversion="3.9" version="0.1" date="2013-06-20" status="draft"/>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<credit type="author copyright">
<name>Aruna Sankaranarayanan</name>
<email>aruna evam gmail com</email>
@@ -79,7 +81,7 @@
<guiseq><gui style="menu">File</gui><gui>Export…</gui></guiseq>.</p>
</item>
<item>
- <p>In the dialog that opens up, select the folder in which you want
+ <p>In the dialog that opens up, select the folder in which you want
your key to be stored.</p>
</item>
<item>
diff --git a/help/C/keys-keep-secure.page b/help/C/keys-keep-secure.page
index 7b2683b..31a39e8 100644
--- a/help/C/keys-keep-secure.page
+++ b/help/C/keys-keep-secure.page
@@ -3,8 +3,11 @@
id="keys-keep-secure">
<info>
<link type="guide" xref="index#back-up-and-secure-keys"/>
+
<revision version="0.1" date="2011-10-23" status="stub"/>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<credit type="author">
<name>Jim Campbell</name>
<email>jwcampbell gmail com</email>
diff --git a/help/C/keys-retrieve-remote.page b/help/C/keys-retrieve-remote.page
index 4876fb6..3069955 100644
--- a/help/C/keys-retrieve-remote.page
+++ b/help/C/keys-retrieve-remote.page
@@ -3,8 +3,11 @@
id="keys-retrieve-remote">
<info>
<link type="guide" xref="index#use-keys"/>
+
<revision version="0.1" date="2011-10-23" status="stub"/>
- <revision pkgversion="3.9" version="0.1" date="2013-06-18" status="stub"/>
+ <revision pkgversion="3.9" version="0.1" date="2013-06-18" status="draft"/>
+
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
<credit type="author copyright">
<name>Aruna</name>
diff --git a/help/C/keys-sync-publish.page b/help/C/keys-sync-publish.page
index 80a321e..4a9d47e 100644
--- a/help/C/keys-sync-publish.page
+++ b/help/C/keys-sync-publish.page
@@ -7,6 +7,8 @@
<revision version="0.1" date="2011-10-23" status="stub"/>
<revision pkgversion="3.9" version="0.1" date="2013-06-18" status="draft"/>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<credit type="author copyright">
<name>Aruna</name>
<email>aruna evam gmail com</email>
diff --git a/help/C/learn-about-keys.page b/help/C/learn-about-keys.page
index 4b739cc..4cc2d4f 100644
--- a/help/C/learn-about-keys.page
+++ b/help/C/learn-about-keys.page
@@ -2,17 +2,21 @@
type="guide" style="2column task"
id="learn-about-keys">
-<info>
- <link type="guide" xref="index"/>
- <revision pkgversion="3.8" date="2013-02-26" status="incomplete"/>
- <credit type="author">
- <name>Jim Campbell</name>
- <email>jwcampbell gmail com</email>
- </credit>
-</info>
+ <info>
+ <link type="guide" xref="index"/>
+
+ <revision pkgversion="3.8" date="2013-02-26" status="incomplete"/>
+
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
+ <credit type="author">
+ <name>Jim Campbell</name>
+ <email>jwcampbell gmail com</email>
+ </credit>
+ </info>
<title>Learn about keys</title>
-
+
<p>These topics will help you to learn more about the security tokens and
concepts that are relevant to the <app>Passwords and Keys</app>
application.</p>
diff --git a/help/C/legal.xml b/help/C/legal.xml
index 899282c..09cd8c8 100644
--- a/help/C/legal.xml
+++ b/help/C/legal.xml
@@ -1,76 +1,6 @@
- <legalnotice id="legalnotice">
- <para>
- Permission is granted to copy, distribute and/or modify this
- document under the terms of the GNU Free Documentation
- License (GFDL), Version 1.1 or any later version published
- by the Free Software Foundation with no Invariant Sections,
- no Front-Cover Texts, and no Back-Cover Texts. You can find
- a copy of the GFDL at this <ulink type="help"
- url="help:fdl">link</ulink> or in the file COPYING-DOCS
- distributed with this manual.
- </para>
- <para> This manual is part of a collection of GNOME manuals
- distributed under the GFDL. If you want to distribute this
- manual separately from the collection, you can do so by
- adding a copy of the license to the manual, as described in
- section 6 of the license.
- </para>
-
- <para>
- Many of the names used by companies to distinguish their
- products and services are claimed as trademarks. Where those
- names appear in any GNOME documentation, and the members of
- the GNOME Documentation Project are made aware of those
- trademarks, then the names are in capital letters or initial
- capital letters.
- </para>
-
- <para>
- DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED
- UNDER THE TERMS OF THE GNU FREE DOCUMENTATION LICENSE
- WITH THE FURTHER UNDERSTANDING THAT:
-
- <orderedlist>
- <listitem>
- <para>DOCUMENT IS PROVIDED ON AN "AS IS" BASIS,
- WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR
- IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
- THAT THE DOCUMENT OR MODIFIED VERSION OF THE
- DOCUMENT IS FREE OF DEFECTS MERCHANTABLE, FIT FOR
- A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE
- RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE
- OF THE DOCUMENT OR MODIFIED VERSION OF THE
- DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR
- MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT,
- YOU (NOT THE INITIAL WRITER, AUTHOR OR ANY
- CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
- SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
- OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED
- VERSION OF THE DOCUMENT IS AUTHORIZED HEREUNDER
- EXCEPT UNDER THIS DISCLAIMER; AND
- </para>
- </listitem>
- <listitem>
- <para>UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL
- THEORY, WHETHER IN TORT (INCLUDING NEGLIGENCE),
- CONTRACT, OR OTHERWISE, SHALL THE AUTHOR,
- INITIAL WRITER, ANY CONTRIBUTOR, OR ANY
- DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION
- OF THE DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH
- PARTIES, BE LIABLE TO ANY PERSON FOR ANY
- DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR
- CONSEQUENTIAL DAMAGES OF ANY CHARACTER
- INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS
- OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR
- MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR
- LOSSES ARISING OUT OF OR RELATING TO USE OF THE
- DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT,
- EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF
- THE POSSIBILITY OF SUCH DAMAGES.
- </para>
- </listitem>
- </orderedlist>
- </para>
- </legalnotice>
-
+<license xmlns="http://projectmallard.org/1.0/";
+ href="http://creativecommons.org/licenses/by-sa/3.0/";>
+ <p>This work is licensed under a
+ <link href="http://creativecommons.org/licenses/by-sa/3.0/";>Creative Commons
+ Attribution-ShareAlike 3.0 Unported License</link>.</p>
+</license>
diff --git a/help/C/passwords-control-access.page b/help/C/passwords-control-access.page
index 75bd548..845b897 100644
--- a/help/C/passwords-control-access.page
+++ b/help/C/passwords-control-access.page
@@ -3,8 +3,11 @@
id="passwords-control-access">
<info>
<link type="guide" xref="index#back-up-and-secure-keys"/>
+
<revision version="0.1" date="2011-06-17" status="stub"/>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<credit type="author">
<name>Jim Campbell</name>
<email>jwcampbell gmail com</email>
diff --git a/help/C/passwords-update-keyring-password.page b/help/C/passwords-update-keyring-password.page
index a21c554..57e7f33 100644
--- a/help/C/passwords-update-keyring-password.page
+++ b/help/C/passwords-update-keyring-password.page
@@ -1,11 +1,14 @@
<page xmlns="http://projectmallard.org/1.0/";
type="topic" style="task"
id="passwords-update-keyring-password">
-
+
<info>
- <link type="guide" xref="index#use-keys"/>
+ <link type="guide" xref="index#use-keys"/>
+
<revision version="0.1" date="2011-06-17" status="stub"/>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<credit type="author">
<name>Jim Campbell</name>
<email>jwcampbell gmail com</email>
diff --git a/help/C/passwords-view.page b/help/C/passwords-view.page
index cdb8f2a..4d16d41 100644
--- a/help/C/passwords-view.page
+++ b/help/C/passwords-view.page
@@ -3,8 +3,11 @@
id="passwords-view">
<info>
<link type="guide" xref="index#use-keys"/>
+
<revision version="0.1" date="2011-06-17" status="stub"/>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<credit type="author">
<name>Jim Campbell</name>
<email>jwcampbell gmail com</email>
diff --git a/help/C/ssh-login.page b/help/C/ssh-login.page
index 888c729..6712365 100644
--- a/help/C/ssh-login.page
+++ b/help/C/ssh-login.page
@@ -3,8 +3,11 @@
id="ssh-login">
<info>
<link type="guide" xref="index#use-keys"/>
+
<revision version="0.1" date="2011-06-17" status="stub"/>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<credit type="author">
<name>Jim Campbell</name>
<email>jwcampbell gmail com</email>
diff --git a/help/C/subkeys-add.page b/help/C/subkeys-add.page
index dc0bc62..f74af60 100644
--- a/help/C/subkeys-add.page
+++ b/help/C/subkeys-add.page
@@ -7,6 +7,8 @@
<revision version="0.1" date="2011-10-23" status="stub"/>
<revision pkgversion="3.9" version="0.1" date="2013-06-28" status="draft"/>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<credit type="author copyright">
<name>Aruna Sankaranarayanan</name>
<email>aruna evam gmail com</email>
@@ -34,7 +36,7 @@
<p>If the <gui>Subkeys</gui> section is not expanded, expand it.</p>
</item>
<item>
- <p>Click the <gui style="button">Add</gui> button to add a new
+ <p>Click the <gui style="button">Add</gui> button to add a new
subkey.</p>
</item>
<item>
diff --git a/help/C/subkeys-examine.page b/help/C/subkeys-examine.page
index 3fcfa72..30e4cc6 100644
--- a/help/C/subkeys-examine.page
+++ b/help/C/subkeys-examine.page
@@ -7,6 +7,8 @@
<revision version="0.1" date="2011-10-23" status="stub"/>
<revision pkgversion="3.9" version="0.1" date="2013-07-01" status="draft"/>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<credit type="author copyright">
<name>Aruna Sankaranarayanan</name>
<email>aruna evam gmail com</email>
diff --git a/help/C/userid-add.page b/help/C/userid-add.page
index 92c1442..a1632c8 100644
--- a/help/C/userid-add.page
+++ b/help/C/userid-add.page
@@ -8,6 +8,8 @@
<revision version="0.1" date="2011-10-23" status="stub"/>
<revision pkgversion="3.9" version="0.1" date="2013-06-27" status="draft"/>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<credit type="author copyright">
<name>Aruna Sankaranarayanan</name>
<email>aruna evam gmail com</email>
diff --git a/help/C/userid-primary.page b/help/C/userid-primary.page
index 64a6989..cbc950a 100644
--- a/help/C/userid-primary.page
+++ b/help/C/userid-primary.page
@@ -7,6 +7,8 @@
<revision version="0.1" date="2011-10-23" status="stub"/>
<revision pkgversion="3.9" version="0.1" date="2013-06-27" status="draft"/>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<credit type="author copyright">
<name>Aruna Sankaranarayanan</name>
<email>aruna evam gmail com</email>
diff --git a/help/C/userid-remove.page b/help/C/userid-remove.page
index 5df171c..1480174 100644
--- a/help/C/userid-remove.page
+++ b/help/C/userid-remove.page
@@ -8,6 +8,8 @@
<revision version="0.1" date="2011-10-23" status="stub"/>
<revision pkgversion="3.9" version="0.1" date="2013-06-27" status="draft"/>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<credit type="author copyright">
<name>Aruna Sankaranarayanan</name>
<email>aruna evam gmail com</email>
diff --git a/help/C/what-diff-private-public.page b/help/C/what-diff-private-public.page
index b5bfdfa..c410a2d 100644
--- a/help/C/what-diff-private-public.page
+++ b/help/C/what-diff-private-public.page
@@ -4,13 +4,16 @@
<info>
<link type="guide" xref="learn-about-keys" group="second"/>
<link type="seealso" xref="what-is-ssh-key"/>
+
<revision pkgversion="3.8" date="2013-02-26" status="incomplete"/>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<credit type="author">
<name>Jim Campbell</name>
<email>jwcampbell gmail com</email>
</credit>
-
+
<!-- TODO Insert pictures to that illustrate these concepts -->
</info>
diff --git a/help/C/what-is-certificate-key.page b/help/C/what-is-certificate-key.page
index 8759137..ca0bd61 100644
--- a/help/C/what-is-certificate-key.page
+++ b/help/C/what-is-certificate-key.page
@@ -2,22 +2,28 @@
type="topic" style="task"
id="what-is-certificate-key">
-<info>
- <link type="guide" xref="learn-about-keys" group="second"/>
- <revision pkgversion="3.4" version="0.1" date="2012-03-04" status="stub"/>
- <credit type="author">
- <name>Jim Campbell</name>
- <email>jwcampbell gmail com</email>
- </credit>
-</info>
+ <info>
+ <link type="guide" xref="learn-about-keys" group="second"/>
+
+ <revision pkgversion="3.4" version="0.1" date="2012-03-04" status="stub"/>
+
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
+ <credit type="author">
+ <name>Jim Campbell</name>
+ <email>jwcampbell gmail com</email>
+ </credit>
+
+ <desc></desc>
+ </info>
<title>What is a certificate?</title>
- <p>If you select <guiseq><gui>View</gui><gui></gui>Show Any</guiseq>, you
+ <p>If you select <guiseq><gui>View</gui><gui></gui>Show Any</guiseq>, you
will see many <em>Certificates</em> listed alongside your PGP and SSH keys.
. . . </p>
-
- <!-- stefw: Suggest noting that certificates are received from an
+
+ <!-- stefw: Suggest noting that certificates are received from an
Enterprise or Certificate Authority to be used for accessing
web services, email, and other things like that.
-->
diff --git a/help/C/what-is-keyring.page b/help/C/what-is-keyring.page
index c3f5989..12a6943 100644
--- a/help/C/what-is-keyring.page
+++ b/help/C/what-is-keyring.page
@@ -3,8 +3,11 @@
id="what-is-keyring">
<info>
<link type="guide" xref="learn-about-keys" group="first"/>
+
<revision version="0.1" date="2011-10-23" status="stub"/>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<credit type="author">
<name>Jim Campbell</name>
<email>jwcampbell gmail com</email>
@@ -31,7 +34,7 @@
<p>You may find this feature useful if you want some keys to be available
when you log in, but other keys to only be avaible if you enter a password
for that particular keyring.</p>
-
+
<!-- stefw: is this page really necessary, at least with this title?
Ideally we would remove the terms 'GNOME keyring' from the user
interface of seahorse. As far as the user is concerned his/her passwords
@@ -42,5 +45,5 @@
whereas the user may want to keep others locked, and only unlock them
when they want to look inside.
-->
-
+
</page>
diff --git a/help/C/what-is-pgp-key.page b/help/C/what-is-pgp-key.page
index 6abdd96..8932557 100644
--- a/help/C/what-is-pgp-key.page
+++ b/help/C/what-is-pgp-key.page
@@ -3,8 +3,11 @@
id="what-is-pgp-key">
<info>
<link type="guide" xref="learn-about-keys" group="first"/>
+
<revision version="0.1" date="2011-10-23" status="stub"/>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<credit type="author">
<name>Jim Campbell</name>
<email>jwcampbell gmail com</email>
diff --git a/help/C/what-is-ssh-key.page b/help/C/what-is-ssh-key.page
index baf25ed..72c31aa 100644
--- a/help/C/what-is-ssh-key.page
+++ b/help/C/what-is-ssh-key.page
@@ -3,8 +3,11 @@
id="what-is-ssh-key">
<info>
<link type="guide" xref="learn-about-keys" group="first"/>
+
<revision version="0.1" date="2011-10-23" status="stub"/>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<credit type="author">
<name>Jim Campbell</name>
<email>jwcampbell gmail com</email>
@@ -14,35 +17,35 @@
<title>What is a Secure Shell key?</title>
- <p>A <em>Secure Shell key</em>, often just called an <em>SSH key</em>,
+ <p>A <em>Secure Shell key</em>, often just called an <em>SSH key</em>,
helps you create a secure connection over an unsecured network.</p>
-
- <p>Before <em>SSH keys</em>, computers would create connections via insecure
- protocols, such as <em>Telnet</em>. These protocols just used plaintext
- passwords to create connections between computers. These passwords could be
+
+ <p>Before <em>SSH keys</em>, computers would create connections via insecure
+ protocols, such as <em>Telnet</em>. These protocols just used plaintext
+ passwords to create connections between computers. These passwords could be
easily intercepted.</p>
-
+
<list>
<title>An SSH key actually consists of two parts:</title>
<item><p>A public key, which is widely available.</p></item>
- <item><p>A private key, which is kept secret. The private key is used
+ <item><p>A private key, which is kept secret. The private key is used
to unlock messages encrypted with a corresponding public key.</p></item>
</list>
-
+
<!-- stefw: Suggest linking here to the page what-diff-private-public.page -->
- <p>The advantage of using an <em>SSH key</em> to create a connection between
- computers is that only the <em>Public key</em> needs to be sent over
- the network. Transmissions encrypted with a <em>Public key</em> can only be
- decoded by unlocking them with the corresponding <em>Private key</em> and a
- password. Because only the public key is sent over the network, the key's
- password is kept secret.</p>
-
-
- <p><em>SSH keys</em> are most often used in situations where data security is
+ <p>The advantage of using an <em>SSH key</em> to create a connection between
+ computers is that only the <em>Public key</em> needs to be sent over
+ the network. Transmissions encrypted with a <em>Public key</em> can only be
+ decoded by unlocking them with the corresponding <em>Private key</em> and a
+ password. Because only the public key is sent over the network, the key's
+ password is kept secret.</p>
+
+
+ <p><em>SSH keys</em> are most often used in situations where data security is
<!-- stefw: Suggest removing the word 'very' on next line, as SSH is used routinely these days -->
very important. For example, a system administrator would use an <em>SSH key
- </em> when connecting to a remote server to perform system updates. A
- software developer would use an <em>SSH key</em> to submit updated software
+ </em> when connecting to a remote server to perform system updates. A
+ software developer would use an <em>SSH key</em> to submit updated software
code to a remote software repository.</p>
-
+
</page>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
