From ceed5eb5bc4d69c6785805940620acd44d378c3e Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Tue, 11 Dec 2012 03:09:07 +0000
Subject: [PATCH] Migrated over discussion documents

---
 .../pages/site/docs/discussions/naming.html            |  2 +-
 .../pages/site/docs/discussions/netdb.html             | 10 +++++-----
 .../pages/site/docs/discussions/tunnel.html            |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename www.i2p2/pages/naming_discussion.html => i2p2www/pages/site/docs/discussions/naming.html (99%)
 rename www.i2p2/pages/netdb_discussion.html => i2p2www/pages/site/docs/discussions/netdb.html (97%)
 rename www.i2p2/pages/tunnel_discussion.html => i2p2www/pages/site/docs/discussions/tunnel.html (99%)

diff --git a/www.i2p2/pages/naming_discussion.html b/i2p2www/pages/site/docs/discussions/naming.html
similarity index 99%
rename from www.i2p2/pages/naming_discussion.html
rename to i2p2www/pages/site/docs/discussions/naming.html
index 55d45258..1c30a8d0 100644
--- a/www.i2p2/pages/naming_discussion.html
+++ b/i2p2www/pages/site/docs/discussions/naming.html
@@ -1,4 +1,4 @@
-{% extends "_layout.html" %}
+{% extends "global/layout.html" %}
 {% block title %}Naming discussion{% endblock %}
 {% block content %}
 <p>
diff --git a/www.i2p2/pages/netdb_discussion.html b/i2p2www/pages/site/docs/discussions/netdb.html
similarity index 97%
rename from www.i2p2/pages/netdb_discussion.html
rename to i2p2www/pages/site/docs/discussions/netdb.html
index 8e0a1a7f..6dd537ea 100644
--- a/www.i2p2/pages/netdb_discussion.html
+++ b/i2p2www/pages/site/docs/discussions/netdb.html
@@ -1,9 +1,9 @@
-{% extends "_layout.html" %}
+{% extends "global/layout.html" %}
 {% block title %}Network Database Discussion{% endblock %}
 {% block content %}
 <p>
 NOTE: The following is a discussion of the history of netdb implementation and is not current information.
-See <a href="how_networkdatabase.html">the main netdb page</a> for current documentation</a>.
+See <a href="{{ site_url('docs/how/networkdatabase') }}">the main netdb page</a> for current documentation</a>.
 
 <h2><a name="status">History</a></h2>
 
@@ -241,7 +241,7 @@ This just accounts for the stores - what about the queries?
 
 <h3>The Return of the Kademlia Algorithm?</h3>
 <p>
-(this is adapted from <a href="meeting195.html">the I2P meeting Jan. 2, 2007</a>)
+(this is adapted from <a href="{{ url_for('meetings_show', id=195') }}">the I2P meeting Jan. 2, 2007</a>)
 <br />
 The Kademlia netDb just wasn't working properly.
 Is it dead forever or will it be coming back?
@@ -282,7 +282,7 @@ Not necessarily DHT-based.
 <h3 id="todo">Floodfill TODO List</h3>
 <p>
 NOTE: The following is not current information.
-See <a href="how_networkdatabase.html">the main netdb page</a> for the current status and a list of future work</a>.
+See <a href="{{ site_url('docs/how/networkdatabase') }}">the main netdb page</a> for the current status and a list of future work</a>.
 <p>
 The network was down to only one floodfill for a couple of hours on March 13, 2008
 (approx. 18:00 - 20:00 UTC),
@@ -365,7 +365,7 @@ we are now at the minimum number of stats required to monitor the network.
 <li>
 [In Release 0.6.3]
 Manual list of floodfill peers to exclude?
-(<a href="how_threatmodel.html#blocklist">blocklists</a> by router ident)
+(<a href="{{ site_url('docs/how/threatmodel') }}#blocklist">blocklists</a> by router ident)
 <li>
 [In Release 0.6.3]
 Better floodfill peer selection for stores:
diff --git a/www.i2p2/pages/tunnel_discussion.html b/i2p2www/pages/site/docs/discussions/tunnel.html
similarity index 99%
rename from www.i2p2/pages/tunnel_discussion.html
rename to i2p2www/pages/site/docs/discussions/tunnel.html
index 2b1e9dfd..ebc16156 100644
--- a/www.i2p2/pages/tunnel_discussion.html
+++ b/i2p2www/pages/site/docs/discussions/tunnel.html
@@ -1,4 +1,4 @@
-{% extends "_layout.html" %}
+{% extends "global/layout.html" %}
 {% block title %}Tunnel Discussion{% endblock %}
 {% block content %}