[or-cvs] r14402: Updated documentation to follow the Tor Trademark Guidelines (incognito/trunk/root_overlay/usr/share/incognito)

[anonym at seul.org]

Author: anonym
Date: 2008-04-18 17:42:07 -0400 (Fri, 18 Apr 2008)
New Revision: 14402

Modified:
   incognito/trunk/root_overlay/usr/share/incognito/readme.html
Log:
Updated documentation to follow the Tor Trademark Guidelines better.


Modified: incognito/trunk/root_overlay/usr/share/incognito/readme.html
===================================================================
--- incognito/trunk/root_overlay/usr/share/incognito/readme.html	2008-04-18 15:27:49 UTC (rev 14401)
+++ incognito/trunk/root_overlay/usr/share/incognito/readme.html	2008-04-18 21:42:07 UTC (rev 14402)
@@ -186,7 +186,7 @@
 <dd><!-- #description(x11-plugins/thunderplunger) --></dd>
 
 <dt><a href="<!-- #homepage(net-misc/trans-proxy-tor) -->">dns-proxy-tor</a> <!-- #version(net-misc/trans-proxy-tor) --></dt>
-<dd>DNS server that uses Tor to resolve addresses.</dd>
+<dd>DNS server that uses the Tor network to resolve addresses.</dd>
 
 <dt><a href="<!-- #homepage(net-dns/pdnsd) -->">pdnsd</a> <!-- #version(net-dns/pdnsd) --></dt>
 <dd><!-- #description(net-dns/pdnsd) -->. Configured to use dns-proxy-tor to do the resolution.</dd>
@@ -213,7 +213,7 @@
 <dd><!-- #description(app-misc/screen) --></dd>
 
 <dt><a href="<!-- #homepage(net-misc/openvpn) -->">OpenVPN</a> <!-- #version(net-misc/openvpn) --></dt>
-<dd><!-- #description(net-misc/openvpn) -->. Can operate over TCP or UDP. Due to the current implementation of Tor only TCP is anonymized. UDP is currently blocked.</dd>
+<dd><!-- #description(net-misc/openvpn) -->. Can operate over TCP or UDP. Due to limitations of the Tor software only TCP is anonymized. UDP is currently blocked.</dd>
 
 <dt><a href="<!-- #homepage(net-misc/vpnc) -->">vpnc</a> <!-- #version(net-misc/vpnc) --></dt>
 <dd><!-- #description(net-misc/vpnc) --></dd>
@@ -289,9 +289,9 @@
 
 <h3>Configuration</h3>
 
-<h4>Tor</h4>
+<h4>The Tor&trade; software</h4>
 <p>
-Tor is currently configured as a client only. The client listens on SOCKS port 9050, as a transparent proxy on port 9040 and control port 9051 (with cookie authentication). Only connections from localhost are accepted. It can be argued that running a server would increase your anonymity for a number for reasons but we still feel that most users probably would not want this.
+The Tor software is currently configured as a client only. The client listens on SOCKS port 9050, as a transparent proxy on port 9040 and control port 9051 (with cookie authentication). Only connections from localhost are accepted. It can be argued that running a server would increase your anonymity for a number for reasons but we still feel that most users probably would not want this.
 </p>
 
 <ul>
@@ -312,7 +312,7 @@
 
 <h4>DNS</h4>
 <p>
-DNS leaks are controlled by using a local caching server. Two software packages are used to effect this. dns-proxy-tor listens for DNS requests and forwards to Tor for the resolution. pdnsd is used to provide caching.  pdnsd is the server configured in /etc/resolv.conf, listening on localhost. It is configured to forward to dns-proxy-tor for the actual resoluton. There is a security concerns that some application could attempt to do its own DNS resolution without consulting /etc/resolv.conf. UDP packets are blocked to prevent leaks. Another solution may be to use the Linux network filter to forward to the local DNS server.
+DNS leaks are controlled by using a local caching server. Two software packages are used to effect this. dns-proxy-tor listens for DNS requests which are resolved through the Tor network. pdnsd is used to provide caching.  pdnsd is the server configured in /etc/resolv.conf, listening on localhost. It is configured to forward to dns-proxy-tor for the actual resoluton. There is a security concerns that some application could attempt to do its own DNS resolution without consulting /etc/resolv.conf. UDP packets are blocked to prevent leaks. Another solution may be to use the Linux network filter to forward to the local DNS server.
 </p>
 
 <ul>
@@ -324,7 +324,7 @@
 
 <h4>HTTP Proxy</h4>
 <p>
-Polipo is used as the HTTP proxy. It contacts Tor via SOCKS5 to make the real connections.
+Polipo is used as the HTTP proxy. It contacts the Tor software via SOCKS5 to make the real connections.
 </p>
 
 <ul>
@@ -388,7 +388,7 @@
 
 <h4>XChat</h4>
 <p>
-XChat is configured to use Tor as a SOCKS5 proxy. It will pass the hostname through SOCKS5 so that the exit node does the DNS resolution.
+XChat is configured to use the Tor software as a SOCKS5 proxy. It will pass the hostname through SOCKS5 so that the exit node does the DNS resolution.
 </p>
 
 <ul>
@@ -398,7 +398,7 @@
 
 <h4>Network Filter</h4>
 <p>
-One of the security issues is we don't know what software will attempt to contact the network without consideration for proxies. This is solved by forwarding all TCP connections that are not targetted to Tor (or localhost) through Tor. Linux has a kernel level network filter that accomplishes this. The CD is configured to pass all TCP traffic through Tor in case an application does not recognize or support HTTP/SOCKS proxies.
+One of the security issues is that we don't know what software will attempt to contact the network and whether their proxy settings are setup to use the Tor SOCKS proxy correctly. This is solved by forwarding all TCP connections that are not explicitly targetting the Tor proxy through a transparent proxy that in turn forwards it to the Tor proxy anyway. Linux has a kernel level network filter that accomplishes this.
 </p>
 
 <ul>
@@ -489,7 +489,7 @@
 The <a href="<!-- #homepage(www-servers/lighttpd) -->">lighttpd</a> server is used to serve the content. Configuration of the server is done at boot time in the <a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/etc/init.d/hidden-service">/etc/init.d/hidden-service</a> init script.
 </p>
 <p>
-The host name to use for the hidden service can be found in the /home/hidden/[name]/conf/hostname file for that service. This file is created by Tor when configuring the hidden service. The host name will be the same across sessions and machines as it and the private key are stored in the /home/hidden/[name]/conf directory.
+The host name to use for the hidden service can be found in the /home/hidden/[name]/conf/hostname file for that service. This file is created by the Tor software when configuring the hidden service. The host name will be the same across sessions and machines as it and the private key are stored in the /home/hidden/[name]/conf directory.
 </p>
 <p>
 Changes to /home/hidden (service addition/removal, /home/hidden/[name]/conf change) can be applied using the following command from a terminal. To get a terminal on full, type "Alt-F2", "konsole". On tiny right-click on the desktop and choose "xterm".
@@ -507,7 +507,7 @@
 <blockquote>(How to keep the implementation current for anonymity, security and usefulness.)</blockquote>
 
 <p>
-The Gentoo Catalyst release build tool is used to build the CD. This tool is designed to make the CD easy to maintain. For an update of only Tor it takes a simple version bump and 30 minutes for the tiny CD, two hours for the full version. Human effort is minimal, Catalyst does most of the work. A full update of all software takes several hours to compile, but this is seldom done or needed and again generally requires little human effort. Adding or removing software to/from the CD is also generally trivial.
+The Gentoo Catalyst release build tool is used to build the CD. This tool is designed to make the CD easy to maintain. For an update of only the Tor software it takes a simple version bump and 30 minutes for the tiny CD, two hours for the full version. Human effort is minimal, Catalyst does most of the work. A full update of all software takes several hours to compile, but this is seldom done or needed and again generally requires little human effort. Adding or removing software to/from the CD is also generally trivial.
 </p>
 
 <p>
@@ -531,7 +531,7 @@
 <blockquote>Side effects of the implementation that may be undesirable.</blockquote>
 
 <p>
-UDP is a problem. Tor does not provide anonymity using UDP yet. Outgoing UDP packets are dropped altogether.
+UDP is a problem. The Tor software does not provide anonymity using UDP yet. Outgoing UDP packets are dropped altogether.
 </p>
 
 <p>