Get rid of some old mtn stuff that we don't use anymore, update some trac links, remove remaining viewmtn mention. closes #21

i2p2www/pages/site/docs/index.html

@@ -252,14 +252,10 @@ ancient (str4d)
 <a href="http://{{ i2pconv('zzz.i2p') }}/">{{ _('Developer forum inside I2P') }}</a>
 </li><li>
 <a href="https://i2pgit.org/i2p-hackers/i2p.i2p/issues">{{ _('Bug tracker') }}</a>
-<!--
-</li><li>
-<a href="http://{{ i2pconv('killyourtv.i2p') }}/viewmtn/">{{ _('Viewmtn inside I2P') }}</a>.
--->
 </li><li>
 <a href="https://github.com/i2p/i2p.i2p">{{ _('I2P Source exported to GitHub') }}</a>
 </li><li>
-<a href="http://{{ i2pconv('git.repo.i2p') }}/w/i2p.i2p.git">{{ _('I2P Source Git Repo inside I2P') }}</a>
+<a href="http://git.idk.i2p/i2p/i2p.i2p.git">{{ _('I2P Source Git Repo inside I2P') }}</a>
 </li><li>
 <a href="https://www.transifex.net/projects/p/I2P/">{{ _('Source translation at Transifex') }}</a>
 </li><li>

i2p2www/pages/site/get-involved/guides/new-developers.html

@@ -7,7 +7,6 @@
     <li><a href="#getting-the-i2p-code">{% trans %}Getting the I2P code{% endtrans %}</a>
     <ul>
       <li><a href="#git">{% trans %}The new way: Git{% endtrans %}</a></li>
-      <li><a href="#monotone">{% trans %}The old way: Monotone{% endtrans %}</a></li>
     </ul></li>
     <li><a href="#building-i2p">{% trans %}Building I2P{% endtrans %}</a></li>
     <li><a href="#development-ideas">{% trans %}Development ideas{% endtrans %}</a></li>
@@ -50,10 +49,11 @@ For development on the I2P router or the embedded applications,
 there are two ways to get the source code:
 {%- endtrans %}</p>
 
-<h3 id="git">{% trans %}The easy way: Git{% endtrans %}</h3>
+<h3 id="git">{% trans %}The new way: Git{% endtrans %}</h3>
 
-<p>{% trans trac="https://trac.i2p2.de" -%}I2P now has official Git services and accepts contributions via Git at our own gitlab.
+<p>{% trans trac="https://i2pgit.org" -%}I2P now has official Git services and accepts contributions via Git at our own gitlab.
-For the time being, issues are still being manged on <a href="{{ trac }}">gitlab</a>.{%- endtrans %}</p>
+Trac issues have also been migrated to <a href="{{ trac }}">gitlab</a>, however Trac still available for now. Two-way syncing of
+issues between Gitlab and Github is a work-in-progress.{%- endtrans %}</p>
 
 <li>{% trans git_url='https://git-scm.com/' -%}
 Install <a href="{{ git_url }}">Git</a>.
@@ -78,70 +78,6 @@ Install <a href="{{ git_url }}">Git</a>.
   </li>
 </ul>
 
-<h3 id="monotone">{% trans %}The old way: Monotone{% endtrans %}</h3>
-<p><b>Note:</b> We are no longer using monotone. The project has migrated all source repos to git.</p>
-<ul>
-  <li>{% trans -%}
-Install <a href="http://www.monotone.ca/">monotone</a>.
-Monotone is a version control system.
-We use it because it allows us to keep track of who does what changes to the source code (and for a lot of complicated things, but 'keeping track of changes' is the basic idea).
-  {%- endtrans %}</li>
-  <li>{% trans -%}
-Skim over the <a href="http://www.monotone.ca/docs/Tutorial.html">monotone tutorial</a>, to make sure you understand the concepts.
-  {%- endtrans %}</li>
-  <li>
-    <p>{% trans -%}
-      If you want to remain anonymous, you need to do an additional step, to set up a connection to a monotone server over I2P:
-    {%- endtrans %}</p>
-    <p>{% trans i2ptunnel=site_url('docs/api/i2ptunnel') -%}
-      Enable the <a href="{{ i2ptunnel }}">i2ptunnel</a> client tunnel on port 8998 pointing to mtn.i2p-projekt.i2p.
-    {%- endtrans %}</p>
-  </li>
-  <li>{% trans -%}
-  Pick a directory where you want to put all your I2P files, and create a monotone database:{% endtrans %} <code><b>mtn -d i2p.mtn db init</b></code>
-  </li>
-  <li>{% trans -%}
-Define the trust list by creating <code>~/.monotone/monotonerc</code> (or <code>_MTN/monotonerc</code> in the i2p.i2p workspace) with the following contents:
-{%- endtrans %}
-{% include "include/monotonerc.html" %}
-</li>
-  <li>{% trans devkeys=site_url('get-involved/develop/developers-keys') -%}
-Copy and paste the <a href="{{ devkeys }}">developer's commit keys</a> into a new file (e.g. <code>keys.txt</code>) in the same directory
-  that <code>i2p.mtn</code> is in. Import the keys into your database with <br><code><pre>      mtn -d i2p.mtn read < keys.txt</pre></code>
-  {%- endtrans %}</li>
-  <li>{% trans %}Pull the I2P sources to your machine. This may take a long time, especially if you are doing this over I2P!{% endtrans %}
-    <ul>
-      <li>{% trans %}Anonymously:{% endtrans %} <code><b>mtn -d i2p.mtn -k "" pull "mtn://127.0.0.1:8998?i2p.i2p"</b></code></li>
-      <li>
-        <p>
-           {% trans %}Non-anonymously:{% endtrans %} <code><b>mtn -d i2p.mtn -k "" pull "mtn://mtn.i2p-projekt.de?i2p.i2p"</b></code>
-        </p>
-    </ul>
-  </li>
-  <li>
-    <p>
-    {% trans %}All the sources are now present on your machine, in the database file. To make them available in a directory, you need to check them out:{% endtrans %} <code><b>mtn -d i2p.mtn co --branch=i2p.i2p</b></code>
-    </p>
-    <p>{% trans %}The above command creates a directory i2p.i2p, which contains all of the I2P sources.{% endtrans %}</p>
-  </li>
-</ul>
-
-<h4>{% trans %}Remarks{% endtrans %}</h4>
-<p>{% trans %}
-To download the website files instead of the I2P source files, use 'i2p.www' instead of 'i2p.i2p'.
-{%- endtrans %}</p>
-<p>{% trans -%}
-The initial pull may take several hours using the tunnel.
-If it fails after a partial pull, simply rerun it, it will start where it left off.
-If you are in a hurry, use the non-anonymous access.
-{%- endtrans %}</p>
-<p>{% trans viewmtn='http://'+i2pconv('killyourtv.i2p')+'/viewmtn/' -%}
-A full list of branches, including i2p.i2p and i2p.www can be found on <a href="{{ viewmtn }}">viewmtn</a>.
-{%- endtrans %}</p>
-<p>{% trans monotone=site_url('get-involved/guides/monotone') -%}
-A long explanation about using monotone is available on the <a href="{{ monotone }}">monotone page</a>.
-{%- endtrans %}</p>
-
 <h2 id="building-i2p">{% trans %}Building I2P{% endtrans %}</h2>
 
 <p>{% trans sunjdk6='http://www.oracle.com/technetwork/java/javase/downloads/index.html' -%}
@@ -178,21 +114,6 @@ See the bottom of <a href="{{ licenses }}#commit">the licenses page</a> for
 commit privilege requirements. You need these to put code into i2p.i2p (not required for the website!).
 {%- endtrans %}</p>
 
-<p>{% trans %}Short version of how to generate and use keys if you plan to commit:{% endtrans %}
-<b>Note:</b> No longer required. We are no longer using monotone. The project has migrated all source repos to git.
-  <ul>
-    <li>mtn genkey yourname-transport@mail.i2p <i>({% trans %}use an empty passphrase{% endtrans %})</i>
-    <li>mtn genkey yourname@mail.i2p <i>({% trans %}enter a passphrase{% endtrans %})</i>
-    <li>mtn pubkey yourname-transport@mail.i2p <i>({% trans email='echelon@mail.i2p' %}<a href="mailto:{{ email }}">send</a> this to a mtn repo operator to get push privileges{% endtrans %})</i>
-    <li>mtn pubkey yourname@mail.i2p <i>({% trans email='zzz@mail.i2p' %}send this to <a href="mailto:{{ email }}">a release manager</a> to get commit privileges - not required for website{% endtrans %})</i>
-    <li>mtn ci -k yourname@mail.i2p <i>({% trans %}check in with this key{% endtrans %})</i>
-    <li>mtn sync -k yourname-transport@mail.i2p <i>({% trans %}push with this key{% endtrans %})</i>
-  </ul>
-{% trans monotone=site_url('get-involved/guides/monotone') -%}
-Long version: see the <a href="{{ monotone }}">monotone page</a>.
-{%- endtrans %}
-</p>
-
 <h2 id="get-to-know-us">{% trans %}Get to know us!{% endtrans %}</h2>
 <p>{% trans guidelines=site_url('get-involved/guides/dev-guidelines') -%}
 The developers hang around on IRC. They can be reached on the Freenode network, OFTC, and on the I2P internal networks. The usual place to look is #i2p-dev. Join the channel and say hi!