Update download configuration page, include webextensions in browser configuration documentation marked as experimental, fix ports in gitlab

i2p2www/blog/2020/03/06/git-over-i2p.rst

@@ -140,7 +140,7 @@ Now your tunnel is all set up, you can attempt a clone over SSH.
 
 ::
 
-       GIT_SSH_COMMAND="ssh -p 7442" \
+       GIT_SSH_COMMAND="ssh -p 7670" \
            git clone git@127.0.0.1:youruser/i2p.i2p
 
 {% trans -%}
@@ -152,7 +152,7 @@ easiest is to try and clone to a shallow depth:
 
 ::
 
-       GIT_SSH_COMMAND="ssh -p 7442" \
+       GIT_SSH_COMMAND="ssh -p 7670" \
            git clone --depth 1 git@127.0.0.1:youruser/i2p.i2p
 
 {% trans -%}

i2p2www/pages/downloads/browser-content.html

@@ -25,6 +25,18 @@ configure your browser yourself.  Read below on how to that.
 
 <a name="firefox"></a>
 <h3>Firefox</h3>
+<h4>{% trans %}Experimental, extension-based Configuration{% endtrans %}</h4>
+<p>{% trans %}A new way of automatically configuring the I2P Browser is
+currently being tested. It uses the Firefox's "Container Tabs" to build private
+browsing tools for use with I2P and I2P applications.{% endtrans %}</p>
+<p>{% trans %}It does pre-configuration of your browser by enabling some of
+the privacy Browser Settings like ResistFingerprinting, and enforces WebRTC proxy
+obedience. It also contains menus, shortcuts, and monitoring tools improving
+Firefox's integration with I2P. It is a by-product of the I2P Browser project.
+{% endtrans %}</p>
+<p>{% trans %}The extension, <a href="https://addons.mozilla.org/en-US/firefox/addon/i2p-in-private-browsing/">I2P in Private Browsing</a>,
+can be obtained from the Mozilla addon store or any of these mirrors:
+{% endtrans %}</p>
 <h4>{% trans %}Instructions for Firefox 57 and above:{% endtrans %}</h4>
 <p>{% trans -%}
 From the Menu button in the top right, select <em>Preferences</em>.
@@ -49,27 +61,18 @@ media.peerConnection.ice.proxy_only. Ensure that this setting is True.
 <img src="{{ url_for('static',
 filename='images/firefox.webrtc.png') }}" alt="{{ _('Firefox57
 PeerConnection Settings') }}" title="{{ _('Firefox57 PeerConnection Settings') }}">
-<!--<h4>{% trans %}Experimental, extension-based Configuration{% endtrans %}</h4>
-<p>{% trans %}A new way of automatically configuring the I2P Browser is
-currently being tested. It uses the Firefox's "Container Tabs" to build private
-browsing tools for use with I2P and I2P applications.{% endtrans %}</p>
-<p>{% trans %}It does pre-configuration of your browser by enabling some of
-the privacy Browser Settings like ResistFingerprinting, and enforces WebRTC proxy
-obedience. It also contains menus, shortcuts, and monitoring tools improving
-Firefox's integration with I2P. It is a by-product of the I2P Browser project.
-{% endtrans %}</p>
-<p>{% trans %}The extension, <a href="https://addons.mozilla.org/en-US/firefox/addon/i2p-in-private-browsing/">I2P in Private Browsing</a>,
-can be obtained from the Mozilla addon store or any of these mirrors:
-{% endtrans %}</p>
-<ul>
-  <li><a href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases">{% trans %}Github Releases{% endtrans %}</a></li>
-  <li><a href="http://idk.i2p/I2P-in-Private-Browsing-Mode-Firefox/i2ppb@eyedeekay.github.io.xpi">{% trans %}In-I2P Mirror{% endtrans %}</a></li>
-  <li><a href="magnet:?xt=urn:btih:90f1cef9f03f802499ecd7e22226aae72ddaa9c0">{% trans %}Bittorrent Magnet Link{% endtrans %}</a></li>
-  <li><a href="https://eyedeekay.github.io/I2P-in-Private-Browsing-Mode-Firefox/i2ppb@eyedeekay.github.io.xpi.torrent">{% trans %}Bittorrent Torrent File(Hosted at Github){% endtrans %}</a></li>
-</ul>-->
 
 <a name="chrome"></a>
-<h3>Chrome</h3>
+<h3>{% trans %} Chrome {% endtrans %}</h3>
+<h4>{% trans %}Experimental, extension-based Configuration{% endtrans %}</h4>
+<p>{% trans %}An experimental, partially-automated configuration process for
+Chrome is available. In order to configure it, create a new <em>Profile</em>
+especially for your I2P browsing, separate from the default profile. Then install
+this <a href=""><em>Extension</em></a> in your newly-created profile. This profile
+is now configured to use I2P. Highly detailed instructions are available at the
+<a href="https://eyedeekay.github.io/I2P-Configuration-for-Chromium">homepage.</a>
+{% endtrans %}</p>
+<h4>{% trans %}All Chrome Versions{% endtrans %}</h4>
 <p>{% trans -%}
 Chromium-Based Browsers like Chrome have slightly different places for their
 proxy settings depending on variant and platform. These instructions may be
@@ -83,14 +86,7 @@ On Windows, this button will launch you into the shared proxy settings used
 by <a href="#ie8"><em>Internet Explorer</em></a>, and you can configure it by
 following the Internet Explorer 8 guide.
 {%- endtrans %}</p>
-<!--<h4>{% trans %}Experimental, extension-based Configuration{% endtrans %}</h4>
-<p>{% trans %}An experimental, partially-automated configuration process for
-Chrome is available. In order to configure it, create a new <em>Profile</em>
-especially for your I2P browsing, separate from the default profile. Then install
-this <a href=""><em>Extension</em></a> in your newly-created profile. This profile
-is now configured to use I2P. Highly detailed instructions are available at the
-<a href="https://eyedeekay.github.io/I2P-Configuration-for-Chromium">homepage.</a>
-{% endtrans %}</p>-->
+<!---->
 
 <a name="ie8"></a>
 <h3>{{ _('Internet Explorer') }}</h3>

i2p2www/pages/downloads/firefox.html

@@ -4,13 +4,14 @@
 {% block content %}
 <h1>{{ _('I2P Firefox Browser Profile') }}</h1>
 <p>{% trans -%}
-An eepsite 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, port 4444, and browsing to the site.
+Now that you have joined the I2P network, you will want to see I2P sites and and 
+other content that is hosted on the network. The Firefox browser is 
+pre-configured to allow you to access the content available on the network. It 
+also keeps your I2P search activity separate from your internet search activity.
 {%- endtrans %}</p>
 <p>{% trans -%}
-To make that easy, the Firefox browser profile is pre-configured to work with I2P. While you can use any browser to access I2P sites, using a dedicated browser profile keeps your I2P browsing activity separate from your clearnet activity.
-{%- endtrans %}</p>
-<p>{% trans -%}
-This profile also includes the NoScript plugin which protects you from malicious Javascript and the HTTPSEverywhere plugin which enforces SSL encryption where available.
+This browser also includes both the NoScrpt and HTTPSEverywhere plugin for
+better protection Javascript based attacks and HTTPS support where available.
 {%- endtrans %}</p>
 
 {%- set name     = 'Windows' -%}

i2p2www/pages/downloads/list.html

@@ -22,14 +22,15 @@
 {% trans lab='/lab' %}
 If you would like to try the latest experimental I2P projects, visit the <a href = "{{ lab }}">I2P Lab</a>
 {% endtrans -%}-->
-<h3>{{ _('Requirements') }}</h3>
+<h3>{{ _('Getting Started') }}</h3>
 <p>{% trans java='https://java.com/download/',
 openjdk='http://openjdk.java.net/install/',
 icedtea='http://icedtea.classpath.org/wiki/Main_Page',
 arm8='https://openjdk.java.net/install/',
 ibmsdk7='http://www.ibm.com/developerworks/java/jdk/linux/download.html',
 detectjre='https://java.com/en/download/installed.jsp?detect=jre&amp;try=1' %}
-Java Runtime Version 7 or higher.
+In addition to the I2P download, you need to install Java if you do not have it 
+already installed. I2P requires Java Runtime Version 7 or higher.
 (<a href="{{ java }}">Oracle</a>,
 <a href="{{ openjdk }}">OpenJDK</a>, or
 <a href="{{ icedtea }}">IcedTea</a>
@@ -61,7 +62,7 @@ Windows: Java 8 is recommended. Java 9 or higher may not work.
 
 
 
-<h3>{{ _('Clean installs') }}</h3>
+<h3>{{ _('Pick your I2P Bundle') }}</h3>
 <div class="downloadlist">
 
 {% call package('windows') %}
@@ -75,23 +76,28 @@ Windows: Java 8 is recommended. Java 9 or higher may not work.
 {% endcall %}
 {% call package('mac') %}
     <p>{% trans i2pversion=ver() -%}
-    Download that file and double-click it (if that works) or
-    type <code>java -jar i2pinstall_{{ i2pversion }}.jar</code> in a terminal to run the
-    installer.
-    You may be able to right-click and select
-    &quot;Open with Java&quot;.
+    The most reliable way to launch the installer is from a terminal like this:
+    <code>java -jar i2pinstall_{{ i2pversion }}.jar</code>. This will launch the GUI installer.
+    Depending on how your computer is set up, you may be able to start the
+    installer by double-clicking the &quot;i2pinstall_{{ i2pversion }}.jar&quot; file or
+    right-clicking the file and selecting &quot;Open with Java&quot;.
+    Unfortunately, this behaviour is difficult to predict.
     {%- endtrans %}</p>
 
     <h3>{% trans %}Command line (headless) install:{% endtrans %}</h3>
     {% trans i2pversion=ver() -%}
-    Download the {{ i2pversion }} OSX graphical installer file above and
-    run <code>java -jar i2pinstall_{{ i2pversion }}.jar -console</code> from the command line.
+    I2P can also be installed in a terminal environment, which may be especially
+    useful for servers, containers, or certain virtual machines. If you wish to
+    use the installer without a GUI, you can use the command 
+    <code>java -jar i2pinstall_{{ i2pversion }}.jar -console</code> to follow
+    the install procedure in your terminal.
     {%- endtrans %}
 {% endcall %}
 
 {% call package('macnative') %}
     <p>{% trans i2pversion=ver() -%}
-    A drag-and-drop installer that includes a new I2P Launcher utility.
+    This is a more familiar drag-and-drop style installer for OSX, which
+    includes a Dock icon to easily inform you of I2P's status.
     Beta.
     {%- endtrans %}</p>
 
@@ -102,17 +108,21 @@ Windows: Java 8 is recommended. Java 9 or higher may not work.
 
 {% call package('unix') %}
     <p>{% trans i2pversion=ver() -%}
-    Download that file and double-click it (if that works) or
-    type <code>java -jar i2pinstall_{{ i2pversion }}.jar</code> in a terminal to run the
-    installer.
-    On some platforms you may be able to right-click and select
-    &quot;Open with Java&quot;.
+    The most reliable way to launch the installer is from a terminal like this:
+    <code>java -jar i2pinstall_{{ i2pversion }}.jar</code>. This will launch the GUI installer.
+    Depending on how your computer is set up, you may be able to start the
+    installer by double-clicking the &quot;i2pinstall_{{ i2pversion }}.jar&quot; file or
+    right-clicking the file and selecting &quot;Open with Java&quot;.
+    Unfortunately, this behaviour is difficult to predict.
     {%- endtrans %}</p>
 
     <h3>{% trans %}Command line (headless) install:{% endtrans %}</h3>
     {% trans i2pversion=ver() -%}
-    Download the graphical installer file above and
-    run <code>java -jar i2pinstall_{{ i2pversion }}.jar -console</code> from the command line.
+    I2P can also be installed in a terminal environment, which may be especially
+    useful for servers, containers, or certain virtual machines. If you wish to
+    use the installer without a GUI, you can use the command 
+    <code>java -jar i2pinstall_{{ i2pversion }}.jar -console</code> to follow
+    the install procedure in your terminal.
     {%- endtrans %}
 {% endcall %}
 

i2p2www/pages/global/nav.html

@@ -41,19 +41,11 @@
           <li><a href="{{ site_url('contact') }}"><div class="menuitem"><span>{{ _('Contact us') }}</span></div></a></li>
         </ul>
       </li>
-      <!--<li class="has-sub"><div class="menuitem"><span>{{ _('Presentations, Tutorials, Articles, and Media') }}</span></div>
-        <ul>
-          <li><a href="{{ get_url('papers_list') }}"><div class="menuitem"><span>{{ _('Academic papers and peer review') }}</span></div></a></li>
-          <li><a href="{{ site_url('about/media') }}"><div class="menuitem"><span>{{ _('Presentations, tutorials and articles') }}</span></div></a></li>
-          <li><a href="{{ site_url('impressum') }}"><div class="menuitem"><span>{{ _('Impressum') }}</span></div></a></li>
-        </ul>
-      </li>-->
       <li><a href="{{ site_url('links') }}"><div class="menuitem"><span>{{ _('Links') }}</span></div></a></li>
   </ul>
   <li><a href="{{ site_url('get-involved/donate') }}"><div class="menuitem"><span class="donateitem">{{ _('Donate') }}</span></div></a></li>
   <li class="has-sub"><div class="menuitem"><span>{{ _('Community') }}</span></div>
     <ul>
-      <li><a href="https://wiki.i2p-projekt.de"><div class="menuitem"><span>{{ _('Wiki') }}</span></div></a></li>
       <li><a href="http://{{ i2pconv('i2pforum.i2p') }}/"><div class="menuitem"><span>{{ _('Forums') }}</span></div></a></li>
       <li><a href="https://reddit.com/r/i2p"><div class="menuitem"><span>Reddit</span></div></a></li>
       <li class="has-sub"><div class="menuitem"><span>{{ _('Research') }}</span></div>

i2p2www/pages/papers/anonbib.bib

@@ -47,7 +47,7 @@
   author = {de Boer, Tim and Breider, Vincent},
   school = {University of Amsterdam},
   year = {2019},
-  month = {Feburary},
+  month = {February},
   www_pdf_url = {https://delaat.net/rp/2018-2019/p63/report.pdf},
   www_section = comm,
 }
@@ -57,7 +57,7 @@
   author = {de Boer, Tim and Breider, Vincent},
   school = {University of Amsterdam},
   year = {2019},
-  month = {Feburary},
+  month = {February},
   www_pdf_url = {https://delaat.net/rp/2018-2019/p63/presentation.pdf},
   www_section = comm,
 }

i2p2www/static/styles/duck/desktop.css

@@ -266,9 +266,9 @@ div#content .main {
 
 .main img.home_splash_image {
   left: 10%;
-  max-height: 90%;
+  max-height: 100%;
   max-width: 40%;
-  top: 10%;
+  top: 0%;
 }
 
 .main .get-i2p {