Browser config page updates, add extension names to extension section headings

i2p2www/pages/downloads/browser-content.html

@@ -1,18 +1,9 @@
-<p>{% trans -%}
+<p>{% trans -%} Your web browser will need to be configured in order to browse web sites on I2P and to utilize the outproxies available within I2P. Below are walkthroughs for some of the most popular browsers. {%- endtrans %}</p>
-Your web browser will need to be configured in order to browse web sites on I2P
-and to utilize the outproxies available within I2P. Below are walkthroughs for
-some of the most popular browsers.
-{%- endtrans %}</p>
 
 <h2>{{ _('Firefox Profile for Windows') }}</h2>
-<p>{% trans profile='/firefox' -%}
+<p>{% trans profile='/firefox' -%} If you are using Windows, the recommended way of accessing I2P is using the
-If you are using Windows, the recommended way of accessing I2P is using the
+    <a href='{{ profile }}'>Firefox profile</a>. {%- endtrans %}</p>
-<a href='{{ profile }}'>Firefox profile</a>.
+<p>{% trans -%} If you do not wish to use that profile or are not on Windows, you need to configure your browser yourself. Read below on how to that. {%- endtrans %}</p>
-{%- endtrans %}</p>
-<p>{% trans -%}
-If you do not wish to use that profile or are not on Windows, you need to
-configure your browser yourself.  Read below on how to that.
-{%- endtrans %}</p>
 
 <h2>{{ _('How to configure your browser') }}</h2>
 
@@ -26,94 +17,50 @@ 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>
+<h4>{% trans %}Extension-based Configuration: I2P in Private Browsing{% endtrans %}</h4>
-<p>{% trans %}A new way of automatically configuring the I2P Browser is
+<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>
-currently being tested. It uses the Firefox's "Container Tabs" to build private
+<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
-browsing tools for use with I2P and I2P applications.{% endtrans %}</p>
+    with I2P. It should not substantially interfere with your non-I2P Firefox tabs. {% endtrans %}</p>
-<p>{% trans %}It does pre-configuration of your browser by enabling some of
+<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. {% endtrans %}</p>
-the privacy Browser Settings like ResistFingerprinting, and enforces WebRTC proxy
+<p>{% trans %}The source code for the extension is, <a href="https://i2pgit.org/idk/I2P-in-Private-Browsing-Mode-Firefox">i2pgit.org</a>. {% endtrans %}</p>
-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.
-{% endtrans %}</p>
 <h4>{% trans %}Instructions for Firefox 57 and above:{% endtrans %}</h4>
-<p>{% trans -%}
+<p>{% trans -%} From the Menu button in the top right, select <em>Preferences</em>. Scroll down until you see the <em>Network Proxy</em> section, as shown in the screenshot below. Click on <em>Settings</em> {%- endtrans %}</p>
-From the Menu button in the top right, select <em>Preferences</em>.
+<img src="{{ url_for('static', filename='images/firefox57.preferences.png') }}" alt="{{ _('Firefox57 Network Options') }}" title="{{ _('Firefox57 Network Options') }}">
-Scroll down until you see the <em>Network Proxy</em> section, as shown in the
+<p>{% trans -%} In the <em>Connection Settings</em> pop-up, select <em>Manual proxy
-screenshot below. Click on <em>Settings</em>
-{%- endtrans %}</p>
-<img src="{{ url_for('static', filename='images/firefox57.preferences.png') }}"
-alt="{{ _('Firefox57 Network Options') }}" title="{{ _('Firefox57 Network Options') }}">
-<p>{% trans -%}
-In the <em>Connection Settings</em> pop-up, select <em>Manual proxy
     configuration</em>. Set both the HTTP and SSL Proxy to address
-<code>127.0.0.1</code> with port <code>4444</code> as shown in the following
+    <code>127.0.0.1</code> with port <code>4444</code> as shown in the following screenshot. {%- endtrans %}</p>
-screenshot.
-{%- endtrans %}</p>
 <img src="{{ url_for('static',
 filename='images/firefox57.connectionsettings.png') }}" alt="{{ _('Firefox57
 Connection Settings') }}" title="{{ _('Firefox57 Connection Settings') }}">
-<p>{% trans -%}
+<p>{% trans -%} Finally, go to the address <em>about:config</em> and find the property media.peerConnection.ice.proxy_only. Ensure that this setting is True. {%- endtrans %}</p>
-Finally, go to the address <em>about:config</em> and find the property
-media.peerConnection.ice.proxy_only. Ensure that this setting is True.
-{%- endtrans %}</p>
 <img src="{{ url_for('static',
 filename='images/firefox.webrtc.png') }}" alt="{{ _('Firefox57
 PeerConnection Settings') }}" title="{{ _('Firefox57 PeerConnection Settings') }}">
 
 <a name="chrome"></a>
 <h3>{% trans %} Chrome {% endtrans %}</h3>
-<h4>{% trans %}Experimental, extension-based Configuration{% endtrans %}</h4>
+<h4>{% trans %}Extension-based Configuration: I2PChrome.js(Experimental, additional configuration){% endtrans %}</h4>
-<p>{% trans %}An experimental, partially-automated configuration process for
+<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="https://chrome.google.com/webstore/detail/i2pchromejs/ikdjcmomgldfciocnpekfndklkfgglpe"><em>Extension</em></a>    in your newly-created profile. This profile is now configured to use I2P. Highly detailed instructions are available at the
-Chrome is available. In order to configure it, create a new <em>Profile</em>
+    <a href="https://eyedeekay.github.io/I2P-Configuration-For-Chromium">homepage.</a> {% endtrans %}</p>
-especially for your I2P browsing, separate from the default profile. Then install
-this <a href="https://chrome.google.com/webstore/detail/i2pchromejs/ikdjcmomgldfciocnpekfndklkfgglpe"><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 -%}
+<p>{% trans -%} Chromium-Based Browsers like Chrome have slightly different places for their proxy settings depending on variant and platform. These instructions may be slightly different in Brave or Iridium, for instance. From the <em>Main</em> menu, navigate
-Chromium-Based Browsers like Chrome have slightly different places for their
+    to the <em>Settings</em>, and search for the <em></em> menu item. Clicking it will open the right settings for your platform. {%- endtrans %}</p>
-proxy settings depending on variant and platform. These instructions may be
-slightly different in Brave or Iridium, for instance. From the <em>Main</em>
-menu, navigate to the <em>Settings</em>, and search for the <em></em> menu item.
-Clicking it will open the right settings for your platform.
-{%- endtrans %}</p>
 <img src="{{ url_for('static', filename='images/chrome.proxy.png') }}" alt="{{ _('Chrome Proxy Options') }}" title="{{ _('Chrome Proxy Options') }}">
-<p>{% trans -%}
+<p>{% trans -%} 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>
-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>
 
 <a name="android"></a>
 <h3>{% trans %} IceRaven and other Firefoxes for Android {% endtrans %}</h3>
 <h4>{% trans %}Extension-based Configuration{% endtrans %}</h4>
-<p>{% trans %}Modern Firefoxes(The "Fenix" based Firefoxes) do not generally have
+<p>{% trans %}Modern Firefoxes(The "Fenix" based Firefoxes) do not generally have an about:config page for you to configure proxy settings manually. It is further not possible to use most extensions in Fenix-based Firefoxes. It is possible to enable support
-an about:config page for you to configure proxy settings manually. It is further
+    about:config and enable more extensions in Firefox Nightly at the time of this writing, but it's a manual and difficult process. <em>IceRaven</em> is a fork of Firefox which enables a collection of extensions while Mozilla and the Mozilla Community
-not possible to use most extensions in Fenix-based Firefoxes. It is possible to
+    work on adding support for extensions to Firefox for Android. It provides the easiest way of configuring a modern Firefox-based Browser for Android. It does not come from Mozilla and carries no guarantees from them. <em>Installing the extension
-enable support about:config and enable more extensions in Firefox Nightly at the time 
-of this writing, but it's a manual and difficult process. <em>IceRaven</em> is a fork
-of Firefox which enables a collection of extensions while Mozilla and the Mozilla
-Community work on adding support for extensions to Firefox for Android. It provides
-the easiest way of configuring a modern Firefox-based Browser for Android. It does
-not come from Mozilla and carries no guarantees from them. <em>Installing the extension
 in IceRaven will proxy all your IceRaven browsing over I2P.</em>{% endtrans %}</p>
-<p>{% trans %}If you have not installed IceRaven yet, go to the next step. If you have been
+<p>{% trans %}If you have not installed IceRaven yet, go to the next step. If you have been using IceRaven for a while, go to the main menu, select the History tab, and make sure that you have cleared information about your past browsing by tapping the "Delete
-using IceRaven for a while, go to the main menu, select the History tab, and make
+    History" button.{% endtrans %}</p>
-sure that you have cleared information about your past browsing by tapping the
+<p>{% trans %}Open the IceRaven main menu, and scroll to the top until you see the "Add-Ons" submenu. Tap the "Add-Ons Manager" option in the "Add-Ons" submenu. Install the extension named <em>I2P Proxy for Android and other Systems</em>. {% endtrans %}</p>
-"Delete History" button.{% endtrans %}</p>
+<p>{% trans %}Your IceRaven browser is now configured to use I2P. {% endtrans %}</p>
-<p>{% trans %}Open the IceRaven main menu, and scroll to the top until you see the "Add-Ons"
+<p>{% trans %}This extension also works in pre-Fenix(Pre-Firefox-68) Firefox based web browsers, if installed from the following addons.mozilla.org URL.
-submenu. Tap the "Add-Ons Manager" option in the "Add-Ons" submenu. Install
+    <em><a href="https://addons.mozilla.org/en-US/android/addon/i2p-proxy/">I2P Proxy for Android and Other Systems</a><em>
-the extension named <em>I2P Proxy for Android and other Systems</em>.
-{% endtrans %}</p>
-<p>{% trans %}Your IceRaven browser is now configured to use I2P.
-{% endtrans %}</p>
-<p>{% trans %}This extension also works in pre-Fenix(Pre-Firefox-68) Firefox based
-web browsers, if installed from the following addons.mozilla.org URL.
-<em><a href="https://addons.mozilla.org/en-US/android/addon/i2p-proxy/">I2P Proxy for Android and Other Systems</a><em>
 {% endtrans %}</p>
 <p>{% trans %}This extension is identical to the Chromium extension and is built from the same source.{% endtrans %}</p>
 <p>{% trans %}In order to enable extension support in Firefox Nightly, you should follow
@@ -166,4 +113,4 @@ As a convenience, the outproxy blocks ad servers.
 <p>{% trans -%}
 <a href="https://www.torproject.org">Tor</a> provides a browser to use as an outproxy to the Internet.
 {%- endtrans %}</p>
-<!-- vim: set noai ff=unix nosi ft=html tw=79 et sw=4 ts=4 spell spelllang=en: -->
+<!-- vim: set noai ff=unix nosi ft=html tw=79 et sw=4 ts=4 spell spelllang=en: -->

site-updater-docker.sh

@@ -50,6 +50,6 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" || exit
 cd "$DIR"
 
 git pull origin $i2p_www_branch
-docker build $i2p_www_docker_build_args -t i2p-mirror/i2p.www$suffix .
+docker build $i2p_www_docker_build_args -t i2p-mirror/mirror.i2p.www$suffix .
 docker rm -f mirror.i2p.www$suffix
 docker run $i2p_www_docker_run_args --name mirror.i2p.www$suffix -p 0.0.0.0:$port:80 i2p-mirror/i2p.www$suffix $@