More URL fixes

2013-02-06 03:34:20 +00:00
parent 5422df80ea
commit 88c773cc4a
3 changed files with 53 additions and 51 deletions
--- a/i2p2www/pages/downloads/debian.html
+++ b/i2p2www/pages/downloads/debian.html
@@ -188,7 +188,7 @@ i2p</code>" as root or using sudo. This is the recommended means of operation.
 When installing for the first time, please remember to <b>adjust your NAT/firewall</b>
 if you can. The ports to forward can be found on the <a href="http://127.0.0.1:7657/confignet">
 network configuration page</a> in the router console. If guidance with respect to forwarding ports is needed,
-you may find <a href="http://www.portforward.com">portforward.com</a> to be helpful.
+you may find <a href="http://portforward.com">portforward.com</a> to be helpful.
 {%- endtrans %}</p>

 <p>{% trans -%}
--- a/i2p2www/pages/downloads/list.html
+++ b/i2p2www/pages/downloads/list.html
@@ -4,11 +4,13 @@
 <h1>{{ _('Download I2P') }}</h1>

 <h3>{{ _('Dependency') }}</h3>
-<p>{% trans %}
+<p>{% trans java='https://www.java.com/en/download/index.jsp',
+openjdk='http://openjdk.java.net/install/',
+icedtea='http://icedtea.classpath.org/wiki/Main_Page' %}
 Java Runtime 1.5 or higher.
-(<a href="http://java.com/download/">Oracle/Sun Java Version 6</a>,
-<a href="http://openjdk.java.net/install/">OpenJDK 6</a>, or
-<a href="http://icedtea.classpath.org/wiki/Main_Page">IcedTea6</a>
+(<a href="{{ java }}">Oracle/Sun Java Version 6</a>,
+<a href="{{ openjdk }}">OpenJDK 6</a>, or
+<a href="{{ icedtea }}">IcedTea6</a>
 recommended)
 <br />
 <a href="http://java.com/en/download/installed.jsp?detect=jre&amp;try=1">Determine your installed Java version here</a>
--- a/i2p2www/pages/site/docs/spec/i2cp.html
+++ b/i2p2www/pages/site/docs/spec/i2cp.html
@@ -15,7 +15,7 @@ such as SAM or BOB.
 The protocol is only serialized if the client and router are not in the same JVM;
 otherwise, I2CP message objects are passed via an internal JVM interface.
 </p><p>
-More information is on the <a href="i2cp.html">I2CP Overview page</a>.
+More information is on the <a href="{{ site_url('docs/protocol/i2cp') }}">I2CP Overview page</a>.
 </p>


@@ -159,9 +159,9 @@ as they generally disconnect the session upon reception of an unsupported messag
 </p>
 <h4>Contents</h4>
 <ol><li>
-  4 byte <a href="{{ site_url('docs/spec/common_structures') }}#type_Integer">Integer</a> specifying the length of the message body
+  4 byte <a href="{{ site_url('docs/spec/common-structures') }}#type_Integer">Integer</a> specifying the length of the message body
 </li><li>
-  1 byte <a href="{{ site_url('docs/spec/common_structures') }}#type_Integer">Integer</a> specifying the message type.
+  1 byte <a href="{{ site_url('docs/spec/common-structures') }}#type_Integer">Integer</a> specifying the message type.
 </li><li>
 The I2CP message body, 0 or more bytes
 </li></ol>
@@ -182,7 +182,7 @@ point in time.
 </p>
 <h4>Contents</h4>
 <ol><li>
-4 byte <a href="{{ site_url('docs/spec/common_structures') }}#type_Integer">Integer</a>
+4 byte <a href="{{ site_url('docs/spec/common-structures') }}#type_Integer">Integer</a>
 </li></ol>

 <h4>Notes</h4>
@@ -201,7 +201,7 @@ Destination to another.
 </p>
 <h4>Contents</h4>
 <ol><li>
-4 byte <a href="{{ site_url('docs/spec/common_structures') }}#type_Integer">Integer</a>  length
+4 byte <a href="{{ site_url('docs/spec/common-structures') }}#type_Integer">Integer</a>  length
 </li><li>
 That many bytes
 </li></ol>
@@ -209,7 +209,7 @@ That many bytes
 <h4>Notes</h4>
 <p>
 The payload is in a gzip format as specified on the
-<a href="i2cp.html#format">I2CP Overview page</a>.
+<a href="{{ site_url('docs/protocol/i2cp') }}#format">I2CP Overview page</a>.
 </p>


@@ -222,20 +222,20 @@ Defines the configuration options for a particular client session.
 </p>
 <h4>Contents</h4>
 <ol><li>
-<a href="{{ site_url('docs/spec/common_structures') }}#struct_Destination">Destination</a>
+<a href="{{ site_url('docs/spec/common-structures') }}#struct_Destination">Destination</a>
 </li><li>
-<a href="{{ site_url('docs/spec/common_structures') }}#type_Mapping">Mapping</a> of options
+<a href="{{ site_url('docs/spec/common-structures') }}#type_Mapping">Mapping</a> of options
 </li><li>
-Creation <a href="{{ site_url('docs/spec/common_structures') }}#type_Date">Date</a>
+Creation <a href="{{ site_url('docs/spec/common-structures') }}#type_Date">Date</a>
 </li><li>
-DSA <a href="{{ site_url('docs/spec/common_structures') }}#type_Signature">Signature</a> of the previous 3 fields, signed by the
-<a href="{{ site_url('docs/spec/common_structures') }}#type_SigningPrivateKey">Signing Private Key</a>
+DSA <a href="{{ site_url('docs/spec/common-structures') }}#type_Signature">Signature</a> of the previous 3 fields, signed by the
+<a href="{{ site_url('docs/spec/common-structures') }}#type_SigningPrivateKey">Signing Private Key</a>
 </li></ol>

 <h4>Notes</h4>
 <p>
 The options are specified on the
-<a href="i2cp.html#options">I2CP Overview page</a>.
+<a href="{{ site_url('docs/protocol/i2cp') }}#options">I2CP Overview page</a>.
 </p>


@@ -250,7 +250,7 @@ time.
 </p>
 <h4>Contents</h4>
 <ol><li>
-2 byte <a href="{{ site_url('docs/spec/common_structures') }}#type_Integer">Integer</a>
+2 byte <a href="{{ site_url('docs/spec/common-structures') }}#type_Integer">Integer</a>
 </li></ol>

 <h4>Notes</h4>
@@ -399,28 +399,28 @@ Sent from Router to Client in response to a Get Bandwidth Limits Message.
 </p>
 <h4>Contents</h4>
 <ol><li>
-4 byte <a href="{{ site_url('docs/spec/common_structures') }}#type_Integer">Integer</a>
+4 byte <a href="{{ site_url('docs/spec/common-structures') }}#type_Integer">Integer</a>
 Client inbound limit (KBps)
 </li><li>
-4 byte <a href="{{ site_url('docs/spec/common_structures') }}#type_Integer">Integer</a>
+4 byte <a href="{{ site_url('docs/spec/common-structures') }}#type_Integer">Integer</a>
 Client outbound limit (KBps)
 </li><li>
-4 byte <a href="{{ site_url('docs/spec/common_structures') }}#type_Integer">Integer</a>
+4 byte <a href="{{ site_url('docs/spec/common-structures') }}#type_Integer">Integer</a>
 Router inbound limit (KBps)
 </li><li>
-4 byte <a href="{{ site_url('docs/spec/common_structures') }}#type_Integer">Integer</a>
+4 byte <a href="{{ site_url('docs/spec/common-structures') }}#type_Integer">Integer</a>
 Router inbound burst limit (KBps)
 </li><li>
-4 byte <a href="{{ site_url('docs/spec/common_structures') }}#type_Integer">Integer</a>
+4 byte <a href="{{ site_url('docs/spec/common-structures') }}#type_Integer">Integer</a>
 Router outbound limit (KBps)
 </li><li>
-4 byte <a href="{{ site_url('docs/spec/common_structures') }}#type_Integer">Integer</a>
+4 byte <a href="{{ site_url('docs/spec/common-structures') }}#type_Integer">Integer</a>
 Router outbound burst limit (KBps)
 </li><li>
-4 byte <a href="{{ site_url('docs/spec/common_structures') }}#type_Integer">Integer</a>
+4 byte <a href="{{ site_url('docs/spec/common-structures') }}#type_Integer">Integer</a>
 Router burst time (seconds)
 </li><li>
-Nine 4-byte <a href="{{ site_url('docs/spec/common_structures') }}#type_Integer">Integers</a>
+Nine 4-byte <a href="{{ site_url('docs/spec/common-structures') }}#type_Integer">Integers</a>
 undefined
 </li></ol>

@@ -444,11 +444,11 @@ Sent from Client to Router.
 <ol><li>
 <a href="#struct_SessionId">Session ID</a>
 </li><li>
-<a href="{{ site_url('docs/spec/common_structures') }}#type_SigningPrivateKey">Signing Private Key</a>
+<a href="{{ site_url('docs/spec/common-structures') }}#type_SigningPrivateKey">Signing Private Key</a>
 </li><li>
-<a href="{{ site_url('docs/spec/common_structures') }}#type_PrivateKey">Private Key</a>
+<a href="{{ site_url('docs/spec/common-structures') }}#type_PrivateKey">Private Key</a>
 </li><li>
-<a href="{{ site_url('docs/spec/common_structures') }}#struct_LeaseSet">LeaseSet</a>
+<a href="{{ site_url('docs/spec/common-structures') }}#struct_LeaseSet">LeaseSet</a>
 </li></ol>

 <h4>Notes</h4>
@@ -500,7 +500,7 @@ The router responds with a <a href="#msg_DestReply">Dest Reply Message</a>.
 </p>
 <h4>Contents</h4>
 <ol><li>
-<a href="{{ site_url('docs/spec/common_structures') }}#struct_Hash">SHA-256 Hash</a>
+<a href="{{ site_url('docs/spec/common-structures') }}#struct_Hash">SHA-256 Hash</a>
 </li></ol>

 <h4>Notes</h4>
@@ -519,9 +519,9 @@ Sent from Router to Client in response to a Dest Lookup Message.
 </p>
 <h4>Contents</h4>
 <ol><li>
-<a href="{{ site_url('docs/spec/common_structures') }}#struct_Destination">Destination</a>
+<a href="{{ site_url('docs/spec/common-structures') }}#struct_Destination">Destination</a>
 on success, or
-<a href="{{ site_url('docs/spec/common_structures') }}#struct_Hash">Hash</a>
+<a href="{{ site_url('docs/spec/common-structures') }}#struct_Hash">Hash</a>
 on failure
 </li></ol>

@@ -564,7 +564,7 @@ Sent either from router to client or from client to router.
 </p>
 <h4>Contents</h4>
 <ol><li>
-Reason <a href="{{ site_url('docs/spec/common_structures') }}#struct_String">String</a>
+Reason <a href="{{ site_url('docs/spec/common-structures') }}#struct_String">String</a>
 </li></ol>

 <h4>Notes</h4>
@@ -602,7 +602,7 @@ The router responds with a <a href="#msg_SetDate">Set Date Message</a>.
 </p>
 <h4>Contents</h4>
 <ol><li>
-I2CP Version <a href="{{ site_url('docs/spec/common_structures') }}#struct_String">String</a>
+I2CP Version <a href="{{ site_url('docs/spec/common-structures') }}#struct_String">String</a>
 </li></ol>

 <h4>Notes</h4>
@@ -654,11 +654,11 @@ For an outgoing message, this is a response to a
 </li><li>
 <a href="#struct_MessageId">Message ID</a>
 </li><li>
-1 byte <a href="{{ site_url('docs/spec/common_structures') }}#type_Integer">Integer</a> status
+1 byte <a href="{{ site_url('docs/spec/common-structures') }}#type_Integer">Integer</a> status
 </li><li>
-4 byte <a href="{{ site_url('docs/spec/common_structures') }}#type_Integer">Integer</a> size
+4 byte <a href="{{ site_url('docs/spec/common-structures') }}#type_Integer">Integer</a> size
 </li><li>
-4 byte <a href="{{ site_url('docs/spec/common_structures') }}#type_Integer">Integer</a> nonce
+4 byte <a href="{{ site_url('docs/spec/common-structures') }}#type_Integer">Integer</a> nonce
 </li></ol>

 <h4>Notes</h4>
@@ -768,10 +768,10 @@ Sent either from router to client or from client to router.
 <ol><li>
 <a href="#struct_SessionId">Session ID</a>
 </li><li>
-1 byte <a href="{{ site_url('docs/spec/common_structures') }}#type_Integer">Integer</a> abuse severity
+1 byte <a href="{{ site_url('docs/spec/common-structures') }}#type_Integer">Integer</a> abuse severity
 (0 is minimally abusive, 255 being extremely abusive)
 </li><li>
-Reason <a href="{{ site_url('docs/spec/common_structures') }}#struct_String">String</a>
+Reason <a href="{{ site_url('docs/spec/common-structures') }}#struct_String">String</a>
 </li><li>
 <a href="#struct_MessageId">Message ID</a>
 </li></ol>
@@ -797,16 +797,16 @@ The client responds with a <a href="#msg_SessionStatus">Create LeaseSet Message<
 <ol><li>
 <a href="#struct_SessionId">Session ID</a>
 </li><li>
-1 byte <a href="{{ site_url('docs/spec/common_structures') }}#type_Integer">Integer</a> number of tunnels
+1 byte <a href="{{ site_url('docs/spec/common-structures') }}#type_Integer">Integer</a> number of tunnels
 </li><li>
  That many pairs of:
  <ol><li>
-       <a href="{{ site_url('docs/spec/common_structures') }}#struct_RouterIdentity">Router Identity</a>
+       <a href="{{ site_url('docs/spec/common-structures') }}#struct_RouterIdentity">Router Identity</a>
  </li><li>
-       <a href="{{ site_url('docs/spec/common_structures') }}#type_TunnelId">Tunnel ID</a>
+       <a href="{{ site_url('docs/spec/common-structures') }}#type_TunnelId">Tunnel ID</a>
  </li></ol>
 </li><li>
-End <a href="{{ site_url('docs/spec/common_structures') }}#type_Date">Date</a>
+End <a href="{{ site_url('docs/spec/common-structures') }}#type_Date">Date</a>
 </li></ol>

 <h4>Notes</h4>
@@ -829,11 +829,11 @@ The router responds with a <a href="#msg_MessageStatus">Message Status Message</
 <ol><li>
 <a href="#struct_SessionId">Session ID</a>
 </li><li>
-<a href="{{ site_url('docs/spec/common_structures') }}#struct_Destination">Destination</a>
+<a href="{{ site_url('docs/spec/common-structures') }}#struct_Destination">Destination</a>
 </li><li>
 <a href="#struct_Payload">Payload</a>
 </li><li>
-4 byte <a href="{{ site_url('docs/spec/common_structures') }}#type_Integer">Integer</a> nonce
+4 byte <a href="{{ site_url('docs/spec/common-structures') }}#type_Integer">Integer</a> nonce
 </li></ol>

 <h4>Notes</h4>
@@ -866,15 +866,15 @@ Sent from Client to Router. Same as Send Message Message, except includes an exp
 <ol><li>
 <a href="#struct_SessionId">Session ID</a>
 </li><li>
-<a href="{{ site_url('docs/spec/common_structures') }}#struct_Destination">Destination</a>
+<a href="{{ site_url('docs/spec/common-structures') }}#struct_Destination">Destination</a>
 </li><li>
 <a href="#struct_Payload">Payload</a>
 </li><li>
-4 byte <a href="{{ site_url('docs/spec/common_structures') }}#type_Integer">Integer</a> nonce
+4 byte <a href="{{ site_url('docs/spec/common-structures') }}#type_Integer">Integer</a> nonce
 </li><li>
 2 bytes of flags (options)
 </li><li>
-Expiration <a href="{{ site_url('docs/spec/common_structures') }}#type_Date">Date</a>
+Expiration <a href="{{ site_url('docs/spec/common-structures') }}#type_Date">Date</a>
 truncated from 8 bytes to 6 bytes
 </li></ol>

@@ -969,7 +969,7 @@ Sent from Router to Client.
 <ol><li>
 <a href="#struct_SessionId">Session ID</a>
 </li><li>
-1 byte <a href="{{ site_url('docs/spec/common_structures') }}#type_Integer">Integer</a> status
+1 byte <a href="{{ site_url('docs/spec/common-structures') }}#type_Integer">Integer</a> status
 </li></ol>

 <h4>Notes</h4>
@@ -989,9 +989,9 @@ Sent from Router to Client as a part of the initial handshake.
 </p>
 <h4>Contents</h4>
 <ol><li>
-<a href="{{ site_url('docs/spec/common_structures') }}#type_Date">Date</a>
+<a href="{{ site_url('docs/spec/common-structures') }}#type_Date">Date</a>
 </li><li>
-I2CP Version <a href="{{ site_url('docs/spec/common_structures') }}#struct_String">String</a>
+I2CP Version <a href="{{ site_url('docs/spec/common-structures') }}#struct_String">String</a>
 </li></ol>

 <h4>Notes</h4>