summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsajolida <sajolida@pimienta.org>2015-10-30 10:22:36 +0000
committersajolida <sajolida@pimienta.org>2015-10-30 10:25:56 +0000
commit18cc44c6b953e2287fe1dc2a25b30c19ff9f434d (patch)
treed0a14e3ff9e992cb4a42855a72f17f289ea364c0
parentb64b0dcce0dbad25d840562677e90d3393ea2f6a (diff)
Fix serial comma
-rw-r--r--wiki/src/doc/about/trust.mdwn2
-rw-r--r--wiki/src/doc/first_steps/startup_options/bridge_mode.mdwn4
2 files changed, 3 insertions, 3 deletions
diff --git a/wiki/src/doc/about/trust.mdwn b/wiki/src/doc/about/trust.mdwn
index 0c2e7ce..94cadc6 100644
--- a/wiki/src/doc/about/trust.mdwn
+++ b/wiki/src/doc/about/trust.mdwn
@@ -11,7 +11,7 @@ our word that we are legit?
No matter what your opinion is in this matter you should ask yourself how you
reached your conclusion. Both trust and distrust need to be
established based on facts, not gut feelings, paranoid suspicion,
-unfounded hearsay or our word. Of course, we claim to be honest, but
+unfounded hearsay, or our word. Of course, we claim to be honest, but
written assurances are worthless. In order to make an informed
decision you must look at the greater picture of what Tails is
comprised of, our affiliations, and possibly how others trust us.
diff --git a/wiki/src/doc/first_steps/startup_options/bridge_mode.mdwn b/wiki/src/doc/first_steps/startup_options/bridge_mode.mdwn
index 00faab8..d90b5ba 100644
--- a/wiki/src/doc/first_steps/startup_options/bridge_mode.mdwn
+++ b/wiki/src/doc/first_steps/startup_options/bridge_mode.mdwn
@@ -59,7 +59,7 @@ Tails allows you to use bridges of the following types:
- `obfs4`
- `ScrambleSuit`
-To use Tor via bridges, chose the bridge settings configuration option in [[<span
+To use Tor through bridges, choose the bridge settings configuration option in [[<span
class="application">Tails Greeter</span>|startup_options#tails_greeter]] as
explained in the [[network configuration|network_configuration]] documentation.
@@ -76,7 +76,7 @@ If using Tor is dangerous in your country
The Tor Project's [documentation on
bridges](https://www.torproject.org/docs/bridges) mainly focuses on
-censorship circumvention, e.g. when using Tor is blocked by
+censorship circumvention: when using Tor is blocked by
censorship. If using Tor is dangerous or considered suspicious in your
country, then there are some extra rules that you should follow in order
to prevent yourself from being identified as a Tor user.