Eepsite help: more edits

installer/resources/eepsite/docroot/help/index.html

@@ -46,20 +46,21 @@
       </li>
     </ul>
 
-    <p>In I2P, hidden services are addressed using a 'key', which is represented as a long Base64 string.
-      The 'key' is somewhat like an IP address, and is shown on the <a href="http://127.0.0.1:7657/i2ptunnel/edit?tunnel=3">Hidden Service Configuration page</a>.
+    <p>In I2P, hidden services are addressed using a Base32 address ending in ".b32.i2p", or a Destination represented as a long Base64 string.
+      The Base32 address may be used as a hostname, until you assign a register a name following the instructions below.
+      The Destination is somewhat like an IP address, and is shown on the <a href="http://127.0.0.1:7657/i2ptunnel/edit?tunnel=3">Hidden Service Configuration page</a>.
     </p>
 
-    <p>The instructions below detail how to assign a name like "mysite.i2p" to your key and start up your website.
+    <p>The instructions below detail how to assign a name like "mysite.i2p" to your website and enable access by others.
        You may reach your site locally via <a href="http://127.0.0.1:7658/">http://127.0.0.1:7658/</a>.
     </p>
 
-    <h2>How to set up and announce your hidden service website</h2>
+    <h2>How to set up and announce your hidden service</h2>
 
-     <p>Your website is stopped by default.
+     <p>Your webserver is running by default, but is not accessible by others until you start the hidden service tunnel.
       After you start your I2P Webserver tunnel, it will be difficult for other people to find
-      It can only be accessed with the long Base64 key or with the shorter Base32 address (.b32.i2p), which is a hash of the Base64 key.
-      You could just tell people the long key or the Base32 address, but thankfully I2P has an address book and several easy ways to tell people about your website.
+      It can only be accessed with the long Destination or with the shorter Base32 address (.b32.i2p), which is a hash of the Destination.
+      You could just tell people the Destnation or the Base32 address, but thankfully I2P has an address book and several easy ways to tell people about your website.
       Here are detailed instructions.
     </p>
 
@@ -72,16 +73,15 @@
         Your website will now start every time you start your router.
         Be sure to click "Save".
       </li>
-      <li>Click the start button for your website on the <a href="http://127.0.0.1:7657/i2ptunnel/">main Hidden Service Manager page</a>.
+      <li>Click the start button for your webserver tunnel on the <a href="http://127.0.0.1:7657/i2ptunnel/">main Hidden Service Manager page</a>.
          You should now see it listed under "Local Tunnels" on the left side of the <a href="http://127.0.0.1:7657/">I2P Router Console</a>.
          Your website is now running.
       </li>
-      <li>Highlight the entire "Local destination" key on the <a href="http://127.0.0.1:7657/i2ptunnel/edit?tunnel=3">Hidden Service Configuration page</a>. and copy it for later pasting.
-         Make sure you copy the whole thing - it's over 500 characters.
+      <li>Highlight and copy the entire Local destination on the <a href="http://127.0.0.1:7657/i2ptunnel/edit?tunnel=3">Hidden Service Configuration page</a>.
+         Make sure you copy the whole thing, it is over 500 characters.
       </li>
-      <li>Enter the name and paste in the destination key into your
-         <a href="http://127.0.0.1:7657/susidns/addressbook?book=master">master address book</a>.
-         Click "Add" to add the destination to your address book.
+      <li>Enter the name and paste the destination into your <a href="http://127.0.0.1:7657/susidns/addressbook?book=router&amp;filter=none">address book</a>.
+         Click "Add" to save the new entry.
       </li>
       <li>In your browser, enter in your website name (<i>something</i>.i2p) and you should be right back here. 
           Hopefully it worked!
@@ -93,32 +93,37 @@
 
     <p>Directory listings are enabled, so you may host files from a subdirectory without providing a page with links to the files. 
       You may change the appearance of the directory by supplying an edited <a href="lib/jetty-dir.css">jetty-dir.css</a> file for each directory.
-      The <a href="lib/">lib</a> subdirectory demonstrates a custom style.
-      The <a href="lib/resources">resources</a> subdirectory demonstrates the default style.
+      The <a href="lib/">lib subdirectory</a> demonstrates a custom style.
+      The <a href="lib/resources">resources subdirectory</a> demonstrates the default style.
       If you need a template for a basic site, feel free to adapt <a href="pagetemplate.html">this page</a> and <a href="lib/">associated content</a>.
     </p>
 
     <p>If you're returned to this page after editing the content, try clearing your browser's web cache:</p>
 
     <ul>
-      <li><b>Firefox</b> via: Preferences ➜ Advanced ➜ Network ➜ Cached Web Content ➜ Clear Now</li>
-      <li><b>Chrome/Chromium</b> via: Settings ➜ Advanced Settings ➜ Privacy ➜ Clear browsing data...</li>
-      <li><b>Opera</b> via: Settings ➜ Privacy ➜ Clear browsing data...
+      <li><b>Firefox:</b> Preferences ➜ Advanced ➜ Network ➜ Cached Web Content ➜ Clear Now</li>
+      <li><b>Chrome/Chromium:</b> Settings ➜ Advanced Settings ➜ Privacy ➜ Clear browsing data</li>
+      <li><b>Opera:</b> Settings ➜ Privacy ➜ Clear browsing data</li>
     </ul>
 
     <h2>Register your own I2P Domain</h2>
 
-    <p>Now it's time to add your website to an I2P address book hosted by a site such as <a href="http://stats.i2p/ " target="_blank">stats.i2p</a> or <a href="http://no.i2p/" target="_blank">no.i2p</a>. 
-      That is, you must enter your website name and key into a web interface on one or more of these sites.
-      Here is <a href="http://stats.i2p/i2p/addkey.html" target="_blank">the key entry form</a> at stats.i2p.
-      You will need your <b>Authentication String</b> for the next step, this can be found on the <b>Registration Authentication</b> page which is linked from the Hidden Service configuration page.
-      Copy the entire authentication string and paste it on the key entry page. 
-      Describe your site briefly, this step is recommended. 
-      If your site is a HTTP service, leave the checkbox selected - if not unselect it.
-      Read through the Terms of Service carefully.
-      Click the "Submit" button at the bottom of the page.
+    <p>Now it is time to add your website to an I2P address book hosted by a site such as <a href="http://stats.i2p/ " target="_blank">stats.i2p</a> or <a href="http://no.i2p/" target="_blank">no.i2p</a>. 
+      You must enter your website name and Destination (or Registration Authentication string) on one or more of these sites.
+    </p><p>Some registration sites require the Destination.
+      If so, highlight and copy the entire Local destination on the <a href="http://127.0.0.1:7657/i2ptunnel/edit?tunnel=3">Hidden Service Configuration page</a>.
+      Make sure you copy the whole thing, it is over 500 characters.
+    </p><p>Some registration sites, including <a href="http://stats.i2p/i2p/addkey.html" target="_blank">stats.i2p</a>, require the Registration Authentication string.
+      It is found on the <a href="http://127.0.0.1:7657/i2ptunnel/register?tunnel=3">Registration Authentication page</a> linked from the <a href="http://127.0.0.1:7657/i2ptunnel/edit?tunnel=3">Hidden Service configuration page</a>.
+      Copy the entire authentication string and paste it on the registration page. 
+      Make sure you copy the whole thing, it is over 500 characters.
+      Describe your site briefly if the site requests this information.
+      If your site is a HTTP service, leave the checkbox selected; if not, unselect it.
+    </p><p>For all registration sites, read through the Terms of Service carefully.
+      Click the "Submit" button.
       Verify the submission was successful.
-      Since many routers periodically get address book updates from these sites, within several hours others will be able to find your website by simply typing <i>something</i>.i2p into their browser.</p>
+      Since many routers periodically get address book updates from these sites, within several hours others will be able to find your website by simply entering your hostname in their browser.</p>
+
     <h2>Adding Addressbook Subscriptions</h2>
 
     <p>Speaking of address book updates, this would be a good time to add some more addressbooks to your own subscription list.
@@ -133,9 +138,9 @@
     </ul>
     
     <p>If you are in a hurry and can't wait a few hours, you can tell people to use a "jump" address helper redirection service. 
-      This will work within a few minutes of your entering the key to an address book on the same site.
+      This will work within a few minutes of your registering your hostname on the same site.
       Test it yourself first by entering <code>http://stats.i2p/cgi-bin/jump.cgi?a=<i>something</i>.i2p</code> into your browser. 
-      Once it's working, you can tell others to use it.
+      Once it is working, you can tell others to use it.
     </p>
 
     <p>Some people check website lists such as <a href="http://identiguy.i2p/" target="_blank">Identiguy's eepsite status list</a> or <a href="http://no.i2p/browse/" target="_blank">no.i2p's active host list</a> for new eepsites, so your site may start getting some traffic. 
@@ -151,8 +156,8 @@
       </li>
     </ul>
 
-    <p>Note that some sites recommend pasting in that really long destination key.
-      You can if you want, but if you have successfully posted your key at an add-key service, tested it using a jump service, and waited 24 hours for the address book update to propagate to others, that shouldn't be necessary.</p>
+    <p>Note that some sites recommend pasting in that really long destination.
+      You can if you want, but if you have successfully registered your hostname on a registration service, tested it using a jump service, and waited 24 hours for the address book update to propagate to others, that shouldn't be necessary.</p>
 
     <h2>Using an alternative webserver to host your site</h2>
 
@@ -161,7 +166,7 @@
     </p>
 
      <p>To configure your webserver for use on I2P, you may either use the existing webserver tunnel and <a href="http://127.0.0.1:7657/configclients">disable the default webserver</a> from running, or create a new HTTP Server tunnel in the <a href="http://127.0.0.1:7657/i2ptunnelmgr">Hidden Services Manager</a>.
-       Ensure that the listening port configured for the webserver (7658 by default) is also configured in the Hidden Services webserver settings.
+       Ensure that the listening port configured for the webserver (7658 by default) is also configured in the Hidden Services settings.
        For example, if your webserver is listening by default on address 127.0.0.1 port 80, you'd need to also ensure that the Target port in the Hidden Service Manager settings page for the service is also configured to port 80. 
         </p> 
 
@@ -172,13 +177,13 @@
           There are plenty of guides online, for example if you search for "nginx security hardening guide" you will find a number of guides that have good recommendations.
         </p> 
 
-        <p>There is one important issue with the <b>Apache</b> web server.
+        <p>There is one important issue with the Apache web server.
           The <code>mod_status</code> and <code>mod_info</code> Apache modules are enabled by default on some operating systems.
           These modules expose internal data which can lead to serious compromise of anonymity when used on an anonymous network.
           Removing the lines in the configuration file where these modules are loaded is the easiest way to prevent these issues.
         </p>
 
-        <h2>Further Assistance</h2>
+    <h2>Further Assistance</h2>
 
         <p>If you have any questions, the following places are available for support:
         </p>