[tor-commits] [community/master] apply lost dip patches overwritten by torpusher

Fri Aug 9 11:32:33 UTC 2019

commit 2098893df56f4239cd0730fba42a50d937d93dba
Author: emma peel <emma.peel at riseup.net>
Date:   Fri Aug 9 13:32:19 2019 +0200

    apply lost dip patches overwritten by torpusher
---
 content/localization/pick-a-project/contents.lr    | 10 +++---
 .../technical-considerations/contents.lr           | 39 +++++++++++-----------
 .../relay-operations/technical-setup/contents.lr   |  2 +-
 3 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/content/localization/pick-a-project/contents.lr b/content/localization/pick-a-project/contents.lr
index 7d18464..d5fe0af 100644
--- a/content/localization/pick-a-project/contents.lr
+++ b/content/localization/pick-a-project/contents.lr
@@ -15,10 +15,12 @@ key: 3
 html: two-columns-page.html
 ---
 body:
-We have some statistics to help you choose a project. Here you have the current situation for all languages:
+We want our tools to be available and localized for anyone who wants to use them and appreciate your help. To find out where your knowledge may be most helpful, take a look at the translation progress for the Tor ecosystem of tools so far:
 
 <img class="col-lg-6" src="../../static/images/localization/stats.png">
 
-* The Tor Browser is translated in many different Transifex resources, but you can see the [Tor Browser total strings translated per language](https://torpat.ch/locales).
-* The Tor Browser User Manual is a very useful resource for new users that do not speak English, see [Tor Browser User Manual translation statistics](https://torpat.ch/manual-locales) or [translate](https://www.transifex.com/otf/tor-project-support-community-portal/tbmanual-contentspot/)
-* Same with the support portal, see [Tor Support Portal translation statistics](https://torpat.ch/support-locales) or [translate](https://www.transifex.com/otf/tor-project-support-community-portal/support-portal/)
+Although we would value your contribution to any of the projects above, the most critical are Tor Browser, the Tor Browser User Manual, and our Support Portal:
+
+* Tor Browser is translated in many different Transifex resources, but you can see the [Tor Browser total strings translated per language](https://torpat.ch/locales) to see where help is needed.
+* The Tor Browser User Manual is a very useful resource for new users that do not speak English, see [Tor Browser User Manual translation statistics](https://torpat.ch/manual-locales) or [translate](https://www.transifex.com/otf/tor-project-support-community-portal/tbmanual-contentspot/).
+* The Support Portal is also a valuable resource for all Tor users, see [Tor Support Portal translation statistics](https://torpat.ch/support-locales) or [translate](https://www.transifex.com/otf/tor-project-support-community-portal/support-portal/)
diff --git a/content/relay-operations/technical-considerations/contents.lr b/content/relay-operations/technical-considerations/contents.lr
index df9ce12..9884bc3 100644
--- a/content/relay-operations/technical-considerations/contents.lr
+++ b/content/relay-operations/technical-considerations/contents.lr
@@ -6,12 +6,12 @@ _template: layout.html
 ---
 body:
 
-# Considerations when choosing a hosting provider
+# Choosing a hosting provider
 
-If you have access to a high speed internet connection (>=100 Mbit/s in both directions) and a physical piece of computer hardware, this is the best way to run a relay.
+Having access to a high speed internet connection (>=100 Mbit/s in both directions) and a physical piece of computer hardware is the best way to run a relay.
 Having full control over the hardware and connection gives you a more controllable and (if done correctly) secure environment.
 You can host your own physical hardware at home (do NOT run a Tor exit relay from your home) or in a data center.
-Sometimes this is referred to as installing the relay on "bare metal".
+Sometimes this is referred to as installing the relay on "bare metal."
 
 If you do not own physical hardware, you could run a relay on a rented dedicated server or virtual private server (VPS).
 This can cost anywhere between $3.00/month and thousands per month, depending on your provider, hardware configuration, and bandwidth usage.
@@ -19,30 +19,30 @@ Many VPS providers will not allow you to run exit relays.
 You must follow the VPS provider's terms of service, or risk having your account disabled.
 For more information on hosting providers and their policies on allowing Tor relays, please see this list maintained by the Tor community: [GoodBadISPs](FIXME).
 
-## Questions to consider when choosing a hoster
+## Questions to consider when choosing a host
 
-* How much monthly traffic is included? (Is bandwidth "unmetered"?)
-* Does the hoster provide IPv6 connectivity? (it is recommended, but not required)
-* What virtualization / hypervisor (if any) does the provider use? (anything but OpenVZ should be fine)
+* How much monthly traffic is included? Is bandwidth "unmetered"?
+* Does the hoster provide IPv6 connectivity? It is recommended, but not required.
+* What virtualization / hypervisor (if any) does the provider use? Anything but OpenVZ should be fine.
 * Does the hoster start to throttle bandwidth after a certain amount of traffic?
-* How well connected is the autonomous system of the hoster? To answer this question you can use the AS rank of the autonomous systems if you want to compare: http://as-rank.caida.org/ (a lower value is better)
+* How well connected is the autonomous system of the hoster? To answer this question you can use the AS rank of the autonomous systems if you want to compare: (a lower value is better) http://as-rank.caida.org/
 
-## If you plan to run Exit Relays
+## If you plan to run exit relays
 
-* Does the hoster allow Tor exit relays? (explicitly ask them before starting an exit relay there)
+* Does the hoster allow Tor exit relays? We recommend you explicitly ask them before getting started.
 * Does the hoster allow custom WHOIS records for your IP addresses? This helps reduce the amount of abuse sent to the hoster instead of you.
 * Does the hoster allow you to set a custom DNS reverse entry? (DNS PTR record)
 
-  This are probably things you will need to ask the hoster in a Pre-Sales ticket
+  You can usually ask these questions in a Pre-Sales ticket.
 
 # AS/location diversity
 
 When selecting your hosting provider, consider network diversity on an autonomous system (AS) and country level.
 A more diverse network is more resilient to attacks and outages.
 Sometimes it is not clear which AS you are buying from in case of resellers.
-To be sure it is best to ask the hoster about the AS number before ordering a server.
+To be sure, ask the host about the AS number before ordering a server.
 
-It is best to avoid hosters where many Tor relays are already hosted, but it is still better to add one there than to run no relay at all.
+It is best to avoid hosts where many Tor relays are already hosted, but it is still better to add one there than to run no relay at all.
 
  **Try to avoid** the following hosters:
 
@@ -51,16 +51,15 @@ It is best to avoid hosters where many Tor relays are already hosted, but it is
 * Hetzner Online GmbH (AS24940)
 * DigitalOcean, LLC (AS14061)
 
-To find out which hoster and countries are already used by many other operators (that should be avoided) you can use Relay Search:
+To find out which host and countries are already used by many other operators (that should be avoided) you can use Relay Search:
 
 * [Autonomous System Level Overview](https://metrics.torproject.org/rs.html#aggregate/as)
 * [Country Level Overview](https://metrics.torproject.org/rs.html#aggregate/cc)
 
 # Choosing an Operating System
 
-We recommend you use the operating system you are most familiar with.
-
-Please keep in mind that since most relays run on Debian and we want to avoid a monoculture, BSD and other non-Linux based relays are greatly needed.
+We recommend using the operating system you are most familiar with, but if you're able, the network would most benefit from BSD and other non-Linux based relays.
+Most relays currently run on Debian.
 
 The following table shows the current OS distribution on the Tor network to give you an idea of how much more non-Linux relays we should have:
 
@@ -68,7 +67,7 @@ The following table shows the current OS distribution on the Tor network to give
 
 # OS Level Configuration
 
-OS configuration is outside the scope of this guide but the following points are crucial for a Tor relay, so we want to mention them here nonetheless.
+OS configuration is outside the scope of this guide, but the following points are crucial for a Tor relay, so we want to mention them here nonetheless.
 
 ## Time Synchronization (NTP)
 
@@ -76,8 +75,8 @@ Correct time settings are essential for Tor relays. It is recommended that you u
 
 ## Automatic Software Updates
 
-One of the most imported things to keeps your relay secure is to install security updates timely and ideally automatically so you can not forget about it.
-We collected the steps to enable automatic software updates for different operating systems:
+One of the most important things to keeps your relay secure is to immediately install security updates. We recommend setting updates to install automatically.
+Here's how to enable automatic software updates for different operating systems:
 
 * [RPM-based distributions](FIXME) (RHEL, CentOS, Fedora, openSUSE)
 * [Debian/Ubuntu](FIXME)
diff --git a/content/relay-operations/technical-setup/contents.lr b/content/relay-operations/technical-setup/contents.lr
index 886bacc..71bd65a 100644
--- a/content/relay-operations/technical-setup/contents.lr
+++ b/content/relay-operations/technical-setup/contents.lr
@@ -8,7 +8,7 @@ key: 4
 ---
 _template: layout.html
 ---
-title: Technical setup
+title: Technical Setup
 ---
 subtitle: Installing and configuring your Tor relay: Bridge, Guard / Middle node, Exit.
 ---

