propagate from branch 'i2p.www' (head 95988c2dfd38322c36c8fbe4fe1cfd81dab318fd)

to branch 'i2p.www.revamp' (head 782f49f8ae745afac983d595254cf14e9993c7ad)

i2p2www/pages/downloads/list.html

@@ -32,23 +32,30 @@ c76bea15a6b7d98227466cc8025b1eb9069997e40e9d71ff49e55b2c8ac0b995
 <div class="package">
   <h1>Mac OS X</h1>
   <div class="file">
-    <a href="{{ url_for('downloads_select', file=ver('i2pinstall_%s.jar')) }}">i2pinstall_{{ ver() }}.jar</a>
+    <a href="{{ url_for('downloads_select', file='i2pinstall_0.9.3.jar') }}">i2pinstall_0.9.3.jar</a>
     <div class="sig">
       (SHA256
-8e670ba26c04176ace9246d91a09951975e2965b89628f620f5a3dff917298e4
-      <a href="{{ url_for('downloads_select', file=ver('i2pinstall_%s.jar.sig')) }}">sig</a>)
+4ebea74b30064c9853c40cf24764d283dc6fff47ed2449b247f3c9991cccb494
+      <a href="{{ url_for('downloads_select', file='i2pinstall_0.9.3.jar.sig') }}">sig</a>)
     </div>
   </div>
   <div class="details">
     Download that file and double-click it (if that works) or
-    type <code>java -jar i2pinstall_{{ ver() }}.jar</code> in a terminal to run the
+    type <code>java -jar i2pinstall_0.9.3.jar</code> in a terminal to run the
     installer.
-    On some platforms you may be able to right-click and select
+    You may be able to right-click and select
     &quot;Open with Java&quot;.
+    <div class="warning">
+      Due to <a href="http://{{ i2pconv('trac.i2p2.i2p') }}/ticket/826">a wrapper bug</a>, the 0.9.4 installer
+      will <b>NOT</b> work on OS X. Use the 0.9.3 installer. After I2P starts, it will
+      automatically update to 0.9.4.
+      See <a href="http://{{ i2pconv('trac.i2p2.i2p') }}/ticket/826">the ticket</a> for additional information,
+      links, and workarounds.
+    </div>
 
     <h2>Command line (headless) install:</h2>
-    Download the graphical installer file above and
-    run <code>java -jar i2pinstall_{{ ver() }}.jar -console</code> from the command line.
+    Download the 0.9.3 graphical installer file above and
+    run <code>java -jar i2pinstall_0.9.3.jar -console</code> from the command line.
   </div>
 </div>
 

i2p2www/pages/site/docs/api/samv3.html

@@ -182,18 +182,18 @@ A client asks for a connection by :
 -> STREAM CONNECT
          ID={$nickname}
          DESTINATION=$peer_public_base64_key
-         [SILENCE={true,false}]
+         [SILENT={true,false}]
 
 This establishes a new virtual connection from the local session
 whose ID is {$nickname} to the specified peer.
 
-If SILENCE=true is passed, the SAM bridge won't issue any other message
+If SILENT=true is passed, the SAM bridge won't issue any other message
 on the socket : if the connection fails, the socket will be closed.
 If the connection succeeds, all remaining data passing through the
 current socket is forwarded from and to the connected I2P destination
 peer.
 
-If SILENCE=false, which is the default value, the SAM bridge sends a
+If SILENT=false, which is the default value, the SAM bridge sends a
 last message to its client before forwarding or shutting down the
 socket :
 
@@ -228,7 +228,7 @@ A client waits for an incoming connection request by :
 
 -> STREAM ACCEPT
          ID={$nickname}
-         [SILENCE={true,false}]
+         [SILENT={true,false}]
 
 This makes the session ${nickname} listen for one incoming
 connection request from the I2P network.
@@ -250,11 +250,11 @@ bridge. If the result is OK, the SAM bridge starts waiting for an
 incoming connection request from another I2P peer. When a request
 arrives, the SAM bridge accepts it and :
 
- * If SILENCE=true was passed, the SAM bridge won't issue any other message
+ * If SILENT=true was passed, the SAM bridge won't issue any other message
 on the client socket : all remaining data passing through the
 current socket is forwarded from and to the connected I2P destination
 peer.
- * If SILENCE=false was passed, which is the default value, the SAM bridge
+ * If SILENT=false was passed, which is the default value, the SAM bridge
 sends the client a ASCII line containing the base64 public destination key
 of the requesting peer. After this '\n' terminated line, all remaining data 
 passing through the current socket is forwarded from and to the connected
@@ -274,7 +274,7 @@ coming from I2P. For that, the client has to :
          ID={$nickname}
          PORT={$port}
          [HOST={$host}]
-         [SILENCE={true,false}]
+         [SILENT={true,false}]
 
 This makes the session ${nickname} listen for incoming
 connection requests from the I2P network.
@@ -302,10 +302,10 @@ When a connection request arrives from I2P, the SAM bridge requests a
 socket connection from {$host}:{$port}. If it is accepted after no more
 than 3 seconds, SAM will accept the connection from I2P, and then :
 
- * If SILENCE=true was passed, all data passing through the obtained
+ * If SILENT=true was passed, all data passing through the obtained
 current socket is forwarded from and to the connected I2P destination
 peer.
- * If SILENCE=false was passed, which is the default value, the SAM bridge
+ * If SILENT=false was passed, which is the default value, the SAM bridge
 sends on the obtained socket an ASCII line containing the base64 public
 destination key of the requesting peer. After this '\n' terminated line,
 all remaining data passing through the socket is forwarded from and to 

i2p2www/pages/site/docs/spec/common_structures.html

@@ -503,7 +503,7 @@ signing_key :: SigningPublicKey
 
 num :: Integer
        length -> 1 byte
-       value: 0 <= num <= 6
+       value: 0 <= num <= 16
 
 leases :: [Lease]
           length -> >= $num*44 bytes

i2p2www/pages/site/docs/spec/i2cp.html

@@ -261,6 +261,8 @@ time.
 
 
 <h2 id="messages">Messages</h2>
+See also the
+<a href="http://docs.i2p-projekt.de/javadoc/net/i2p/data/i2cp/package-summary.html">I2CP Javadocs</a>.
 <h3 id="types">Message Types</h3>
 <table border=1>
 <tr><th>Message<th>Direction<th>Type
@@ -661,12 +663,17 @@ For an outgoing message, this is a response to a
 
 <h4>Notes</h4>
 <p>
-The known status values are 0 for message is available, 1 for accepted, 2 for best
+Through version 0.9.4,
+the known status values are 0 for message is available, 1 for accepted, 2 for best
 effort succeeded, 3 for best effort failed, 4 for guaranteed succeeded, 5 for
 guaranteed failed. The size Integer specifies the size of the available
 message and is only relevant for status = 0.
 Even though guaranteed is unimplemented, (best effort is the only service), the current
 router implementation uses the guaranteed status codes, not the best effort codes.
+As of router version 0.9.5, additional status codes are defined.
+See the
+<a href="http://docs.i2p-projekt.de/javadoc/net/i2p/data/i2cp/MessageStatusMessage.html">MessageStatusMessage Javadocs</a>
+for details.
 </p>
 <p>
 When status = 1 (accepted), the nonce matches the nonce in the