From e6b87fcd56d1a0fb647e471ed1c0cc285cc84d91 Mon Sep 17 00:00:00 2001 From: str4d Date: Fri, 9 Nov 2012 10:40:57 +0000 Subject: [PATCH] Moved SAM and BOB pages to docs/api --- .../pages => i2p2www/pages/site/docs/api}/bob.html | 4 ++-- .../pages => i2p2www/pages/site/docs/api}/sam.html | 11 ++++++----- .../pages => i2p2www/pages/site/docs/api}/samv2.html | 10 +++++----- .../pages => i2p2www/pages/site/docs/api}/samv3.html | 10 +++++----- i2p2www/pages/site/docs/index.html | 8 ++++---- i2p2www/pages/site/docs/protocols.html | 4 ++-- 6 files changed, 24 insertions(+), 23 deletions(-) rename {www.i2p2/pages => i2p2www/pages/site/docs/api}/bob.html (99%) rename {www.i2p2/pages => i2p2www/pages/site/docs/api}/sam.html (97%) rename {www.i2p2/pages => i2p2www/pages/site/docs/api}/samv2.html (98%) rename {www.i2p2/pages => i2p2www/pages/site/docs/api}/samv3.html (98%) diff --git a/www.i2p2/pages/bob.html b/i2p2www/pages/site/docs/api/bob.html similarity index 99% rename from www.i2p2/pages/bob.html rename to i2p2www/pages/site/docs/api/bob.html index 6563aee9..ef058796 100644 --- a/www.i2p2/pages/bob.html +++ b/i2p2www/pages/site/docs/api/bob.html @@ -1,4 +1,4 @@ -{% extends "_layout.html" %} +{% extends "global/layout.html" %} {% block title %}BOB{% endblock %} {% block content %} 
@@ -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.
-
+
{% endblock %} diff --git a/www.i2p2/pages/sam.html b/i2p2www/pages/site/docs/api/sam.html similarity index 97% rename from www.i2p2/pages/sam.html rename to i2p2www/pages/site/docs/api/sam.html index f24d8af8..4419ea4f 100644 --- a/www.i2p2/pages/sam.html +++ b/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

Specified below is version 1 of a simple client protocol for interacting with I2P. Newer alternatives: -SAM V2, -SAM V3, -BOB. +SAM V2, +SAM V3, +BOB.

-
----------------------------------------------------------------------
+
+----------------------------------------------------------------------
 Simple Anonymous Messaging (SAM version 1.0) Specification
 ----------------------------------------------------------------------
 Client application talks to SAM bridge, which deals with
diff --git a/www.i2p2/pages/samv2.html b/i2p2www/pages/site/docs/api/samv2.html
similarity index 98%
rename from www.i2p2/pages/samv2.html
rename to i2p2www/pages/site/docs/api/samv2.html
index 333da68c..925fd307 100644
--- a/www.i2p2/pages/samv2.html
+++ b/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:
-SAM V1,
-SAM V3,
-BOB.
+SAM V1,
+SAM V3,
+BOB.
 

 
 

@@ -20,7 +20,7 @@ on the same I2P destination in parallel, 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<-->SAM socket.
-For multiple sockets, see SAM V3.
+For multiple sockets, see SAM V3.
 

 
 
diff --git a/www.i2p2/pages/samv3.html b/i2p2www/pages/site/docs/api/samv3.html
similarity index 98%
rename from www.i2p2/pages/samv3.html
rename to i2p2www/pages/site/docs/api/samv3.html
index f8477ed9..dd896046 100644
--- a/www.i2p2/pages/samv3.html
+++ b/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
 
SAM version 3
 was introduced in I2P release 0.7.3.
 Alternatives:
-SAM V1,
-SAM V2,
-BOB.
+SAM V1,
+SAM V2,
+BOB.
 

 
 

@@ -22,7 +22,7 @@ client<-->SAM socket, which was quite complicated to manage for the client
 

 SAM v3 manages sockets in a different way: each I2P socket
 matches a unique client<-->SAM socket, which is much more simple to handle.
-This is similar to BOB.
+This is similar to BOB.
 

 SAM v3 also offers a UDP port for sending datagrams through I2P, and
 can forward back I2P datagrams to the client's datagram server.
diff --git a/i2p2www/pages/site/docs/index.html b/i2p2www/pages/site/docs/index.html
index 32ed553f..ec446667 100644
--- a/i2p2www/pages/site/docs/index.html
+++ b/i2p2www/pages/site/docs/index.html
@@ -63,13 +63,13 @@ Streamr Proxy
 
  • 
 HTTP Bidir Proxy
 
  • 
-SAM Protocol
+SAM Protocol
 
  • 
-SAMv2 Protocol
+SAMv2 Protocol
 
  • 
-SAMv3 Protocol
+SAMv3 Protocol
 
  • 
-BOB Protocol
+BOB Protocol
 
    • 
 
 
    End-to-End Transport API and Protocols
    
diff --git a/i2p2www/pages/site/docs/protocols.html b/i2p2www/pages/site/docs/protocols.html
index b32a8831..54618169 100644
--- a/i2p2www/pages/site/docs/protocols.html
+++ b/i2p2www/pages/site/docs/protocols.html
@@ -70,8 +70,8 @@ However, each of these layers adds additional functionality, to allow applicatio
         
    
         I2PTunnel
         
    
-        SAM/SAMv2/SAMv3(*),
-        BOB        
+        SAM/SAMv2/SAMv3(*),
+        BOB        
     
     
  • 
         I2P Application Proxy Layer: proxy systems.