Get rid of the dangerous instructions to use google as your test site for your hidden service. Also some general cleanup. (71e9be637)

@@ -12,7 +12,7 @@
 
 <p>Tor allows clients and servers to offer hidden services. That is,
 you can offer a web server, SSH server, etc., without revealing your
-IP to its users. In fact, because you don't use any public address,
+IP address to its users. In fact, because you don't use any public address,
 you can run a hidden service from behind your firewall.
 </p>
 
@@ -50,23 +50,66 @@ It will typically take 10-60 seconds to load
 immediately and your browser pops up an alert saying that
 "www.6sxoyfb3h2nvok2d.onion could not be found, please check the name and
 try again" then you haven't configured Tor and Privoxy correctly; see <a
-href="http://wiki.noreply.org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork">this
-FAQ entry</a> for some help.
+href="http://wiki.noreply.org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork">the
+it-doesn't-work FAQ entry</a> for some help.
 </p>
 
 <hr />
 <a id="one"></a>
-<h2><a class="anchor" href="#one">Step One: Configure an example hidden service</a></h2>
+<h2><a class="anchor" href="#one">Step One: Install a web server locally</a></h2>
 <br />
 
-<p>In this step, you're going to configure a hidden service that points
-to www.google.com. This way we can make sure you have this step
-working before we start thinking about setting up a web server locally.
+<p>First, you need to set up a web server locally. Setting up a web
+server can be tricky,
+so we're just going to go over a few basics here. If you get stuck
+or want to do more, find a friend who can help you. We recommend you
+install a new separate web server for your hidden service, since even
+if you already have one installed, you may be using it (or want to use
+it later) for an actual website.
+</p>
+
+<p>If you're on Unix or OS X and you're comfortable with
+the command-line, by far the best way to go is to install <a
+href="http://www.acme.com/software/thttpd/">thttpd</a>. Just grab the
+latest tarball, untar it (it will create its own directory), and run
+./configure &amp;&amp; make. Then mkdir hidserv, cd hidserv, and run
+"../thttpd -p 5222 -h localhost". It will give you back your prompt,
+and now you're running a webserver on port 5222. You can put files to
+serve in the hidserv directory.
+</p>
+
+<p>If you're on Windows, you might pick <a
+href="http://savant.sourceforge.net/">Savant</a> or <a
+href="http://httpd.apache.org/">Apache</a>, and be sure to configure it
+to bind only to localhost. You should also figure out what port you're
+listening on, because you'll use it below.
+</p>
+
+<p>(The reason we bind the web server only to localhost is to make
+sure it isn't publically accessible. If people could get to it directly,
+they could confirm that your computer is the one offering the hidden
+service.)
+</p>
+
+<p>Once you've got your web server set up, make sure it works: open your
+browser and go to <a
+href="http://localhost:5222/">http://localhost:5222/</a>, where 5222 is
+the port that you picked above. Then try putting a file in the main html
+directory, and make sure it shows up when you access the site.
+</p>
+
+<hr />
+<a id="two"></a>
+<h2><a class="anchor" href="#two">Step Two: Configure your hidden service</a></h2>
+<br />
+
+<p>Next, you need to configure your hidden service to point to your
+local web server.
 </p>
 
 <p>First, open your torrc file in your favorite text editor. (See <a
-href="http://wiki.noreply.org/noreply/TheOnionRouter/TorFAQ#torrc">this
-FAQ entry</a> to learn what this means.) Go to the middle section and
+href="http://wiki.noreply.org/noreply/TheOnionRouter/TorFAQ#torrc">the
+torrc FAQ entry</a> to learn what this means.) Go to the middle section and
 look for the line</p>
 
 <pre>
@@ -89,13 +132,12 @@ port people accessing the hidden service will think they're using) and an
 IP address and port for redirecting connections to this virtual port.</li>
 </ul>
 
-<p>In this example, we're going to set up a hidden service that points to
-Google. So add the following lines to your torrc:
+<p>Add the following lines to your torrc:
 </p>
 
 <pre>
 HiddenServiceDir /Library/Tor/var/lib/tor/hidden_service/
-HiddenServicePort 80 www.google.com:80
+HiddenServicePort 80 127.0.0.1:5222
 </pre>
 
 <p>You're going to want to change the HiddenServiceDir line, so it points
@@ -105,21 +147,20 @@ package. On Unix, try "/home/username/hidserv/" and fill in your own
 username in place of "username". On Windows you might pick:</p>
 <pre>
 HiddenServiceDir C:\Documents and Settings\username\Application Data\hidden_service\\
-HiddenServicePort 80 www.google.com:80
+HiddenServicePort 80 127.0.0.1:5222
 </pre>
 
 <p>Now save the torrc, shut down
-your Tor, and then start it again.  (See <a
-href="http://wiki.noreply.org/noreply/TheOnionRouter/TorFAQ#Restarting">this
-FAQ entry</a> for tips on restarting Tor.)
+your Tor, and then start it again.
 </p>
 
 <p>If Tor starts up again, great. Otherwise, something is wrong. Look
 at your torrc for obvious mistakes like typos. Then double-check
 that the directory you picked is writeable by you. If it's still
 not working, you should look at the Tor logs for hints. (See <a
-href="http://wiki.noreply.org/noreply/TheOnionRouter/TorFAQ#Logs">this
-FAQ entry</a> if you don't know how to enable or find your log file.)
+href="http://wiki.noreply.org/noreply/TheOnionRouter/TorFAQ#Logs">the
+logging FAQ entry</a> if you don't know how to enable or find your
+log file.)
 </p>
 
 <p>When Tor starts, it will automatically create the HiddenServiceDir
@@ -148,71 +189,14 @@ directory servers when they're trying to access your service.
 </p>
 
 <p>Try it now: paste the contents of the hostname file into your web
-browser. If it works, you'll get the google frontpage, but the URL in your
-browser's window will be your hidden service hostname. If it doesn't work,
-look in your logs for some hints, and keep playing with it until it works.
-</p>
-
-<hr />
-<a id="two"></a>
-<h2><a class="anchor" href="#two">Step Two: Now install a web server locally</a></h2>
-<br />
-
-<p>Now that you have hidden services working on Tor, you need to
-set up your web server locally. Setting up a web server is tricky,
-so we're just going to go over a few basics here. If you get stuck
-or want to do more, find a friend who can help you. We recommend you
-install a new separate web server for your hidden service, since even
-if you already have one installed, you may be using it (or want to use
-it later) for an actual website.
-</p>
-
-<p>If you're on Unix or OS X and you're comfortable with
-the command-line, by far the best way to go is to install <a
-href="http://www.acme.com/software/thttpd/">thttpd</a>. Just grab the
-latest tarball, untar it (it will create its own directory), and run
-./configure &amp;&amp; make. Then mkdir hidserv, cd hidserv, and run
-"../thttpd -p 5222 -h localhost". It will give you back your prompt,
-and now you're running a webserver on port 5222. You can put files to
-serve in the hidserv directory.
-</p>
-
-<p>If you're on Windows, you might pick <a
-href="http://savant.sourceforge.net/">Savant</a> or <a
-href="http://httpd.apache.org/">Apache</a>, and be sure to configure it
-to bind only to localhost. You should also figure out what port you're
-listening on, because you'll use it below.
-</p>
-
-<p>(The reason we bind the web server only to localhost is to make
-sure it isn't publically accessible. If people could get to it directly,
-they could confirm that your computer is the one offering the hidden
-service.)
-</p>
-
-<p>Once you've got your web server set up, make sure it works: open your
-browser and go to <a
-href="http://localhost:5222/">http://localhost:5222/</a>, where 5222 is
-the port that you picked above. Then try putting a file in the main html
-directory, and make sure it shows up when you access the site.
+browser. If it works, you'll get the html page you set up in step one.
+If it doesn't work, look in your logs for some hints, and keep playing
+with it until it works.
 </p>
 
 <hr />
 <a id="three"></a>
-<h2><a class="anchor" href="#three">Step Three: Connect your web server to your hidden service</a></h2>
-<br />
-
-<p>This part is very simple. Open up your torrc again, and change the
-HiddenServicePort line from "www.google.com:80" to "localhost:5222".
-Then <a
-href="http://wiki.noreply.org/noreply/TheOnionRouter/TorFAQ#Restarting">restart
-Tor</a>. Make sure that it's working by reloading your hidden
-service hostname in your browser.
-</p>
-
-<hr />
-<a id="four"></a>
-<h2><a class="anchor" href="#four">Step Four: More advanced tips</a></h2>
+<h2><a class="anchor" href="#three">Step Three: More advanced tips</a></h2>
 <br />
 
 <p>If you plan to keep your service available for a long time, you might


...	...	@@ -12,7 +12,7 @@
12	12
13	13	<p>Tor allows clients and servers to offer hidden services. That is,
14	14	you can offer a web server, SSH server, etc., without revealing your
15		-IP to its users. In fact, because you don't use any public address,
	15	+IP address to its users. In fact, because you don't use any public address,
16	16	you can run a hidden service from behind your firewall.
17	17	</p>
18	18
...	...	@@ -50,23 +50,66 @@ It will typically take 10-60 seconds to load
50	50	immediately and your browser pops up an alert saying that
51	51	"www.6sxoyfb3h2nvok2d.onion could not be found, please check the name and
52	52	try again" then you haven't configured Tor and Privoxy correctly; see <a
53		-href="http://wiki.noreply.org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork">this
54		-FAQ entry</a> for some help.
	53	+href="http://wiki.noreply.org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork">the
	54	+it-doesn't-work FAQ entry</a> for some help.
55	55	</p>
56	56
57	57	<hr />
58	58	<a id="one"></a>
59		-<h2><a class="anchor" href="#one">Step One: Configure an example hidden service</a></h2>
	59	+<h2><a class="anchor" href="#one">Step One: Install a web server locally</a></h2>
60	60	<br />
61	61
62		-<p>In this step, you're going to configure a hidden service that points
63		-to www.google.com. This way we can make sure you have this step
64		-working before we start thinking about setting up a web server locally.
	62	+<p>First, you need to set up a web server locally. Setting up a web
	63	+server can be tricky,
	64	+so we're just going to go over a few basics here. If you get stuck
	65	+or want to do more, find a friend who can help you. We recommend you
	66	+install a new separate web server for your hidden service, since even
	67	+if you already have one installed, you may be using it (or want to use
	68	+it later) for an actual website.
	69	+</p>
	70	+
	71	+<p>If you're on Unix or OS X and you're comfortable with
	72	+the command-line, by far the best way to go is to install <a
	73	+href="http://www.acme.com/software/thttpd/">thttpd</a>. Just grab the
	74	+latest tarball, untar it (it will create its own directory), and run
	75	+./configure && make. Then mkdir hidserv, cd hidserv, and run
	76	+"../thttpd -p 5222 -h localhost". It will give you back your prompt,
	77	+and now you're running a webserver on port 5222. You can put files to
	78	+serve in the hidserv directory.
	79	+</p>
	80	+
	81	+<p>If you're on Windows, you might pick <a
	82	+href="http://savant.sourceforge.net/">Savant</a> or <a
	83	+href="http://httpd.apache.org/">Apache</a>, and be sure to configure it
	84	+to bind only to localhost. You should also figure out what port you're
	85	+listening on, because you'll use it below.
	86	+</p>
	87	+
	88	+<p>(The reason we bind the web server only to localhost is to make
	89	+sure it isn't publically accessible. If people could get to it directly,
	90	+they could confirm that your computer is the one offering the hidden
	91	+service.)
	92	+</p>
	93	+
	94	+<p>Once you've got your web server set up, make sure it works: open your
	95	+browser and go to <a
	96	+href="http://localhost:5222/">http://localhost:5222/</a>, where 5222 is
	97	+the port that you picked above. Then try putting a file in the main html
	98	+directory, and make sure it shows up when you access the site.
	99	+</p>
	100	+
	101	+<hr />
	102	+<a id="two"></a>
	103	+<h2><a class="anchor" href="#two">Step Two: Configure your hidden service</a></h2>
	104	+<br />
	105	+
	106	+<p>Next, you need to configure your hidden service to point to your
	107	+local web server.
65	108	</p>
66	109
67	110	<p>First, open your torrc file in your favorite text editor. (See <a
68		-href="http://wiki.noreply.org/noreply/TheOnionRouter/TorFAQ#torrc">this
69		-FAQ entry</a> to learn what this means.) Go to the middle section and
	111	+href="http://wiki.noreply.org/noreply/TheOnionRouter/TorFAQ#torrc">the
	112	+torrc FAQ entry</a> to learn what this means.) Go to the middle section and
70	113	look for the line</p>
71	114
72	115	<pre>
...	...	@@ -89,13 +132,12 @@ port people accessing the hidden service will think they're using) and an
89	132	IP address and port for redirecting connections to this virtual port.</li>
90	133	</ul>
91	134
92		-<p>In this example, we're going to set up a hidden service that points to
93		-Google. So add the following lines to your torrc:
	135	+<p>Add the following lines to your torrc:
94	136	</p>
95	137
96	138	<pre>
97	139	HiddenServiceDir /Library/Tor/var/lib/tor/hidden_service/
98		-HiddenServicePort 80 www.google.com:80
	140	+HiddenServicePort 80 127.0.0.1:5222
99	141	</pre>
100	142
101	143	<p>You're going to want to change the HiddenServiceDir line, so it points
...	...	@@ -105,21 +147,20 @@ package. On Unix, try "/home/username/hidserv/" and fill in your own
105	147	username in place of "username". On Windows you might pick:</p>
106	148	<pre>
107	149	HiddenServiceDir C:\Documents and Settings\username\Application Data\hidden_service\\
108		-HiddenServicePort 80 www.google.com:80
	150	+HiddenServicePort 80 127.0.0.1:5222
109	151	</pre>
110	152
111	153	<p>Now save the torrc, shut down
112		-your Tor, and then start it again. (See <a
113		-href="http://wiki.noreply.org/noreply/TheOnionRouter/TorFAQ#Restarting">this
114		-FAQ entry</a> for tips on restarting Tor.)
	154	+your Tor, and then start it again.
115	155	</p>
116	156
117	157	<p>If Tor starts up again, great. Otherwise, something is wrong. Look
118	158	at your torrc for obvious mistakes like typos. Then double-check
119	159	that the directory you picked is writeable by you. If it's still
120	160	not working, you should look at the Tor logs for hints. (See <a
121		-href="http://wiki.noreply.org/noreply/TheOnionRouter/TorFAQ#Logs">this
122		-FAQ entry</a> if you don't know how to enable or find your log file.)
	161	+href="http://wiki.noreply.org/noreply/TheOnionRouter/TorFAQ#Logs">the
	162	+logging FAQ entry</a> if you don't know how to enable or find your
	163	+log file.)
123	164	</p>
124	165
125	166	<p>When Tor starts, it will automatically create the HiddenServiceDir
...	...	@@ -148,71 +189,14 @@ directory servers when they're trying to access your service.
148	189	</p>
149	190
150	191	<p>Try it now: paste the contents of the hostname file into your web
151		-browser. If it works, you'll get the google frontpage, but the URL in your
152		-browser's window will be your hidden service hostname. If it doesn't work,
153		-look in your logs for some hints, and keep playing with it until it works.
154		-</p>
155		-
156		-<hr />
157		-<a id="two"></a>
158		-<h2><a class="anchor" href="#two">Step Two: Now install a web server locally</a></h2>
159		-<br />
160		-
161		-<p>Now that you have hidden services working on Tor, you need to
162		-set up your web server locally. Setting up a web server is tricky,
163		-so we're just going to go over a few basics here. If you get stuck
164		-or want to do more, find a friend who can help you. We recommend you
165		-install a new separate web server for your hidden service, since even
166		-if you already have one installed, you may be using it (or want to use
167		-it later) for an actual website.
168		-</p>
169		-
170		-<p>If you're on Unix or OS X and you're comfortable with
171		-the command-line, by far the best way to go is to install <a
172		-href="http://www.acme.com/software/thttpd/">thttpd</a>. Just grab the
173		-latest tarball, untar it (it will create its own directory), and run
174		-./configure && make. Then mkdir hidserv, cd hidserv, and run
175		-"../thttpd -p 5222 -h localhost". It will give you back your prompt,
176		-and now you're running a webserver on port 5222. You can put files to
177		-serve in the hidserv directory.
178		-</p>
179		-
180		-<p>If you're on Windows, you might pick <a
181		-href="http://savant.sourceforge.net/">Savant</a> or <a
182		-href="http://httpd.apache.org/">Apache</a>, and be sure to configure it
183		-to bind only to localhost. You should also figure out what port you're
184		-listening on, because you'll use it below.
185		-</p>
186		-
187		-<p>(The reason we bind the web server only to localhost is to make
188		-sure it isn't publically accessible. If people could get to it directly,
189		-they could confirm that your computer is the one offering the hidden
190		-service.)
191		-</p>
192		-
193		-<p>Once you've got your web server set up, make sure it works: open your
194		-browser and go to <a
195		-href="http://localhost:5222/">http://localhost:5222/</a>, where 5222 is
196		-the port that you picked above. Then try putting a file in the main html
197		-directory, and make sure it shows up when you access the site.
	192	+browser. If it works, you'll get the html page you set up in step one.
	193	+If it doesn't work, look in your logs for some hints, and keep playing
	194	+with it until it works.
198	195	</p>
199	196
200	197	<hr />
201	198	<a id="three"></a>
202		-<h2><a class="anchor" href="#three">Step Three: Connect your web server to your hidden service</a></h2>
203		-<br />
204		-
205		-<p>This part is very simple. Open up your torrc again, and change the
206		-HiddenServicePort line from "www.google.com:80" to "localhost:5222".
207		-Then <a
208		-href="http://wiki.noreply.org/noreply/TheOnionRouter/TorFAQ#Restarting">restart
209		-Tor</a>. Make sure that it's working by reloading your hidden
210		-service hostname in your browser.
211		-</p>
212		-
213		-<hr />
214		-<a id="four"></a>
215		-<h2><a class="anchor" href="#four">Step Four: More advanced tips</a></h2>
	199	+<h2><a class="anchor" href="#three">Step Three: More advanced tips</a></h2>
216	200	<br />
217	201
218	202	<p>If you plan to keep your service available for a long time, you might
219	203

tor-webwml.git