propagate from branch 'i2p.www' (head e168251b9c2e6757fe883e570e2afcc1a23bfdc7)

to branch 'i2p.www.revamp' (head 7c8c7a1ed7d62a3dbda52c6af1df085e7d1c69da)

i2p2www/pages/meetings/index.html

@@ -5,8 +5,7 @@
 {%- endblock %}
 {% block content %}
 <h1>Logs of past I2P meetings</h1>
-<p>Regularly scheduled meetings are not being held at this time.
-If you have something to discuss, please find the developers on IRC in #i2p-dev.
+<p>If you have something to discuss, please find the developers on IRC in #i2p-dev.
 <a href="{{ url_for('blog_index', lang=g.lang) }}">Status updates</a> from developers are also available.
 </p><div class="underline"></div>
 <ul class="infolist">

i2p2www/pages/site/support/glossary.html

@@ -7,5 +7,25 @@ This page lists often-used terminology when discussing I2P and cryptography.
         <td>I2P</td>
         <td>Invisible Internet Project: a project meant to provide an anonymity layer, so user can communicate anonymously using a range of applications.</td>
     </tr>
+    <tr>
+        <td>Router</td>
+        <td>The core I2P software, which routes encrypted packets on the I2P network. All routers by default participate in the network, which both helps the network and provides cover traffic for any clients or servers connecting to the I2P network through the router.</td>
+    </tr>
+    <tr>
+        <td>RouterIdentity</td>
+        <td>A collection of information required to communicate directly with a router, such as its IP address and listening port, public signing and encryption keys etc.</td>
+    </tr>
+    <tr>
+        <td>Tunnel</td>
+        <td>An anonymous communication pathway between a client or server and the I2P network. Tunnels are unidirectional, so any one client or server must have at least two Tunnels - one for inbound traffic and one for outbound traffic.</td>
+    </tr>
+    <tr>
+        <td>Destination</td>
+        <td>The cryptographic identity of a tunnel. These are the identities of clients and servers within the I2P network, and are analogous to the IP:port of a computer on the normal internet.</td>
+    </tr>
+    <tr>
+        <td>LeaseSet</td>
+        <td>A collection of information required to communicate with a client or server at a particular Destination, such as the gateways of the inbound Tunnels for that Destination.</td>
+    </tr>
 </table>
 {% endblock %}

i2p2www/pages/site/volunteer/bounties/index.html

@@ -1,7 +1,7 @@
 {% extends "global/layout.html" %}
 {% block title %}Bounties{% endblock %}
 {% block content %}
-<!-- file version 2012.04.16.01 -->
+<!-- file version 2012.12.11.01 -->
 <h1>Bounties for I2P</h1>      
 <p>While we always gratefully accept any contributions of code, 
 documentation, and the like, there are other ways to help I2P move 
@@ -73,6 +73,13 @@ etc), and the like.</p>
   <td><p>str4d,hottuna</p></td>
   <td><p>3000 &euro;, of which 300 &euro; already paid for done jobs</p></td>
  </tr>
+ <tr>
+  <td><p><b><a href="bounty_syndie2012">Syndie</a></b></p></td>
+  <td><p>Proposal in development</p></td>
+  <td><p>I2P team</p></td>
+  <td><p>[vacant]</p></td>
+  <td><p>100 BTC</p></td>
+ </tr>
  </table>
 
 <h2>Hold bounties, set on hold due to jrandom AWOL and missing funding</h2>