summaryrefslogtreecommitdiffstats
path: root/wiki/src/contribute
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2012-08-05 15:55:00 +0200
committerTails developers <amnesia@boum.org>2012-08-05 15:55:00 +0200
commit5a9c39a61cc32b8d6f008407869e03a9a971b5c9 (patch)
treeb274b026290aeb650310283e174275e93f22e283 /wiki/src/contribute
parentb1e1be3f84d097777948c3e3e4f97e887b782bc4 (diff)
Revert "Merge branch 'master' into doc/trail"
This reverts commit 848dd103cbdc6324e1ec0f85e1c7ef26f4b95630, reversing changes made to 932a867d908c72c6070f962cb30514d85a28bd17.
Diffstat (limited to 'wiki/src/contribute')
-rw-r--r--wiki/src/contribute/design/persistence.mdwn2
-rw-r--r--wiki/src/contribute/design/usb_installation.mdwn2
-rw-r--r--wiki/src/contribute/release_process/test.mdwn2
3 files changed, 3 insertions, 3 deletions
diff --git a/wiki/src/contribute/design/persistence.mdwn b/wiki/src/contribute/design/persistence.mdwn
index b75447a..c0a42db 100644
--- a/wiki/src/contribute/design/persistence.mdwn
+++ b/wiki/src/contribute/design/persistence.mdwn
@@ -1,5 +1,5 @@
Data persistence is a somewhat tricky topic in a Live system context,
-especially one explicitly designed to avoid leaving any trace of
+especially one explicitely designed to avoid leaving any trace of
its use.
Some real-life usecases however require to setup some kind of data
diff --git a/wiki/src/contribute/design/usb_installation.mdwn b/wiki/src/contribute/design/usb_installation.mdwn
index 2648bee..cca14fc 100644
--- a/wiki/src/contribute/design/usb_installation.mdwn
+++ b/wiki/src/contribute/design/usb_installation.mdwn
@@ -49,7 +49,7 @@ The storage device is partitioned using [GPT](https://en.wikipedia.org/wiki/GUID
* The system partition can be hidden from Windows. Hopefully this
should prevent some misuse of Tails system partition, even if we
- explicitly discourage users to plug their Tails USB stick to a
+ explicitely discourage users to plug their Tails USB stick to a
running system (Windows among other OS).
* `sgdisk` can run on Windows whereas no other free partitioning tools
are available under Windows for other partioning method.
diff --git a/wiki/src/contribute/release_process/test.mdwn b/wiki/src/contribute/release_process/test.mdwn
index 627fde2..5e37cde 100644
--- a/wiki/src/contribute/release_process/test.mdwn
+++ b/wiki/src/contribute/release_process/test.mdwn
@@ -70,7 +70,7 @@ Check the image size has not changed much since the last release.
- check output of `iptables -t nat -L -n -v`
- try connecting to the Internet after unsetting `$http_proxy` and
`$HTTP_PROXY` using a piece of software that does not obey the
- GNOME proxy settings, *and* is not explicitly torified in Tails:
+ GNOME proxy settings, *and* is not explicitely torified in Tails:
`unset http_proxy ; unset HTTP_PROXY ; wget --no-proxy
http://monip.org` (should result in a "`Connection refused`".
* firewall: is IPv6 traffic blocked?