Hi,
Attached is the following:
commit a4cdb31408c9fea951b2a427d03491ce5ab3b8e5
Author: Chris Lamb <lamby@???>
Date: Mon Nov 21 10:58:53 2016 +0100
Drop superfluous comma.
Signed-off-by: Chris Lamb <lamby@???>
wiki/src/index.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 1973e1a98096d523fa0e797d09bb5eed54f6c6b8
Author: Chris Lamb <lamby@???>
Date: Mon Nov 21 10:59:19 2016 +0100
Separate paragraph that describes that it is a live system and the benefits.
wiki/src/index.html | 3 +++
1 file changed, 3 insertions(+)
commit 8ddec86444839484a4c1b51167af122bdca45394
Author: Chris Lamb <lamby@???>
Date: Mon Nov 21 11:02:55 2016 +0100
Replace "someone of trust" with "someone you trust".
Signed-off-by: Chris Lamb <lamby@???>
wiki/src/install/inc/router/clone.html | 2 +-
wiki/src/install/mac.html | 2 +-
wiki/src/support/faq.mdwn | 2 +-
wiki/src/upgrade.html | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
commit de56a6e7598bab1faf8c2264e5d58d2cb9e92c2c
Author: Chris Lamb <lamby@???>
Date: Mon Nov 21 11:04:18 2016 +0100
Replace "You need" with "You will need" on upgrade overview.
This is the usual phrasing for "recipes".
Signed-off-by: Chris Lamb <lamby@???>
wiki/src/install/inc/overview.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
You can also merge from the "misc-documentation-fixes" branch of
https://github.com/lamby/tails if that is more convenient.
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` lamby@??? / chris-lamb.co.uk
`-
From a4cdb31408c9fea951b2a427d03491ce5ab3b8e5 Mon Sep 17 00:00:00 2001
From: Chris Lamb <lamby@???>
Date: Mon, 21 Nov 2016 10:58:53 +0100
Subject: [PATCH 1/4] Drop superfluous comma.
Signed-off-by: Chris Lamb <lamby@???>
---
wiki/src/index.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/wiki/src/index.html b/wiki/src/index.html
index 3b4311d..d35c33a 100644
--- a/wiki/src/index.html
+++ b/wiki/src/index.html
@@ -5,7 +5,7 @@
<div id="intro">
<p>
-Tails is a [[!wikipedia desc="live operating system" Live_USB]], that
+Tails is a [[!wikipedia desc="live operating system" Live_USB]] that
you can start on almost any computer from a DVD, USB stick, or SD card.
It aims at preserving your <strong>privacy</strong> and
<strong>anonymity</strong>, and helps you to:
--
2.10.2
From 1973e1a98096d523fa0e797d09bb5eed54f6c6b8 Mon Sep 17 00:00:00 2001
From: Chris Lamb <lamby@???>
Date: Mon, 21 Nov 2016 10:59:19 +0100
Subject: [PATCH 2/4] Separate paragraph that describes that it is a live
system and the benefits.
---
wiki/src/index.html | 3 +++
1 file changed, 3 insertions(+)
diff --git a/wiki/src/index.html b/wiki/src/index.html
index d35c33a..abdb50b 100644
--- a/wiki/src/index.html
+++ b/wiki/src/index.html
@@ -7,6 +7,9 @@
<p>
Tails is a [[!wikipedia desc="live operating system" Live_USB]] that
you can start on almost any computer from a DVD, USB stick, or SD card.
+</p
+
+<p>
It aims at preserving your <strong>privacy</strong> and
<strong>anonymity</strong>, and helps you to:
</p>
--
2.10.2
From 8ddec86444839484a4c1b51167af122bdca45394 Mon Sep 17 00:00:00 2001
From: Chris Lamb <lamby@???>
Date: Mon, 21 Nov 2016 11:02:55 +0100
Subject: [PATCH 3/4] Replace "someone of trust" with "someone you trust".
Signed-off-by: Chris Lamb <lamby@???>
---
wiki/src/install/inc/router/clone.html | 2 +-
wiki/src/install/mac.html | 2 +-
wiki/src/support/faq.mdwn | 2 +-
wiki/src/upgrade.html | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/wiki/src/install/inc/router/clone.html b/wiki/src/install/inc/router/clone.html
index 13807ab..78f9a3e 100644
--- a/wiki/src/install/inc/router/clone.html
+++ b/wiki/src/install/inc/router/clone.html
@@ -1,6 +1,6 @@
<h3>Install from another Tails</h3>
-<p>If you know someone of trust who uses Tails already, then you can
+<p>If you know someone you trust who uses Tails already, then you can
install your Tails by copying from it. Make sure that this
Tails is up-to-date.</p>
diff --git a/wiki/src/install/mac.html b/wiki/src/install/mac.html
index 07cec2c..6982773 100644
--- a/wiki/src/install/mac.html
+++ b/wiki/src/install/mac.html
@@ -27,7 +27,7 @@ installation methods</strong>.</p>
<ol class="mac_install">
<li>
- <p>If you know someone of trust who uses Tails already, you can try installing your USB stick by copying from it. Make sure that this Tails is up-to-date.</p>
+ <p>If you know someone you trust who uses Tails already, you can try installing your USB stick by copying from it. Make sure that this Tails is up-to-date.</p>
<div class="row">
<div class="col-sm-8">
diff --git a/wiki/src/support/faq.mdwn b/wiki/src/support/faq.mdwn
index 2d41b96..375da23 100644
--- a/wiki/src/support/faq.mdwn
+++ b/wiki/src/support/faq.mdwn
@@ -197,7 +197,7 @@ Selling preinstalled devices would in fact be a pretty bad idea:
* If installed onto a USB stick, then it would be impossible to verify
that the Tails on the USB stick is genuine. Trusting that a Tails device
is genuine should be based either on cryptographic verification or
- on personal trust (if you know someone of trust who can clone a Tails device for you). But
+ on personal trust (if you know someone you trust who can clone a Tails device for you). But
once Tails is installed on a USB stick it is not possible to use our
cryptographic verification techniques anymore. Being able to trust
your Tails device is something that we really care about.
diff --git a/wiki/src/upgrade.html b/wiki/src/upgrade.html
index 380405f..f6fbc75 100644
--- a/wiki/src/upgrade.html
+++ b/wiki/src/upgrade.html
@@ -12,7 +12,7 @@
<h3>Upgrade from another Tails</h3>
- <p>If you know someone of trust who already did the upgrade, you can
+ <p>If you know someone you trust who already did the upgrade, you can
upgrade your Tails by cloning from it.</p>
<h4>You need:</h4>
--
2.10.2
From de56a6e7598bab1faf8c2264e5d58d2cb9e92c2c Mon Sep 17 00:00:00 2001
From: Chris Lamb <lamby@???>
Date: Mon, 21 Nov 2016 11:04:18 +0100
Subject: [PATCH 4/4] Replace "You need" with "You will need" on upgrade
overview.
This is the usual phrasing for "recipes".
Signed-off-by: Chris Lamb <lamby@???>
---
wiki/src/install/inc/overview.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/wiki/src/install/inc/overview.html b/wiki/src/install/inc/overview.html
index 7a21eb0..0103f98 100644
--- a/wiki/src/install/inc/overview.html
+++ b/wiki/src/install/inc/overview.html
@@ -1,6 +1,6 @@
<div id="needs">
- <h3>You need</h3>
+ <h3>You will need</h3>
<div class="row">
<div class="col-xs-12 col-sm-3 upgrade-clone upgrade-tails">
<div class="thumbnail">
--
2.10.2
