Moved SAM and BOB pages to docs/api

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

@@ -1,4 +1,4 @@
-{% extends "_layout.html" %}
+{% extends "global/layout.html" %}
 {% block title %}BOB{% endblock %}
 {% block content %}
 <pre>
@@ -251,5 +251,5 @@ have to bother shutting it down and restarting it. You could redirect
 and point to a different machine on your LAN while you do updates, or
 point to a set of backup machines depending on what is running, etc,
 etc. Only your imagination limits what you could do with BOB.
-
+</pre>
 {% endblock %}

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

@@ -1,16 +1,17 @@
-{% extends "_layout.html" %}
+{% extends "global/layout.html" %}
 {% block title %}SAM V1 Specification{% endblock %}
 {% block content %}
 Updated August 2010 for release 0.8
 <p>Specified below is version 1 of a simple client protocol for interacting with
 I2P.
 Newer alternatives:
-<a href="samv2.html">SAM V2</a>,
+<a href="{{ site_url('docs/api/samv2') }}">SAM V2</a>,
-<a href="samv3.html">SAM V3</a>,
+<a href="{{ site_url('docs/api/samv3') }}">SAM V3</a>,
-<a href="bob.html">BOB</a>.
+<a href="{{ site_url('docs/api/bob') }}">BOB</a>.
 </p>
 
-<pre>----------------------------------------------------------------------
+<pre>
+----------------------------------------------------------------------
 Simple Anonymous Messaging (SAM version 1.0) Specification
 ----------------------------------------------------------------------
 Client application talks to SAM bridge, which deals with

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

@@ -1,4 +1,4 @@
-{% extends "_layout.html" %}
+{% extends "global/layout.html" %}
 {% block title %}SAM V2 Specification{% endblock %}
 {% block content %}
 Updated August 2010 for release 0.8
@@ -8,9 +8,9 @@ Updated August 2010 for release 0.8
 SAM V2 was introduced in I2P release 0.6.1.31.
 Significant differences from SAM V1 are marked with "***".
 Alternatives:
-<a href="sam.html">SAM V1</a>,
+<a href="{{ site_url('docs/api/sam') }}">SAM V1</a>,
-<a href="samv3.html">SAM V3</a>,
+<a href="{{ site_url('docs/api/samv3') }}">SAM V3</a>,
-<a href="bob.html">BOB</a>.
+<a href="{{ site_url('docs/api/bob') }}">BOB</a>.
 </p>
 
 <p />
@@ -20,7 +20,7 @@ on the same I2P destination <i>in parallel</i>, i.e. the client does not
 have to wait for data being successfully sent on one socket before sending
 data on another socket. All data transits through the same
 client&lt;--&gt;SAM socket.
-For multiple sockets, see <a href="samv3.html">SAM V3</a>.
+For multiple sockets, see <a href="{{ site_url('docs/api/samv3') }}">SAM V3</a>.
 </p>
 
 <pre>

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

@@ -1,4 +1,4 @@
-{% extends "_layout.html" %}
+{% extends "global/layout.html" %}
 {% block title %}SAM V3{% endblock %}
 {% block content %}
 Updated August 2010 for release 0.8
@@ -7,9 +7,9 @@ Updated August 2010 for release 0.8
 <p>SAM version 3
 was introduced in I2P release 0.7.3.
 Alternatives:
-<a href="sam.html">SAM V1</a>,
+<a href="{{ site_url('docs/api/sam') }}">SAM V1</a>,
-<a href="samv2.html">SAM V2</a>,
+<a href="{{ site_url('docs/api/samv2') }}">SAM V2</a>,
-<a href="bob.html">BOB</a>.
+<a href="{{ site_url('docs/api/bob') }}">BOB</a>.
 </p>
 
 <p />
@@ -22,7 +22,7 @@ client&lt;--&gt;SAM socket, which was quite complicated to manage for the client
 <p />
 SAM v3 manages sockets in a different way: each <i>I2P socket</i>
 matches a unique client&lt;--&gt;SAM socket, which is much more simple to handle.
-This is similar to <a href="bob.html">BOB</a>.
+This is similar to <a href="{{ site_url('docs/api/bob') }}">BOB</a>.
 <br />
 SAM v3 also offers a UDP port for sending datagrams through I2P, and
 can forward back I2P datagrams to the client's datagram server.

i2p2www/pages/site/docs/index.html

@@ -63,13 +63,13 @@ Streamr Proxy
 </li><li>
 HTTP Bidir Proxy
 </li><li>
-<a href="sam.html">SAM Protocol</a>
+<a href="{{ site_url('docs/api/sam') }}">SAM Protocol</a>
 </li><li>
-<a href="samv2.html">SAMv2 Protocol</a>
+<a href="{{ site_url('docs/api/samv2') }}">SAMv2 Protocol</a>
 </li><li>
-<a href="samv3.html">SAMv3 Protocol</a>
+<a href="{{ site_url('docs/api/samv3') }}">SAMv3 Protocol</a>
 </li><li>
-<a href="bob.html">BOB Protocol</a>
+<a href="{{ site_url('docs/api/bob') }}">BOB Protocol</a>
 </li></ul>
 
 <h3>End-to-End Transport API and Protocols</h3>

i2p2www/pages/site/docs/protocols.html

@@ -70,8 +70,8 @@ However, each of these layers adds additional functionality, to allow applicatio
         <br />
         <a href="{{ site_url('docs/api/i2ptunnel') }}">I2PTunnel</a>
         <br />
-        <a href="sam.html">SAM</a>/<a href="samv2.html">SAMv2</a>/<a href="samv3.html">SAMv3</a>(*),
+        <a href="{{ site_url('docs/api/sam') }}">SAM</a>/<a href="{{ site_url('docs/api/samv2') }}">SAMv2</a>/<a href="{{ site_url('docs/api/samv3') }}">SAMv3</a>(*),
-        <a href="bob.html">BOB</a>        
+        <a href="{{ site_url('docs/api/bob') }}">BOB</a>        
     </li>
     <li>
         <b>I2P Application Proxy Layer:</b> proxy systems.