Make usage of 2-word Address Book consistent across website, except preserve old blog posts as is

i2p2www/pages/global/nav.html

@@ -151,7 +151,7 @@
                   <li><a href="{{ site_url('docs/tunnels/old-implementation') }}"><div class="menuitem"><span>{{ _('Old implementation') }}</span></div></a></li>
                 </ul>
               </li>
-              <li><a href="{{ site_url('docs/naming') }}"><div class="menuitem"><span>{{ _('Naming and addressbook') }}</span></div></a></li>
+              <li><a href="{{ site_url('docs/naming') }}"><div class="menuitem"><span>{{ _('Naming and Address Book') }}</span></div></a></li>
               <li><a href="{{ site_url('docs/plugins') }}"><div class="menuitem"><span>{{ _('Plugins') }}</span></div></a></li>
             </ul>
           </li>

i2p2www/pages/site/about/software.html

@@ -34,13 +34,13 @@ SusiMail is bridged so it can send and receive email from the internet as well.
 Occasionally you may see some services like Gmail classifying it as spam, which 
 you can correct in your Internet email service providers settings.{%- endtrans %}</p>
 <p>{% trans bittorrent=site_url('docs/applications/bittorrent') -%}<strong><a href="{{ bittorrent }}">I2PSnark</a></strong>: Snark is an I2P network only BitTorrent client. It never makes a connection to a peer over any other network.{%- endtrans %}</p>
-<p>{% trans addressbook=site_url('docs/naming') -%}<strong><a href="{{ addressbook }}">The AddressBook</a></strong>: This is a locally-defined list of 
+<p>{% trans addressbook=site_url('docs/naming') -%}<strong><a href="{{ addressbook }}">The Address Book</a></strong>: This is a locally-defined list of 
 human-readable addresses ( ie: i2p-projekt.i2p) and corresponding I2P addresses.(udhdrtrcetjm5sxzskjyr5ztpeszydbh4dpl3pl4utgqqw2v4jna.b32.i2p) It integrates with other applications to 
 allow you to use those human-readable addresses in place of those I2P 
 addresses. It is more similar to a hosts file or a contact list than a network 
 database or a DNS service. There is no recognized global namespace, you decide 
 what any given .i2p domain maps to in the end.{%- endtrans %}</p>
-<p><strong>The QR Code Generator</strong>: Besides the Addressbook, I2P 
+<p><strong>The QR Code Generator</strong>: Besides the Address Book, I2P 
 addresses can be shared by converting them into QR codes and scanning them with 
 a camera. This is especially useful for Android devices.</p>
 <p>{% trans i2ptunnel=site_url('docs/api/i2ptunnel') -%}<strong><a href="{{ i2ptunnel }}">I2P Hidden Services Manager</a></strong> This is a general-purpose 

i2p2www/pages/site/docs/api/bob.html

@@ -213,7 +213,7 @@ C       A       OK Bye!
 
 <p>{% trans -%}
 Now all we need to do is telnet into 127.0.0.1, port 37337,
-send the destination key or host address from addressbook we want to contact.
+send the destination key or host address from address book we want to contact.
 In this case, we want to contact "mouth", all we do is paste in the
 key and it goes.
 {%- endtrans %}</p>

i2p2www/pages/site/docs/api/socks.html

@@ -47,7 +47,7 @@ work that simply using the existing I2P APIs.
 
 <p>{% trans -%}
 The SOCKS proxy
-supports standard addressbook names, but not Base64 destinations.
+supports standard address book names, but not Base64 destinations.
 Base32 hashes should work as of release 0.7.
 It supports outgoing connections only, i.e. an I2PTunnel Client.
 UDP support is stubbed out but not working yet.

i2p2www/pages/site/docs/discussions/naming.html

@@ -104,7 +104,7 @@ Others have suggested asking for specific keys only (similar to what jump servic
 in a more automated fashion), possibly at a further cost in anonymity.
 {%- endtrans %}</p>
 <p>{% trans i2host=i2pconv('i2host.i2p') -%}
-Possible improvements would be a replacement or supplement to addressbook (see <a href="http://{{ i2host }}/">{{ i2host }}p</a>),
+Possible improvements would be a replacement or supplement to address book (see <a href="http://{{ i2host }}/">{{ i2host }}p</a>),
 or something simple like subscribing to http://example.i2p/cgi-bin/recenthosts.cgi rather than http://example.i2p/hosts.txt.
 If a hypothetical recenthosts.cgi distributed all hosts from the last 24 hours, for example,
 that could be both more efficient and more anonymous than the current hosts.txt with last-modified and etag.
@@ -116,7 +116,7 @@ This script returns an Etag with a timestamp.
 When a request comes in with the If-None-Match etag,
 the script ONLY returns new hosts since that timestamp, or 304 Not Modified if there are none.
 In this way, the script efficiently returns only the hosts the subscriber
-does not know about, in an addressbook-compatible manner.
+does not know about, in an address book-compatible manner.
 {%- endtrans %}</p>
 <p>{% trans -%}
 So the inefficiency is not a big issue and there are several ways to improve things without
@@ -138,7 +138,7 @@ a key, you need to have the whole set of keys stored locally, at a cost of about
 <li>
 <p>{% trans -%}
 <b>Requires configuration and "trust":</b>
-Out-of-the-box addressbook is only subscribed to http://www.i2p2.i2p/hosts.txt, which is rarely updated,
+Out-of-the-box address book is only subscribed to http://www.i2p2.i2p/hosts.txt, which is rarely updated,
 leading to poor new-user experience.
 {%- endtrans %}</p>
 <p>{% trans -%}
@@ -177,7 +177,7 @@ Sure, we could make it work, but why? It's a bad fit.
 <li>
 <p>{% trans -%}
 <b>Not reliable:</b>
-It depends on specific servers for addressbook subscriptions.
+It depends on specific servers for address book subscriptions.
 {%- endtrans %}</p>
 <p>{% trans -%}
 Yes it depends on a few servers that you have configured.
@@ -185,7 +185,7 @@ Within i2p, servers and services come and go.
 Any other centralized system (for example DNS root servers) would
 have the same problem. A completely decentralized system (everybody is authoritative)
 is possible by implementing an "everybody is a root DNS server" solution, or by
-something even simpler, like a script that adds everybody in your hosts.txt to your addressbook.
+something even simpler, like a script that adds everybody in your hosts.txt to your address book.
 {%- endtrans %}</p>
 <p>{% trans -%}
 People advocating all-authoritative solutions generally haven't thought through
@@ -257,7 +257,7 @@ See core/java/src/net/i2p/client/naming for details.
 {%- endtrans %}</p>
 <p>{% trans -%}
 Any new system should be stacked with HostsTxt, or should
-implement local storage and/or the addressbook subscription functions, since addressbook
+implement local storage and/or the address book subscription functions, since address book
 only knows about the hosts.txt files and format.
 {%- endtrans %}</p>
 
@@ -266,7 +266,7 @@ only knows about the hosts.txt files and format.
 I2P destinations contain a certificate, however at the moment that certificate
 is always null.
 With a null certificate, base64 destinations are always 516 bytes ending in "AAAA",
-and this is checked in the addressbook merge mechanism, and possibly other places.
+and this is checked in the address book merge mechanism, and possibly other places.
 Also, there is no method available to generate a certificate or add it to a
 destination. So these will have to be updated to implement certificates.
 {%- endtrans %}</p>
@@ -280,7 +280,7 @@ i2p uses a flat naming system) to be signed by the 2nd level domain's keys.
 <p>{% trans -%}
 With any certificate implementation must come the method for verifying the
 certificates.
-Presumably this would happen in the addressbook merge code.
+Presumably this would happen in the address book merge code.
 Is there a method for multiple types of certificates, or multiple certificates?
 {%- endtrans %}</p>
 <p>{% trans -%}

i2p2www/pages/site/docs/how/tech-intro.html

@@ -832,9 +832,9 @@ abstraction of TCP, with its sliding windows, congestion control algorithms
 SYN, FIN, RST, etc).
 {%- endtrans %}</p>
 
-  <h2 id="app.naming">{% trans %}Naming library and addressbook{% endtrans %}</h2>
+  <h2 id="app.naming">{% trans %}Naming library and address book{% endtrans %}</h2>
   <p><i>{% trans naming=site_url('docs/naming') -%}
-For more information see the <a href="{{ naming }}">Naming and Addressbook</a> page.
+For more information see the <a href="{{ naming }}">Naming and Address Book</a> page.
 {%- endtrans %}</i></p>
 
   <p><i>{% trans dev='mihi, Ragnarok' -%}Developed by: {{ dev }}{%- endtrans %}</i></p>
@@ -846,16 +846,16 @@ inherent demand for secure communication and decentralized operation, the
 traditional DNS-style naming system is clearly out, as are "majority rules" 
 voting systems. Instead, I2P ships with a generic naming library and a base 
 implementation designed to work off a local name to destination mapping, as 
-well as an optional add-on application called the "addressbook". The addressbook 
+well as an optional add-on application called the "Address Book". The address book 
 is a web-of-trust-driven secure, distributed, and human readable naming system, 
 sacrificing only the call for all human readable names to be globally unique 
 by mandating only local uniqueness. While all messages in I2P are cryptographically 
-addressed by their destination, different people can have local addressbook 
+addressed by their destination, different people can have local address book 
 entries for "Alice" which refer to different destinations. People can still 
-discover new names by importing published addressbooks of peers specified 
+discover new names by importing published address books of peers specified 
 in their web of trust, by adding in the entries provided through a third party, 
-or (if some people organize a series of published addressbooks using a first 
+or (if some people organize a series of published address books using a first 
-come first serve registration system) people can choose to treat these addressbooks 
+come first serve registration system) people can choose to treat these address books 
 as name servers, emulating traditional DNS.
 {%- endtrans %}</p>
 

i2p2www/pages/site/docs/how/threat-model.html

@@ -860,7 +860,7 @@ Routers rely on a single news host, but there is a hardcoded backup URL pointing
 A malicious news host could feed a huge file, need to limit the size.
 {%- endtrans %}</li>
 <li>{% trans naming=site_url('docs/naming') -%}
-<a href="{{ naming }}">Naming system services</a>, including addressbook subscription providers, add-host services,
+<a href="{{ naming }}">Naming system services</a>, including address book subscription providers, add-host services,
 and jump services, could be malicious. Substantial protections for subscriptions were implemented
 in release 0.6.1.31, with additional enhancements in subsequent releases.
 However, all naming services require some measure of trust, see

i2p2www/pages/site/docs/index.html

@@ -39,8 +39,8 @@ If you find any inaccuracies in the documents linked below, please
 <h3>{% trans %}Application-Layer Topics{% endtrans %}</h3>
 <ul>
 <li><a href="{{ site_url('get-involved/develop/applications') }}">Application Development Overview and Guide</a></li>
-<li><a href="{{ site_url('docs/naming') }}">{{ _('Naming and Addressbook') }}</a></li>
+<li><a href="{{ site_url('docs/naming') }}">{{ _('Naming and Address Book') }}</a></li>
-<li><a href="{{ spec_url('subscription') }}">{{ _('Addressbook Subscription Feed Commands') }}</a></li>
+<li><a href="{{ spec_url('subscription') }}">{{ _('Address Book Subscription Feed Commands') }}</a></li>
 <li><a href="{{ site_url('docs/plugins') }}">{{ _('Plugins Overview') }}</a></li>
 <li><a href="{{ spec_url('plugin') }}">{{ _('Plugin Specification') }}</a></li>
 <li><a href="{{ site_url('docs/applications/managed-clients') }}">{{ _('Managed Clients') }}</a></li>

i2p2www/pages/site/docs/naming.html

@@ -1,5 +1,5 @@
 {% extends "global/layout.html" %}
-{% block title %}{% trans %}Naming and Addressbook{% endtrans %}{% endblock %}
+{% block title %}{% trans %}Naming and Address Book{% endtrans %}{% endblock %}
 {% block lastupdated %}2020-07{% endblock %}
 {% block accuratefor %}0.9.46{% endblock %}
 {% block content %}
@@ -8,21 +8,21 @@
 <p>{% trans -%}
 I2P ships with a generic naming library and a base implementation 
 designed to work off a local name to destination mapping, as well as an
-add-on application called the <a href="#addressbook">addressbook</a>. 
+add-on application called the <a href="#addressbook">address book</a>. 
 I2P also supports <a href="#base32">Base32 hostnames</a> similar to Tor's .onion addresses.
 {%- endtrans %}</p>
 
 <p>{% trans -%}
-The addressbook is a web-of-trust
+The address book is a web-of-trust
 driven secure, distributed, and human readable naming system, sacrificing only
 the call for all human readable names to be globally unique by mandating only
 local uniqueness.  While all messages in I2P are cryptographically addressed
-by their destination, different people can have local addressbook entries for
+by their destination, different people can have local address book entries for
 "Alice" which refer to different destinations.  People can still discover new
-names by importing published addressbooks of peers specified in their web of trust,
+names by importing published address books of peers specified in their web of trust,
 by adding in the entries provided through a third party, or (if some people organize
-a series of published addressbooks using a first come first serve registration
+a series of published address books using a first come first serve registration
-system) people can choose to treat these addressbooks as name servers, emulating
+system) people can choose to treat these address books as name servers, emulating
 traditional DNS.
 {%- endtrans %}</p>
 
@@ -63,12 +63,12 @@ HTTP <a href="#add-services">host-add forms</a> which allow users to add hosts t
 HTTP <a href="#jump-services">jump services</a> which provide their own lookups and redirection.
 {%- endtrans %}</li>
 <li>{% trans -%}
-The <a href="#addressbook">addressbook</a> application which merges external
+The <a href="#addressbook">address book</a> application which merges external
 host lists, retrieved via HTTP, with the local list.
 {%- endtrans %}</li>
 <li>{% trans -%}
 The <a href="#susidns">SusiDNS</a> application which is a simple web front-end
-for addressbook configuration and viewing of the local host lists.
+for address book configuration and viewing of the local host lists.
 {%- endtrans %}</li>
 </ol>
 
@@ -114,7 +114,7 @@ The files are:
 <h3>{{ _('Blockfile Naming Service') }}</h3>
 
 <p>{% trans -%}
-The Blockfile Naming Service stores multiple "addressbooks" in a single
+The Blockfile Naming Service stores multiple "address books" in a single
 database file named hostsdb.blockfile.
 This Naming Service is the default since release 0.8.8.
 {%- endtrans %}</p>
@@ -126,7 +126,7 @@ The blockfile format is specified on the <a href="{{ blockfile }}">Blockfile pag
 It provides fast Destination lookup in a compact format. While the blockfile overhead is substantial,
 the destinations are stored in binary rather than in Base 64 as in the hosts.txt format.
 In addition, the blockfile provides the capability of arbitrary metadata storage
-(such as added date, source, and comments) for each entry to implement advanced addressbook features.
+(such as added date, source, and comments) for each entry to implement advanced address book features.
 The blockfile storage requirement is a modest increase over the hosts.txt format, and the blockfile provides
 approximately 10x reduction in lookup times.
 {%- endtrans %}</p>
@@ -180,11 +180,11 @@ an error page to the user with links to several "jump" services.
 See below for details.
 {%- endtrans %}</p>
 
-<h2 id="addressbook">{% trans %}Addressbook{% endtrans %}</h2>
+<h2 id="addressbook">{% trans %}Address Book{% endtrans %}</h2>
 <h3>{% trans %}Incoming Subscriptions and Merging{% endtrans %}</h3>
 
 <p>{% trans -%}
-The addressbook application periodically
+The address book application periodically
 retrieves other users' hosts.txt files and merges
 them with the local hosts.txt, after several checks.
 Naming conflicts are resolved on a first-come first-served
@@ -205,11 +205,11 @@ default is <code>http://i2p-projekt.i2p/hosts.txt (http://udhdrtrcetjm5sxzskjyr5
 which contains a copy of the hosts.txt included
 in the I2P release.
 Users must configure additional subscriptions in their
-local addressbook application (via subscriptions.txt or <a href="#susidns">SusiDNS</a>).
+local address book application (via subscriptions.txt or <a href="#susidns">SusiDNS</a>).
 {%- endtrans %}</p>
 
 <p>{% trans -%}
-Some other public addressbook subscription links:
+Some other public address book subscription links:
 {%- endtrans %}</p>
 <ul>
 <li><a href="http://{{ i2pconv('i2host.i2p') }}/cgi-bin/i2hostetag">http://{{ i2pconv('i2host.i2p') }}/cgi-bin/i2hostetag</a>
@@ -223,7 +223,7 @@ Presence on this list does not imply endorsement.
 <h3>{% trans %}Naming Rules{% endtrans %}</h3>
 <p>{% trans -%}
 While there are hopefully not any technical limitations within I2P on host names,
-the addressbook enforces several restrictions on host names
+the address book enforces several restrictions on host names
 imported from subscriptions.
 It does this for basic typographical sanity and compatibility with browsers,
 and for security.
@@ -308,7 +308,7 @@ Note that the '.' symbols in a host name are of no significance,
 and do not denote any actual naming or trust hierarchy.
 If the name 'host.i2p' already exists, there is nothing
 to prevent anybody from adding a name 'a.host.i2p' to their hosts.txt,
-and this name can be imported by others' addressbook.
+and this name can be imported by others' address book.
 Methods to deny subdomains to non-domain 'owners' (certificates?),
 and the desirability and feasibility of these methods,
 are topics for future discussion.
@@ -321,7 +321,7 @@ add 'network.IDN.whitelist.i2p (boolean) = true' in about:config.
 {%- endtrans %}</p>
 
 <p>{% trans -%}
-As the addressbook application does not use privatehosts.txt at all, in practice
+As the address book application does not use privatehosts.txt at all, in practice
 this file is the only place where it is appropriate to place private aliases or
 "pet names" for sites already in hosts.txt.
 {%- endtrans %}</p>
@@ -336,7 +336,7 @@ See <a href="/spec/subscription">the specification</a> for details.
 
 <h3>{% trans %}Outgoing Subscriptions{% endtrans %}</h3>
 <p>{% trans -%}
-Addressbook will publish the merged hosts.txt to a location
+Address Book will publish the merged hosts.txt to a location
 (traditionally hosts.txt in the local I2P Site's home directory) to be accessed by others
 for their subscriptions.
 This step is optional and is disabled by default.
@@ -344,7 +344,7 @@ This step is optional and is disabled by default.
 
 <h3>Hosting and HTTP Transport Issues</h3>
 <p>{% trans -%}
-The addressbook application, together with eepget, saves the Etag and/or Last-Modified
+The address book application, together with eepget, saves the Etag and/or Last-Modified
 information returned by the web server of the subscription.
 This greatly reduces the bandwidth required, as the web server will
 return a '304 Not Modified' on the next fetch if nothing has changed.
@@ -373,7 +373,7 @@ will be propagated through the network.
 {%- endtrans %}</p>
 
 <p>{% trans -%}
-It is recommended that host add services impose, at a minimum, the restrictions imposed by the addressbook application listed above.
+It is recommended that host add services impose, at a minimum, the restrictions imposed by the address book application listed above.
 Host add services may impose additional restrictions on hostnames and keys, for example:
 {%- endtrans %}</p>
 <ul>
@@ -446,15 +446,15 @@ several hosts.txt providers so that its local host list is current.
 
 <h2 id="susidns">SusiDNS</h2>
 <p>{% trans -%}
-SusiDNS is simply a web interface front-end to configuring addressbook subscriptions
+SusiDNS is simply a web interface front-end to configuring address book subscriptions
-and accessing the four addressbook files.
+and accessing the four address book files.
-All the real work is done by the 'addressbook' application.
+All the real work is done by the 'address book' application.
 {%- endtrans %}</p>
 
 <p>{% trans -%}
-Currently, there is little enforcement of addressbook naming rules within SusiDNS,
+Currently, there is little enforcement of address book naming rules within SusiDNS,
 so a user may enter hostnames locally that would be rejected by
-the addressbook subscription rules.
+the address book subscription rules.
 {%- endtrans %}</p>
 
 <h2 id="base32">{% trans %}Base32 Names{% endtrans %}</h2>

i2p2www/pages/site/faq.html

@@ -23,9 +23,9 @@
 <li><a href="#myI2P Site">{% trans %}How do I set up my own I2P Site?{% endtrans %}</a></li>
 <li><a href="#hosting">{% trans %}If I host a website at I2P at home, containing only HTML and CSS, is it dangerous?{% endtrans %}</a></li>
 <li><a href="#addresses">{% trans %}How Does I2P find ".i2p" websites?{% endtrans %}</a></li>
-<li><a href="#addressbook">{% trans %}How do I add to the AddressBook?{% endtrans %}</a></li>
+<li><a href="#addressbook">{% trans %}How do I add to the Address Book?{% endtrans %}</a></li>
 <li><a href="#ports">{% trans %}What ports does I2P use?{% endtrans %}</a></li>
-<li><a href="#subscriptions">{% trans %}I'm missing lots of hosts in my addressbook. What are some good subscription links?{% endtrans %}</a></li>
+<li><a href="#subscriptions">{% trans %}I'm missing lots of hosts in my address book. What are some good subscription links?{% endtrans %}</a></li>
 <li><a href="#remote_webconsole">{% trans %}How can I access the web console from my other machines or password protect it?{% endtrans %}</a></li>
 <li><a href="#remote_i2cp">{% trans %}How can I use applications from my other machines?{% endtrans %}</a></li>
 <li><a href="#socks">{% trans %}Is it possible to use I2P as a SOCKS proxy?{% endtrans %}</a></li>
@@ -248,12 +248,12 @@ Tahoe-LAFS, but they require additional set up and are only appropriate for some
 yourself from a real threat will take real consideration in any case.{% endtrans %}</p>
 
 <h3 id="addresses">{% trans %}How Does I2P find ".i2p" websites? {% endtrans %}</h3>
-<p>The I2P Addressbook application maps human-readable names to long-term destinations, associated with services, making it more like a hosts file or a contact list than a network database or a DNS service. It's also local-first there is no recognized global namespace, you decide what any given .i2p domain maps to in the end. The middle-ground is something called a "Jump Service" which provides a human-readable name by redirecting you to a page where you will be asked "Do you give the I2P router permission to call $SITE_CRYPTO_KEY the name $SITE_NAME.i2p" or something to that effect. Once it's in your addressbook, you can generate your own jump URL's to help share the site with others. </p>
+<p>The I2P Address Book application maps human-readable names to long-term destinations, associated with services, making it more like a hosts file or a contact list than a network database or a DNS service. It's also local-first there is no recognized global namespace, you decide what any given .i2p domain maps to in the end. The middle-ground is something called a "Jump Service" which provides a human-readable name by redirecting you to a page where you will be asked "Do you give the I2P router permission to call $SITE_CRYPTO_KEY the name $SITE_NAME.i2p" or something to that effect. Once it's in your address book, you can generate your own jump URL's to help share the site with others. </p>
 
-<h3 id="addressbook">{% trans %}How do I add addresses to the Addressbook? {% endtrans %}</h3>
+<h3 id="addressbook">{% trans %}How do I add addresses to the Address Book? {% endtrans %}</h3>
 <p>{% trans %}You cannot add an address without knowing at least the base32 or base64 of the site you want to visit. The "hostname" which is human-readable is only an alias for the cryptographic address, which corresponds to the base32 or base64. Without the cryptographic address, there is no way to access an I2P Site, this is by design. Distributing the address to people who do not know it yet is usually the responsibility of the Jump service provider. Visiting an I2P Site which is unknown will trigger the use of a Jump service. stats.i2p is the most reliable Jump service.{% endtrans %}</p>
 
-<p>{% trans %}If you're hosting a site via i2ptunnel, then it won't have a registration with a jump service yet. To give it a URL locally, then visit the configuration page and click the button that says "Add to Local Addressbook." Then go to http://127.0.0.1:7657/dns to look up the addresshelper URL and share it.{% endtrans %}</p>
+<p>{% trans %}If you're hosting a site via i2ptunnel, then it won't have a registration with a jump service yet. To give it a URL locally, then visit the configuration page and click the button that says "Add to Local Address Book." Then go to http://127.0.0.1:7657/dns to look up the addresshelper URL and share it.{% endtrans %}</p>
 
 <h3 id="ports"><span class="permalink"><a href="#ports">
 {% trans %}What ports does I2P use?{% endtrans %}</a></span>
@@ -530,22 +530,22 @@ only hurts you - don't do it).
 {%- endtrans %}</p>
 
 <h3 id="subscriptions"><span class="permalink"><a href="#subscriptions">
-{% trans %}I'm missing lots of hosts in my addressbook. What are some good subscription links?{% endtrans %}</a></span></h3>
+{% trans %}I'm missing lots of hosts in my address book. What are some good subscription links?{% endtrans %}</a></span></h3>
 <p>{% trans -%}
 This question can be answered in 3 parts:
 {%- endtrans %}</p>
 
 <ol>
-  <li>{% trans -%}My router often displays a message saying "Website Not Found In Addressbook", why do I see this message?{%- endtrans %}
+  <li>{% trans -%}My router often displays a message saying "Website Not Found In Address Book", why do I see this message?{%- endtrans %}
     <p>{% trans -%}Human-readable addresses such as <i>http://website.i2p</i> are references to a long, random string known as a <b>destination</b>. 
-    These references are registered and stored at addressbook services such as stats.i2p, which is run by zzz. 
+    These references are registered and stored at address book services such as stats.i2p, which is run by zzz. 
     You will often encounter a "b32" address. A "b32" is a hash (specifically, a <a href="https://en.wikipedia.org/wiki/SHA-2">SHA256</a> hash) of the 
-    destination. This hash is appended with ".b32.i2p" and serves as a convenient way to link to your hidden service, without requiring any registration on an addressbook service.{%- endtrans %}</p>
+    destination. This hash is appended with ".b32.i2p" and serves as a convenient way to link to your hidden service, without requiring any registration on an address book service.{%- endtrans %}</p>
     <p>{% trans -%}It is possible to add subscriptions to your router's configuration which may reduce the frequency of these messages.{%- endtrans %}</p></li>
-  <li>{% trans -%}What is an addressbook subscription?{%- endtrans %}
+  <li>{% trans -%}What is an address book subscription?{%- endtrans %}
     <p>{% trans -%}This is a list of files hosted on various I2P websites each of which contain a list of I2P hosts and their associated destinations.{%- endtrans %}</p>
-    <p>{% trans -%}The addressbook is located at <a href="http://localhost:7657/dns">http://localhost:7657/dns</a> where further information can be found.{%- endtrans %}</p></li>
+    <p>{% trans -%}The address book is located at <a href="http://localhost:7657/dns">http://localhost:7657/dns</a> where further information can be found.{%- endtrans %}</p></li>
-  <li>{% trans -%}What are some good addressbook subscription links?{%- endtrans %}
+  <li>{% trans -%}What are some good address book subscription links?{%- endtrans %}
     <p>{% trans -%}You may try the following:{%- endtrans %}</p>
 <div class="links">
 <ul>

i2p2www/pages/site/get-involved/develop/licenses.html

@@ -131,7 +131,7 @@ to what licenses meet the above four guarantees for inclusion in the I2P distrib
   <td valign="top" align="left">zzz</td>
  </tr>
  <tr>
-  <td valign="top" align="left"><b>Addressbook</b></td>
+  <td valign="top" align="left"><b>Address Book</b></td>
   <td valign="top" align="left">apps/addressbook</td>
   <td valign="top" align="left">addressbook.war</td>
 

i2p2www/pages/spec/index.html

@@ -61,6 +61,6 @@ These will eventually be migrated to the new specifications system.
 <li><a href="{{ site_url('docs/api/samv3') }}">SAM v3</a></li>
 <li><a href="{{ site_url('docs/api/bob') }}">BOB</a></li>
 <li><a href="{{ site_url('docs/applications/bittorrent') }}">{{ _('Bittorrent') }}</a></li>
-<li><a href="{{ site_url('docs/naming') }}">{{ _('Naming and Addressbook') }}</a></li>
+<li><a href="{{ site_url('docs/naming') }}">{{ _('Naming and Address Book') }}</a></li>
 </ul>
 {% endblock %}