diff --git a/i2p2www/pages/site/get-involved/guides/new-developers.html b/i2p2www/pages/site/get-involved/guides/new-developers.html index fdb8bc3b5b0709b09de0c6cfe65bb988e0a01a60..1324929306b95e074cad38fecb0b1d213e8f96c8 100644 --- a/i2p2www/pages/site/get-involved/guides/new-developers.html +++ b/i2p2www/pages/site/get-involved/guides/new-developers.html @@ -3,7 +3,11 @@ {% block content_nav %} <ol> <li><a href="#basic-study">{% trans %}Basic study{% endtrans %}</a></li> - <li><a href="#getting-the-i2p-code">{% trans %}Getting the I2P code{% endtrans %}</a></li> + <li><a href="#getting-the-i2p-code">{% trans %}Getting the I2P code{% endtrans %}</a> + <ul> + <li><a href="#git">{% trans %}The easy way: Git{% endtrans %}</a></li> + <li><a href="#monotone">{% trans %}The proper 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> <li><a href="#making-the-results-available">{% trans %}Making the results available{% endtrans %}</a></li> @@ -41,9 +45,31 @@ These will give you a good overview of how I2P is structured and what different <h2 id="getting-the-i2p-code">{% trans %}Getting the I2P code{% endtrans %}</h2> <p>{% trans -%} -For development on the i2p router or the embedded applications, -get the monotone source repository installed - short instructions: +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> +<ul> + <li>{% trans git_url='https://git-scm.com/' -%} +Install <a href="{{ git_url }}">Git</a>. + {%- endtrans %}</li> + <li>{% trans i2p_git='https://github.com/i2p/i2p.i2p' -%} +Get the code from <a href="{{ i2p_git }}">the GitHub mirror</a>: + {%- endtrans %}<br> + <code>git clone https://github.com/i2p/i2p.i2p.git</code> + </li> +</ul> + +<h4>{% trans %}Remarks{% endtrans %}</h4> +<p>{% trans trac='http://'+i2pconv('trac.i2p2.i2p') -%} +The Git repository is currently a read-only mirror. If you wish to use it for +development, you will need to submit patches to <a href="{{ trac }}">our issue +tracker</a>. We can accept GitHub pull requests, but they must be processed +manually by turning them into patches anyway. +{%- endtrans %}</p> + +<h3 id="monotone">{% trans %}The proper way: Monotone{% endtrans %}</h3> <ul> <li>{% trans -%} Install <a href="http://www.monotone.ca/">monotone</a>. @@ -93,7 +119,7 @@ Copy and paste the <a href="{{ devkeys }}">developer's commit keys</a> into a ne </li> </ul> -<h3>{% trans %}Remarks{% endtrans %}</h3> +<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>