[tor-commits] [community/staging] remove automatically generated files, and fix strings for relays doc

hiro at torproject.org hiro at torproject.org
Fri Jul 5 13:13:31 UTC 2019 

commit bccec90eb5205dba9307363a96f6fceb9d8b6087
Author: emma peel <emma.peel at riseup.net>
Date:   Mon Jun 17 08:38:42 2019 +0200

    remove automatically generated files, and fix strings for relays doc
---
 content/onion-services/contents+es.lr              | 23 ------
 content/onion-services/contents+fr.lr              | 23 ------
 content/outreach/contents+en.lr                    | 23 ------
 content/outreach/contents+es.lr                    | 23 ------
 content/outreach/contents+fr.lr                    | 23 ------
 .../relay-operations/types-of-relays/contents.lr   | 87 ++++++++--------------
 6 files changed, 30 insertions(+), 172 deletions(-)

diff --git a/content/onion-services/contents+es.lr b/content/onion-services/contents+es.lr
deleted file mode 100644
index 0077c71..0000000
--- a/content/onion-services/contents+es.lr
+++ /dev/null
@@ -1,23 +0,0 @@
-section: onion services
----
-section_id: onion-services
----
-color: primary
----
-_template: layout.html
----
-title: .onion Services
----
-subtitle: Onion services help you and your users defeat surveillance and censorship. Learn how you can deploy onion services.
----
-cta: Grow your .onion
----
-key: 6
----
-html: onion-services.html
----
-body:
-
-##What are Onion Services?
-
-Onion services are services that can only be accessed over Tor. Running an onion service gives your users all the security of HTTPS with the added privacy benefits of Tor Browser.
diff --git a/content/onion-services/contents+fr.lr b/content/onion-services/contents+fr.lr
deleted file mode 100644
index 0077c71..0000000
--- a/content/onion-services/contents+fr.lr
+++ /dev/null
@@ -1,23 +0,0 @@
-section: onion services
----
-section_id: onion-services
----
-color: primary
----
-_template: layout.html
----
-title: .onion Services
----
-subtitle: Onion services help you and your users defeat surveillance and censorship. Learn how you can deploy onion services.
----
-cta: Grow your .onion
----
-key: 6
----
-html: onion-services.html
----
-body:
-
-##What are Onion Services?
-
-Onion services are services that can only be accessed over Tor. Running an onion service gives your users all the security of HTTPS with the added privacy benefits of Tor Browser.
diff --git a/content/outreach/contents+en.lr b/content/outreach/contents+en.lr
deleted file mode 100644
index f11f905..0000000
--- a/content/outreach/contents+en.lr
+++ /dev/null
@@ -1,23 +0,0 @@
-section: outreach
----
-section_id: outreach
----
-color: primary
----
-_template: layout.html
----
-title: Outreach
----
-subtitle: Bring Tor swag to our next community event.
----
-cta: Join the Tor community
----
-key: 3
----
-html: outreach.html
----
-body:
-
-##Tell the world about Tor
-
-We love it when people bring information about Tor to their community events, conferences, and meetups, and so we've curated some beautiful materials for in-person and social media outreach.
diff --git a/content/outreach/contents+es.lr b/content/outreach/contents+es.lr
deleted file mode 100644
index f11f905..0000000
--- a/content/outreach/contents+es.lr
+++ /dev/null
@@ -1,23 +0,0 @@
-section: outreach
----
-section_id: outreach
----
-color: primary
----
-_template: layout.html
----
-title: Outreach
----
-subtitle: Bring Tor swag to our next community event.
----
-cta: Join the Tor community
----
-key: 3
----
-html: outreach.html
----
-body:
-
-##Tell the world about Tor
-
-We love it when people bring information about Tor to their community events, conferences, and meetups, and so we've curated some beautiful materials for in-person and social media outreach.
diff --git a/content/outreach/contents+fr.lr b/content/outreach/contents+fr.lr
deleted file mode 100644
index f11f905..0000000
--- a/content/outreach/contents+fr.lr
+++ /dev/null
@@ -1,23 +0,0 @@
-section: outreach
----
-section_id: outreach
----
-color: primary
----
-_template: layout.html
----
-title: Outreach
----
-subtitle: Bring Tor swag to our next community event.
----
-cta: Join the Tor community
----
-key: 3
----
-html: outreach.html
----
-body:
-
-##Tell the world about Tor
-
-We love it when people bring information about Tor to their community events, conferences, and meetups, and so we've curated some beautiful materials for in-person and social media outreach.
diff --git a/content/relay-operations/types-of-relays/contents.lr b/content/relay-operations/types-of-relays/contents.lr
index 791427e..8e951b8 100644
--- a/content/relay-operations/types-of-relays/contents.lr
+++ b/content/relay-operations/types-of-relays/contents.lr
@@ -12,83 +12,56 @@ subtitle: Bridges, guards, middle relays, and exits all serve important function
 ---
 key: 1
 ---
-html: two-columns-page.html
+html: relay-operations.html
 ---
 body:
 
-All nodes are important, but they have different technical requirements and
-legal implications. Understanding the different kinds of nodes is the first step
-to learning which one is right for you.
+All nodes are important, but they have different technical requirements and legal implications.
+Understanding the different kinds of nodes is the first step to learning which one is right for you.
 
 # Guard and middle relay
 
 (also known as non-exit relays)
 
-A guard relay is the first relay in the chain of 3 relays building a Tor circuit. A
-middle relay is neither a guard nor an exit, but acts as the second hop between
-the two. To become a guard, a relay has to be stable and fast (at least
-2MByte/s) otherwise it will remain a middle relay.
+A guard relay is the first relay in the chain of 3 relays building a Tor circuit.
+A middle relay is neither a guard nor an exit, but acts as the second hop between the two.
+To become a guard, a relay has to be stable and fast (at least 2MByte/s) otherwise it will remain a middle relay.
 
-Guard and middle relays usually do not receive abuse complaints. All relays will
-be listed in the public list of Tor relays, so may be blocked by certain
-services that don't understand how Tor works or deliberately want to censor Tor
-users. If you are running a relay from home and have one static IP, you may want
-to consider running a bridge instead so that your non-Tor traffic doesn't get
-blocked as though it's coming from Tor. If you have a dynamic IP address or
-multiple static IPs, this isn't as much of an issue.
+Guard and middle relays usually do not receive abuse complaints.
+All relays will be listed in the public list of Tor relays, so may be blocked by certain services that don't understand how Tor works or deliberately want to censor Tor users.
+If you are running a relay from home and have one static IP, you may want to consider running a bridge instead so that your non-Tor traffic doesn't get blocked as though it's coming from Tor.
+If you have a dynamic IP address or multiple static IPs, this isn't as much of an issue.
 
-A non-exit Tor relay requires minimal maintenance efforts and bandwidth usage
-can be highly customized in the tor configuration (will be covered in more
-detail later in this guide). The so called "exit policy" of the relay decides if
-it is a relay allowing clients to exit or not. A non-exit relay does not allow
-exiting in its exit policy.
+A non-exit Tor relay requires minimal maintenance efforts and bandwidth usage can be highly customized in the tor configuration (will be covered in more detail later in this guide).
+The so called "exit policy" of the relay decides if it is a relay allowing clients to exit or not.
+A non-exit relay does not allow exiting in its exit policy.
 
 # Exit relay
 
-The exit relay is the final relay in a Tor circuit, the one that sends traffic
-out its destination. The services Tor clients are connecting to (website, chat
-service, email provider, etc) will see the IP address of the exit relay instead
-of their real IP address of the Tor user.
+The exit relay is the final relay in a Tor circuit, the one that sends traffic out its destination.
+The services Tor clients are connecting to (website, chat service, email provider, etc) will see the IP address of the exit relay instead of their real IP address of the Tor user.
 
 Exit relays have the greatest legal exposure and liability of all the relays.
-For example, if a user downloads copyrighted material while using your exit
-relay, you the operator may receive a
-[DMCA notice](https://www.dmca.com/Solutions/view.aspx?ID=712f28a5-93f2-467b-ba92-3d58c8345a32&?ref=sol08a2)
-. Any abuse complaints about the exit will go directly to you (via your
-hoster, depending on the WHOIS records). Generally, most complaints can be
-handled pretty easily through template letters, which we'll discuss more in
-legal considerations section.
+For example, if a user downloads copyrighted material while using your exit relay, you the operator may receive a [DMCA notice](https://www.dmca.com/Solutions/view.aspx?ID=712f28a5-93f2-467b-ba92-3d58c8345a32&?ref=sol08a2).
+Any abuse complaints about the exit will go directly to you (via your hoster, depending on the WHOIS records).
+Generally, most complaints can be handled pretty easily through template letters, which we'll discuss more in legal considerations section.
 
-Because of the legal exposure that comes with running an exit relay, you should
-not run a Tor exit relay from your home. Ideal exit relay operators are
-affiliated with some institution, like a university, a library, a hackerspace or
-a privacy related organization. An institution can not only provide greater
-bandwidth for the exit, but is better positioned to handle abuse complaints or
-the rare law enforcement inquiry.
+Because of the legal exposure that comes with running an exit relay, you should not run a Tor exit relay from your home.
+Ideal exit relay operators are affiliated with some institution, like a university, a library, a hackerspace or a privacy related organization.
+An institution can not only provide greater bandwidth for the exit, but is better positioned to handle abuse complaints or the rare law enforcement inquiry.
 
-If you are considering running an exit relay, please read the [section on legal
-considerations](FIXME) for exit relay operators.
+If you are considering running an exit relay, please read the [section on legal considerations](FIXME) for exit relay operators.
 
 # Bridge
 
 The design of the Tor network means that the IP address of Tor relays is public.
-However, one of the ways Tor can be blocked by governments or ISPs is by
-blacklisting the IP addresses of these public Tor nodes. Tor bridges are nodes
-in the network that are not listed in the public Tor directory, which make it
-harder for ISPs and governments to block them.
+However, one of the ways Tor can be blocked by governments or ISPs is by blacklisting the IP addresses of these public Tor nodes.
+Tor bridges are nodes in the network that are not listed in the public Tor directory, which make it harder for ISPs and governments to block them.
 
-Bridges are useful for Tor users under oppressive regimes or for people who want
-an extra layer of security because they're worried somebody will recognize that
-they are contacting a public Tor relay IP address. Several countries, including
-China and Iran, have found ways to detect and block connections to Tor bridges.
-Pluggable transports
-(https://www.torproject.org/docs/pluggable-transports.html.en), a special
-kind of bridge, address this by adding an additional layer of obfuscation.
+Bridges are useful for Tor users under oppressive regimes or for people who want an extra layer of security because they're worried somebody will recognize that they are contacting a public Tor relay IP address.
+Several countries, including China and Iran, have found ways to detect and block connections to Tor bridges.
+Pluggable transports(https://www.torproject.org/docs/pluggable-transports.html.en), a special kind of bridge, address this by adding an additional layer of obfuscation.
 
-Bridges are relatively easy, low-risk and low bandwidth Tor nodes to operate,
-but they have a big impact on users. A bridge isn't likely to receive any abuse
-complaints, and since bridges are not listed in the public consensus, they are
-unlikely to be blocked by popular services. Bridges are a great option if you
-can only run a Tor node from your home network, have only one static IP, and
-don't have a huge amount of bandwidth to donate -- we recommend giving your
-bridge at least 1 Mbit/sec.
+Bridges are relatively easy, low-risk and low bandwidth Tor nodes to operate, but they have a big impact on users.
+A bridge isn't likely to receive any abuse complaints, and since bridges are not listed in the public consensus, they are unlikely to be blocked by popular services.
+Bridges are a great option if you can only run a Tor node from your home network, have only one static IP, and don't have a huge amount of bandwidth to donate -- we recommend giving your bridge at least 1 Mbit/sec.

More information about the tor-commits mailing list