commit 090643b9236f1dbc6921ec8dd40e6a3f67ea4860 Author: emma peel emma.peel@riseup.net Date: Wed May 19 14:45:36 2021 +0200
merge content updates from master --- content/contents.lr | 2 +- content/relay/setup/guard/centosrhel/contents.lr | 2 +- content/relay/setup/guard/debianubuntu/contents.lr | 2 +- content/relay/setup/guard/fedora/contents.lr | 2 +- content/relay/setup/guard/freebsd/contents.lr | 2 +- content/relay/setup/guard/netbsd/contents.lr | 2 +- content/relay/setup/guard/openbsd/contents.lr | 2 +- content/training/faq/contents.lr | 4 ++-- content/user-research/persona/contents.lr | 4 ++-- 9 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/content/contents.lr b/content/contents.lr index 9f90191..7bd3d5d 100644 --- a/content/contents.lr +++ b/content/contents.lr @@ -17,4 +17,4 @@ body: The Tor community is made up of all kinds of contributors. Some people write documentation and bug reports, while others hold Tor events and conduct outreach. Whether you have a lot of time to volunteer or a little, and whether you consider yourself technical or not, we want you to join our community, too. -Below you'll find some different ways to volunteer with the Tor community as well as resources to help you help Tor. +Below, you'll find some different ways to volunteer with the Tor community as well as resources to better help you help Tor. diff --git a/content/relay/setup/guard/centosrhel/contents.lr b/content/relay/setup/guard/centosrhel/contents.lr index 64996d1..e5e7afd 100644 --- a/content/relay/setup/guard/centosrhel/contents.lr +++ b/content/relay/setup/guard/centosrhel/contents.lr @@ -69,7 +69,7 @@ If your relay is now running, check out the [post-install](/relay/setup/post-ins --- html: two-columns-page.html --- -key: 5 +key: 1 --- section: Middle/Guard relay --- diff --git a/content/relay/setup/guard/debianubuntu/contents.lr b/content/relay/setup/guard/debianubuntu/contents.lr index fc3b008..884e4f9 100644 --- a/content/relay/setup/guard/debianubuntu/contents.lr +++ b/content/relay/setup/guard/debianubuntu/contents.lr @@ -49,7 +49,7 @@ If your relay is now running, check out the [post-install](/relay/setup/post-ins --- html: two-columns-page.html --- -key: 1 +key: 2 --- section: Middle/Guard relay --- diff --git a/content/relay/setup/guard/fedora/contents.lr b/content/relay/setup/guard/fedora/contents.lr index 795fe98..997ed43 100644 --- a/content/relay/setup/guard/fedora/contents.lr +++ b/content/relay/setup/guard/fedora/contents.lr @@ -52,7 +52,7 @@ If your relay is now running, check out the [post-install](/relay/setup/post-ins --- html: two-columns-page.html --- -key: 3 +key: 4 --- section: Middle/Guard relay --- diff --git a/content/relay/setup/guard/freebsd/contents.lr b/content/relay/setup/guard/freebsd/contents.lr index ae23c98..97b70a4 100644 --- a/content/relay/setup/guard/freebsd/contents.lr +++ b/content/relay/setup/guard/freebsd/contents.lr @@ -111,7 +111,7 @@ If your relay is now running, check out the [post-install](/relay/setup/post-ins --- html: two-columns-page.html --- -key: 2 +key: 5 --- section: Middle/Guard relay --- diff --git a/content/relay/setup/guard/netbsd/contents.lr b/content/relay/setup/guard/netbsd/contents.lr index 688cbce..48a1ec7 100644 --- a/content/relay/setup/guard/netbsd/contents.lr +++ b/content/relay/setup/guard/netbsd/contents.lr @@ -42,7 +42,7 @@ echo "tor=YES" >> /etc/rc.conf --- html: two-columns-page.html --- -key: 2 +key: 6 --- section: Middle/Guard relay --- diff --git a/content/relay/setup/guard/openbsd/contents.lr b/content/relay/setup/guard/openbsd/contents.lr index ffb2f97..232a2fe 100644 --- a/content/relay/setup/guard/openbsd/contents.lr +++ b/content/relay/setup/guard/openbsd/contents.lr @@ -85,7 +85,7 @@ rcctl start tor --- html: two-columns-page.html --- -key: 2 +key: 7 --- section: Middle/Guard relay --- diff --git a/content/training/faq/contents.lr b/content/training/faq/contents.lr index 85ed923..fcb7fd8 100644 --- a/content/training/faq/contents.lr +++ b/content/training/faq/contents.lr @@ -5,7 +5,7 @@ title: Tor Training FAQ body:
After running a couple of Tor trainings, you will find that first time users have some similar questions about Tor. -These are the most frequent questions we hear during our training sessions. Be prepared for them before running your training. +Outlined below are some of the most frequent questions we get during our training sessions. Be prepared for these questions before running your training. For an extensive resource, check [Support portal](https://support.torproject.org).
* [Why is it called Tor?](https://support.torproject.org/about/why-is-it-called-tor/) @@ -36,4 +36,4 @@ section_id: training --- subtitle:
-People new to Tor often ask similar questions, and we can help you prepare for answering them. +People who are new to the Tor project, quite often, ask similar questions, and we can help you prepare for these questions. diff --git a/content/user-research/persona/contents.lr b/content/user-research/persona/contents.lr index 33efd66..343fe1a 100644 --- a/content/user-research/persona/contents.lr +++ b/content/user-research/persona/contents.lr @@ -8,7 +8,7 @@ _template: layout.html --- title: Tor Personas --- -subtitle: Personas help us to drive human-centered design processes across teams. Meet our archetypes of Tor users. +subtitle: Personas help us to drive human-centered design processes across teams. Meet our archetypes of Tor users. --- key: 4 --- @@ -16,7 +16,7 @@ html: two-columns-page.html --- body:
-Persona is a tool that represents the needs, thoughts, and goals of the target user. We created personas because they help us to drive human-centered design processes. +Persona is a tool that represents the needs, thoughts, and goals of the target user. We created personas because they help us to drive human-centered design processes. As part of our global south travels during 2018 and 2019, we got the lucky chance to meet a lot of different Tor users: from activists to journalists, all of them with different motivations, but demanding a usable private and secure tool to access the Internet. With the Community Team, we have been working collecting and mapping real user stories and finding patterns across them. It is how our Personas emerged from our in field research.