update some important globals

i2p2www/pages/global/footer.html

@@ -1,16 +1,17 @@
 <div id="footermenu" class="first">
   <ul>
-    <li><a href="{{ site_url('contact') }}"><img class="socialfooter" src="/_static/images/social/contact.png"><div class="footeritem"><span>{{ _('Contact us') }}</span></div></a></li>
-    <li><a href="http://{{ i2pconv('i2pforum.i2p') }}/"><img class="socialfooter" src="/_static/images/social/forum.png"><div class="footeritem"><span>{{ _('Official Forums') }}</span></div></a></li>
+    <li><a href="https://mastodon.social/@i2p"><div class="footeritem"><img class="socialfooter" src="/_static/images/social/contact.png"><span>{{ _('Mastodon') }}</span></div></a></li>
+
     <li><a href="https://reddit.com/r/i2p"><div class="footeritem"><img class="socialfooter" src="/_static/images/social/reddit-alien-brands.png"><span>Reddit</span></div></a></li>
     <li><a href="https://twitter.com/i2p"><div class="footeritem"><img class="socialfooter" src="/_static/images/social/twitter-brands.png"><span>Twitter</span></div></a></li>
   </ul>
 </div>
 <div id="footermenu" class="second">
   <ul>
+    <li><a href="http://{{ i2pconv('i2pforum.i2p') }}/"><div class="footeritem"><img class="socialfooter" src="/_static/images/social/contact.png"><span>{{ _('Official Forums') }}</span></div></a></li>
     <li><a href="{{ get_url('downloads_list') }}"><div class="footeritem"><span>{{ _('Download') }}</span></div></a></li>
     <li><a href="{{ site_url('faq') }}"><div class="footeritem"><span>{{ _('FAQ') }}</span></div></a></li>
-    <li><a href="{{ site_url('docs') }}"><div class="footeritem"><span>{{ _('Documentation') }}</span></div></a></li>
+<!--    <li><a href="{{ site_url('docs') }}"><div class="footeritem"><span>{{ _('Documentation') }}</span></div></a></li>-->
 <!--    <li><a href="{{ site_url('research') }}"><div class="footeritem"><span>{{ _('Research') }}</span></div></a></li>-->
   </ul>
 </div>

i2p2www/pages/site/about/software.html

@@ -6,7 +6,7 @@
 <p>{% trans %}When you install the I2P software made available at geti2p.net, you are 
 actually installing an I2P router and an accompanying bundle of basic 
 applications. The I2P Java distribution is the first I2P software gateway and 
-has been actively developed since 2001.{%- endtrans %}</p>
+has been actively developed since 2003.{%- endtrans %}</p>
 <p>{% trans %}The applications are made available through a webUI, which listens at 
 127.0.0.1:7657, and the main page of which is called the “Router Console,” 
 where you monitor the health of your connection to the network and access 

i2p2www/pages/site/faq.html

@@ -7,7 +7,7 @@
 </li>
 <li><a href="#systems">{% trans %}What systems will I2P run on?{% endtrans %}</a></li>
 <li><a href="#java">{% trans %}Is installing Java required to use I2P?{% endtrans %}</a></li>
-<li><a href="#I2P Site">{% trans %}Whats an "I2P Site" and how do I configure my browser so I can use them?{% endtrans %}</a></li>
+<li><a href="#I2P Site">{% trans %}What is an "I2P Site" and how do I configure my browser so I can use them?{% endtrans %}</a></li>
 <li><a href="#active">{% trans %}What do the Active x/y numbers mean in the router console?{% endtrans %}</a></li>
 <li><a href="#peers">{% trans %}My router has very few active peers, is this OK?{% endtrans %}</a></li>
 <li><a href="#badcontent">{% trans %}I am opposed to certain types of content. How do I keep from distributing, storing, or accessing them?{% endtrans %}</a></li>
@@ -49,7 +49,7 @@
 </li>
 <li><a href="#outproxy">{% trans %}I can't access regular Internet sites through I2P.{% endtrans %}</a></li>
 <li><a href="#https">{% trans %}I can't access https:// or ftp:// sites through I2P.{% endtrans %}</a></li>
-<li><a href="#cpu">{% trans %}My router is using too much CPU?!?{% endtrans %}</a></li>
+<li><a href="#cpu">{% trans %}Why is my router using too much CPU?{% endtrans %}</a></li>
 <li><a href="#peers">{% trans %}My router has very few active peers, is this OK?{% endtrans %}</a></li>
 <li><a href="#vary">{% trans %}My active peers / known peers / participating tunnels / connections / bandwidth vary dramatically over time! Is anything wrong?{% endtrans %}</a></li>
 <li><a href="#slow">{% trans %}What makes downloads, torrents, web browsing, and everything else slower on I2P as compared to the regular internet?{% endtrans %}</a></li>
@@ -100,9 +100,9 @@ While the main I2P client implementation requires Java, there are several
 <h3 id="I2P Site"><span class="permalink"><a href="#I2P Site">
 {% trans %}What is an "I2P Site?"{% endtrans %}</a></span>
 </h3>
-<p>{% trans -%}
+<p>{% trans browsers=site_url('about/browser-config') -%}
 Formerly called an eepSite, an I2P Site is a website that is hosted anonymously, a hidden service which is accessible through your web browser. 
-It can be accessed by setting your web browser's HTTP proxy to use the I2P web proxy (typically it listens on localhost port 4444), and browsing to the site.
+It can be accessed by setting your web browser's HTTP proxy to use the I2P web proxy (typically it listens on localhost port 4444), and browsing to the site. Detailed instructions for configuring your browse can be found on the <a href="{{ browsers }}">browser configuration page</a>.
 {%- endtrans %}</p>
 
 <h3 id="active"><span class="permalink"><a href="#active">

i2p2www/pages/site/index.html

@@ -6,7 +6,7 @@
 <div class="main">
   <!--<img src="{{ url_for('static', filename='images/pexels-jakub-novacek.jpg') }}" class="home_splash_image" />-->
   <h1>{{ _('What does I2P do for you?') }}</h1>
-  <p>{% trans %}The Invisible Internet is a privacy by design people-powered network. No tracking, protected communication and truly free.
+  <p>{% trans %}The Invisible Internet is a privacy by design, people-powered network. It is a truly free and anonymizing Internet alternative. Get I2P.
   {% endtrans %}</p>
   <a class="get-i2p" href="{{ url_for('downloads_list', lang=g.lang) }}">{% trans version=ver() %}Get I2P {{ version }}{% endtrans %}</a>
 </div>