fix missing </em> on debian.html near top

Adds content to /mac page

See merge request i2p-hackers/i2p.www!16

i2p2www/pages/downloads/debian.html

@@ -3,20 +3,12 @@
 {% block content %}
 <h1>{{ _('Debian I2P Packages') }}</h1>
 
-<h2 id="bionic">{{ _('Debian Buster, Ubuntu Bionic, and later') }}</h2>
-{% trans -%}
-I2P is available in the official repositories for Ubuntu Bionic and later, and Debian Buster and Sid.
-However, Debian Buster and Ubuntu Bionic (LTS) distributions will have older I2P versions.
-If you are not running Debian Sid or the latest Ubuntu release,
-use our Debian repo or Launchpad PPA to ensure you're running the latest I2P version.
-{%- endtrans %}
-
 <h2 id="others">{{ _('Debian or Ubuntu, All Versions') }}</h2>
 {% trans -%}The Debian packages should work on most platforms running:{%- endtrans %}
 <ul>
-  <li>{% trans %}<a href="#ubuntu">Ubuntu</a> (Precise <em>12.04</em> and newer){% endtrans %}</li>
+  <li>{% trans %}<a href="#ubuntu">Ubuntu</a> (Bionic <em>18.04</em> and newer){% endtrans %}</li>
-  <li><a href="#ubuntu">Mint</a></li>
+  <li>{% trans %}<a href="#ubuntu">Mint</a>(Tara<em>19</em>) or newer{% endtrans %}</li>
-  <li>{% trans %}<a href="#debian">Debian Linux</a> (Wheezy and newer){% endtrans %}</li>
+  <li>{% trans %}<a href="#debian">Debian Linux</a> (Buster and newer){% endtrans %}</li>
   <li><a href="#debian">Knoppix</a></li>
 </ul>
 
@@ -37,8 +29,8 @@ with these packages on <a href="{{ trac }}">Trac</a> at
     {% trans %}Open a terminal and enter:{% endtrans %}<br />
     <code>&nbsp;&nbsp;&nbsp; sudo apt-add-repository ppa:i2p-maintainers/i2p</code><br />
 {% trans -%}
-This command will add the PPA to /etc/apt/sources.list.d and fetch the
+This command will add the PPA to <code>/etc/apt/sources.list.d</code> and fetch
-gpg key that the repository has been signed with. The GPG key ensures
+the gpg key that the repository has been signed with. The GPG key ensures
 that the packages have not been tampered with since being built.
 {%- endtrans %}
   </li>
@@ -55,27 +47,35 @@ was added with the earlier command.
     <code>&nbsp;&nbsp;&nbsp;&nbsp;sudo apt-get install i2p</code></li>
 </ol>
 
-<h5>{{ _('Adding the PPA Using Synaptic') }}</h5>
+<h5>{{ _('Adding the PPA Using the Software Center') }}</h5>
 <ol>
   <li>
-    {% trans -%}
+    {% trans -%}Open "Software and Updates" via the applications menu.
-    Open Synaptic (System -&gt; Administration -&gt; Synaptic Package Manager).
     {%- endtrans %}
+    <img src="/_static/images/download/ubuntu/software-center-menu.png"></img>
   </li>
   <li>
-    {% trans -%}
+    {% trans -%}Select the "Other Software" tab and click the "Add" button at the
-    Once Synaptic opens, select <em>Repositories</em> from the <em>Settings</em> menu.
+    bottom to configure the PPA.
     {%- endtrans %}
+    <img src="/_static/images/download/ubuntu/software-center-addother.png"></img>
   </li>
   <li>
-    {% trans -%}
+    {% trans -%}Add the PPA by pasting the URL: <code>ppa:i2p-maintainers/i2p</code>
-    Click the <em>Other Sources</em> tab and click <em>Add</em>. Paste <code>ppa:i2p-maintainers/i2p</code> into the APT-line field and click <em>Add Source</em>. Click the <em>Close</em> button then <em>Reload</em>.
+    into the PPA dialog.
     {%- endtrans %}
+    <img src="/_static/images/download/ubuntu/software-center-ppatool.png"></img>
   </li>
   <li>
-    {% trans -%}
+    {% trans -%}Download the repository information with the "Reload" button.
-    In the Quick Filter box, type in <code>i2p</code> and press enter. When <code>i2p</code> is returned in the results list, right click <code>i2p</code> and select <em>Mark for Installation</em>. After doing so you may see a <em>Mark additional required changes?</em> popup. If so, click <em>Mark</em> then <em>Apply</em>.
     {%- endtrans %}
+    <img src="/_static/images/download/ubuntu/software-center-reload.png"></img>
+  </li>
+  <li>
+    {% trans -%}Install the I2P software using the "Software" tool from the
+    applications menu.
+    {%- endtrans %}
+    <img src="/_static/images/download/ubuntu/software-center-software.png"></img>
   </li>
 </ol>
 
@@ -92,100 +92,94 @@ part of <a href="#Post-install_work">starting I2P</a> and configuring it for you
 Note: The steps below should be performed with root access (i.e., switching
 user to root with <code>su</code> or by prefixing each command with <code>sudo</code>).
 {%- endtrans %}</p>
-<ol>
+<ol>,
-  <li>{% trans -%}Ensure that <code>apt-transport-https</code> and <code>curl</code> are installed.{%- endtrans %}
+  <li>{% trans -%}Ensure that <code>apt-transport-https</code>, <code>curl</code>, <code>lsb-release</code> are installed.{%- endtrans %}
     <pre>
     <code>
     sudo apt-get update
-    sudo apt-get install apt-transport-https curl</code>
+    sudo apt-get install apt-transport-https lsb-release curl</code>
     </pre>
   </li>
   <li>{% trans file='/etc/apt/sources.list.d/i2p.list',file2='/etc/debian_version' %}
     Check which version of Debian you are using on this page at the <a href="https://wiki.debian.org/LTS/" target="_blank">Debian wiki</a>
     and verify with <code>{{ file2 }}</code> on your system.
-    Then, add lines like the following to <code>{{ file }}</code>.{% endtrans %}<br>
+    Then, for Debian Bullseye or newer distributions run the following command to create <code>{{ file }}</code>.{% endtrans %}<br>
-<br />
+    <pre>
-For Buster (stable):<br />
+    <code>
-<pre>
+    # Use this command on Debian Bullseye or newer only.
-    <code>deb https://deb.i2p2.de/ buster main
+  echo "deb [signed-by=/usr/share/keyrings/i2p-archive-keyring.gpg] https://deb.i2p2.de/ $(lsb_release -sc) main" \
-    deb-src https://deb.i2p2.de/ buster main</code>
+  | sudo tee /etc/apt/sources.list.d/i2p.list
-</pre>
+    </code>
-
+    </pre>
-<br />
+    if you are using Debian Buster or older distributons, use the following command instead:
-For Stretch (oldstable):<br />
+    <pre>
-<pre>
+    <code>
-    <code>deb https://deb.i2p2.de/ stretch main
+    # Use this command on Debian Buster or older only.
-    deb-src https://deb.i2p2.de/ stretch main</code>
+  echo "deb https://deb.i2p2.de/ $(lsb_release -sc) main" \
-</pre>
+  | sudo tee /etc/apt/sources.list.d/i2p.list
-
+    </code>
-<br />
+    </pre>
-For Jessie (oldoldstable):<br />
-<pre>
-    <code>deb https://deb.i2p2.de/ jessie main
-    deb-src https://deb.i2p2.de/ jessie main</code>
-</pre>
-
-<br />
-For Wheezy (obsolete):<br>
-<pre>
-    <code>deb https://deb.i2p2.de/ wheezy main
-    deb-src https://deb.i2p2.de/ wheezy main</code>
-</pre>
-<br />
-
-{% trans -%}Note: If you are running Debian Sid (testing), then you can install I2P directly from Debian's main repository{%- endtrans %}:
-  <pre>
-  <code>sudo apt-get install i2p</code>
-  </pre>
 
   </li>
 
-  <li>{% trans repokey=url_for('static', filename='i2p-debian-repo.key.asc') -%}
+  <li>{% trans repokey=url_for('static', filename='i2p-debian-repo.key.gpg') -%}
-Download <a href="{{ repokey }}">the  key used to sign the repository</a>:{%- endtrans %}
+  Download <a href="{{ repokey }}">the  key used to sign the repository</a>:{%- endtrans %}
-<pre>
+    <pre>
-<code>
+    <code>
-  curl -o i2p-debian-repo.key.asc https://geti2p.net/_static/i2p-debian-repo.key.asc</code>
+  curl -o i2p-archive-keyring.gpg https://geti2p.net/_static/i2p-archive-keyring.gpg</code>
-</pre>
+    </pre>
   </li>
 
   <br />
 
-  <li>
+  <li>{% trans -%}Display the key fingerprint.{%- endtrans %}
-    {% trans -%}Check the fingerprint and owner of the key without importing anything{%- endtrans %}:<br />
     <pre>
     <code>
-  gpg -n --import --import-options import-show i2p-debian-repo.key.asc</code>
+  gpg --keyid-format long --import --import-options show-only --with-fingerprint i2p-archive-keyring.gpg
+    </code>
+    </pre>
+    {% trans -%}Verify that this key fingerprint matches the output:{%- endtrans %}
+    <pre>
+    <code>
+  7840 E761 0F28 B904 7535  49D7 67EC E560 5BCF 1346</code>
+    </pre>
+  </li>
+
+  <br />
+
+  <li>{% trans -%}Copy the keyring to the keyrings directory:{%- endtrans %}
+    <pre>
+    <code>
+  sudo cp ~/i2p-archive-keyring.gpg /usr/share/keyrings</code>
+    </pre>
+    If you are using a distribution older than Debian Buster, you will also need
+    to symlink that key to <code>/etc/apt/trusted.gpg.d</code>.
+    <pre>
+    <code>
+  sudo ln -sf /usr/share/keyrings/i2p-archive-keyring.gpg /etc/apt/trusted.gpg.d/i2p-archive-keyring.gpg</code>
     </pre>
   </li>
   
   <li>
-    {% trans -%} Add the key to APT's keyring{%- endtrans %}:<br />
+    {% trans %}Notify your package manager of the new repository by entering:{% endtrans %}<br />
-    <pre>
-    <code>
-  sudo apt-key add i2p-debian-repo.key.asc</code>
-    </pre>
-  </li>
-
-  <li>
-    {% trans %}Notify your package manager of the new repository by entering{% endtrans %}<br />
     <pre>
     <code>
   sudo apt-get update</code>
-    </pre>
+    </pre>{% trans -%}This command will retrieve the latest list of software
-{% trans -%}
+    from every repository enabled on your system, including the I2P repository
-This command will retrieve the latest list of software from every
+    added in step 1.{%- endtrans %}
-repository enabled on your system, including the I2P repository added in step
+  </li>
-1.
+  
-{%- endtrans %}
+  <br />
-  </li><br />
+
-  <li>{% trans -%}
+  <li>{% trans -%}You are now ready to install I2P! Installing the <code>i2p-keyring</code>
-You are now ready to install I2P! Installing the <code>i2p-keyring</code>
+  package will ensure that you receive updates to the repository's GPG key.
-package will ensure that you receive updates to the repository's GPG key.
+  {%- endtrans %}<br />
-{%- endtrans %}<br />
+    <pre>
-<pre>
     <code>
   sudo apt-get install i2p i2p-keyring</code>
-  </pre></li>
+    </pre>
+  </li>
 </ol>
 <p>
 {% trans -%}

i2p2www/pages/downloads/mac.html

@@ -22,7 +22,8 @@ you to complete the bandwidth setup wizard.
 <p>{% trans browser="https://geti2p.net/htproxyports" -%}
 If you want to browse hidden websites ('eepsites') on the I2P network, you need
 to configure your browser. Instructions for configuring a range of browsers are
-available on <a href="{{ browser }}">the browser configuration page</a>.
+available on <a href="{{ browser }}">the browser configuration
+page</a>.
 {%- endtrans %}</p>
 <h2>{{ _('Why should I use it?') }}</h2>
 <p>{% trans -%}
@@ -34,7 +35,7 @@ it makes I2P easier to install and work with on Apple computers by using tools
 that are familiar and built-into the operating system.
 {%- endtrans %}</p>
 
-{%- set name     = 'Mac' -%}
+{%- set name     = 'Windows' -%}
 {%- set icon     = 'images/download/mac-osx.png' -%}
 {%- set filename = 'I2P-%s.dmg' -%}
 {%- set hash     = '07c729c26fc8a31c0e74fe7b4de7be1f8e390d018748322ada35b29de9d' -%}

i2p2www/pages/site/docs/reseed.html

@@ -1,36 +1,61 @@
 {% extends "global/layout.html" %}
 {% block title %}{% trans %}Reseed Hosts{% endtrans %}{% endblock %}
-{% block lastupdated %}{% trans %}January 2016{% endtrans %}{% endblock %}
+{% block lastupdated %}{% trans %}September 2021{% endtrans %}{% endblock %}
-{% block accuratefor %}0.9.24{% endblock %}
+{% block accuratefor %}1.5.0{% endblock %}
 {% block content %}
 
 
 <h2 id="about">{% trans %}About Reseed hosts{% endtrans %}</h2>
 
 <p>{% trans -%}
-Reseed hosts are needed to for bootstrapping, that is, providing the initial set of I2P nodes for your I2P node to talk to. Depending on the status of your node it may need to bootstrap every now and then if many of the nodes it knows of aren't contactable.
+Reseed hosts are needed to for bootstrapping, that is, providing the initial set
+of I2P nodes for your I2P node to talk to. Depending on the status of your node
+it may need to bootstrap every now and then if many of the nodes it knows of
+aren't contactable.
 {%- endtrans %}</p>
 
 <p>{% trans -%}
-Reseeding is done over an encrypted connection and all of the bootstrap information is signed by the reseed host you connect to, making it impossible for an unauthenticated source to provide you with false information.
+Reseeding is done over an encrypted connection and all of the bootstrap
+information is signed by the reseed host you connect to, making it impossible
+for an unauthenticated source to provide you with false information.
 {%- endtrans %}</p>
 
 
 <h2 id="running">{% trans %}Running a Reseed host{% endtrans %}</h2>
 <p>
-{% trans -%}
+{% trans -%}Operating a reseed server can be accessible to any sysadmin familiar
-The more reseed hosts that are run, the more resilient the I2P network becomes, and the harder it is to prevent users of I2P from connecting to the network.
+with I2P, and we encourage new reseed operators to get in contact with us at
+<a href="http://zzz.i2p">the development forums</a>. The more reseed hosts that
+are run, the more resilient the I2P network becomes, and the harder it is to
+prevent users of I2P from connecting to the network.
 {%- endtrans %}
 </p>
-{% trans -%}
-There have also been cases where the reseed hosts we had, have been under heavy load due to botnet activities.
-{%- endtrans %}
-</p>
-<p>
-<a href="{{ site_url('get-involved/guides/reseed') }}">How to run a Reseed host</a>
-</p>
 
-<h2 id="thank you">{% trans %}Thank you{% endtrans %}</h2>
+<ul>
+<li><a href="{{ site_url('get-involved/guides/reseed') }}">Reseed Contributors Guide</a></li>
+<li><a href="https://i2pgit.org/idk/reseed-tools">Reseed Software and Documentation</a></li>
+</ul>
+
+<h2 id="other">{% trans %}Other ways of Reseeding{% endtrans %}</h2>
+
+<p>
+{% trans -%}
+In order to make I2P more reslient, other kinds of reseeding are possible. One
+important way of carrying out a reseed is the file-based reseed, where a user
+with a running I2P router generates a reseed file for a friend and transfers it
+to them as a .zip file. Others use cloud-based infrastructure to resist
+censorship. These reseed methods provide functionality which aids people in
+situations where reseeds are restricted.
+{%- endtrans %}
+</p>
+
+<ul>
+<li><a href="{{ site_url('blog/post/2020/06/07/file-based-reseed') }}">File Based Reseed</a></li>
+<li><a href="https://homepage.np-tokumei.net/post/notes-i2p-reseed-over-cloudflare/">I2P Reseed over Cloudflare</a></li>
+<li><a href="https://homepage.np-tokumei.net/post/notes-censorship-resistant-i2p-reseeding/">Censorship Resistant I2P Reseeding</a></li>
+</ul>
+
+<h2 id="thank you">{% trans %}Thank you Reseed Operators{% endtrans %}</h2>
 <p>
 {%-trans -%}
 If you are running a reseed server, We would like to thank you for helping to