propagate from branch 'i2p.www' (head c8354c923fc97e3ad8c94ea4ba561087d8f68ea8)

to branch 'i2p.www.revamp' (head 93d34f791a25a0ef2f2821afd47c2f359fd41f57)

i2p2www/pages/downloads/list.html

@@ -4,13 +4,13 @@
 <h1>{{ _('Download I2P') }}</h1>
 
 <h3>{{ _('Dependency') }}</h3>
-<p>{% trans java='https://www.java.com/en/download/index.jsp',
+<p>{% trans java='http://java.com/download/',
 openjdk='http://openjdk.java.net/install/',
 icedtea='http://icedtea.classpath.org/wiki/Main_Page' %}
 Java Runtime 1.5 or higher.
-(<a href="{{ java }}">Oracle/Sun Java Version 6</a>,
-<a href="{{ openjdk }}">OpenJDK 6</a>, or
-<a href="{{ icedtea }}">IcedTea6</a>
+(<a href="{{ java }}">Oracle Java Version 6/7</a>,
+<a href="{{ openjdk }}">OpenJDK 6/7</a>, or
+<a href="{{ icedtea }}">IcedTea6/7</a>
  recommended)
 <br />
 <a href="http://java.com/en/download/installed.jsp?detect=jre&amp;try=1">Determine your installed Java version here</a>
@@ -140,8 +140,12 @@ or type <tt>java -version</tt> at your command prompt.
     </div>
   </div>
   <div class="details">
-    {% trans monotoneurl=site_url('get-involved/guides/new-developers'), i2pversion=ver() -%}
-    Alternately, you can fetch the source from <a href="{{ monotoneurl }}#getting-the-i2p-code">monotone</a>.
+    {% trans monotoneurl=site_url('get-involved/guides/new-developers'),
+             gitrepo='http://git.repo.i2p/w/i2p.i2p.git',
+             github='https://github.com/i2p/i2p.i2p',
+             i2pversion=ver() -%}
+    Alternately, you can fetch the source from <a href="{{ monotoneurl }}#getting-the-i2p-code">monotone</a>
+    or via Git from <a href="{{ gitrepo }}">git.repo.i2p</a> or <a href="{{ github }}">Github</a>.
     <br />
     Run <code>(tar xjvf i2psource_{{ i2pversion }}.tar.bz2 ; cd i2p-{{ i2pversion }} ; ant pkg)</code> then either
     run the GUI installer or headless install as above.