diff --git a/apps/routerconsole/jsp/config.jsp b/apps/routerconsole/jsp/config.jsp
index bf214eef2d4335770b4da0997ad2b79df6e80e19..e500a20ddc60b7391bfc3b4a63b9d21b75555a64 100644
--- a/apps/routerconsole/jsp/config.jsp
+++ b/apps/routerconsole/jsp/config.jsp
@@ -48,7 +48,7 @@
bursting up to
<input name="outboundburstrate" type="text" size="2" value="<jsp:getProperty name="nethelper" property="outboundBurstRate" />" /> KBps for
<jsp:getProperty name="nethelper" property="outboundBurstFactorBox" /><br />
- <i>KBps = kilibytes per second = 1024 bytes per second.<br />
+ <i>KBps = kilobytes per second = 1024 bytes per second.<br />
A negative rate means a default limit of 16KBytes per second.</i><br />
Bandwidth share percentage:
<jsp:getProperty name="nethelper" property="sharePercentageBox" /><br />
diff --git a/apps/syndie/java/src/net/i2p/syndie/User.java b/apps/syndie/java/src/net/i2p/syndie/User.java
index 0fe1a6c5c0b7f5f38253ef80c44111529bee1b0f..badb40c332497719de6bdbdf8a5d5d55eee9d61f 100644
--- a/apps/syndie/java/src/net/i2p/syndie/User.java
+++ b/apps/syndie/java/src/net/i2p/syndie/User.java
@@ -53,7 +53,7 @@ public class User {
_shitlistedBlogs = new ArrayList();
_defaultSelector = null;
_addressbookLocation = "userhosts.txt";
- _showImagesByDefault = false;
+ _showImagesByDefault = true;
_showExpandedByDefault = false;
_allowAccessRemote = false;
_eepProxyHost = null;
@@ -171,7 +171,7 @@ public class User {
}
}
- String show = props.getProperty("showimages", "false");
+ String show = props.getProperty("showimages", "true");
_showImagesByDefault = (show != null) && (show.equals("true"));
show = props.getProperty("showexpanded", "false");
_showExpandedByDefault = (show != null) && (show.equals("true"));
diff --git a/apps/syndie/java/src/net/i2p/syndie/sml/HTMLRenderer.java b/apps/syndie/java/src/net/i2p/syndie/sml/HTMLRenderer.java
index ac31b4492a57f8e658d6dd7cc252f98e7427a76c..ff26a507d6164d42f3d41cd607b4416d1e41771f 100644
--- a/apps/syndie/java/src/net/i2p/syndie/sml/HTMLRenderer.java
+++ b/apps/syndie/java/src/net/i2p/syndie/sml/HTMLRenderer.java
@@ -395,6 +395,11 @@ public class HTMLRenderer extends EventReceiverImpl {
SafeURL surl = new SafeURL(locationSchema + "://" + location);
_bodyBuffer.append("<a ").append(getClass("archiveSummaryLink")).append(" href=\"").append(getArchiveURL(null, surl));
_bodyBuffer.append("\">").append(sanitizeString(surl.toString())).append("</a>");
+ if (_user.getAuthenticated()) {
+ _bodyBuffer.append(" <a ").append(getClass("archiveBookmarkLink")).append(" href=\"");
+ _bodyBuffer.append(getBookmarkURL(sanitizeString(name), surl.getLocation(), surl.getSchema(), "syndiearchive"));
+ _bodyBuffer.append("\">bookmark it</a>");
+ }
}
if (description != null)
_bodyBuffer.append(": ").append(getSpan("archiveSummaryDesc")).append(sanitizeString(description)).append("</span>");
@@ -509,7 +514,7 @@ public class HTMLRenderer extends EventReceiverImpl {
if (links == 1)
_postBodyBuffer.append("1 external link ");
else if (links > 1)
- _postBodyBuffer.append(links).append(" external links");
+ _postBodyBuffer.append(links).append(" external links ");
int addrs = _addresses.size();
if (addrs == 1)
@@ -643,7 +648,7 @@ public class HTMLRenderer extends EventReceiverImpl {
if (null == _user.getPetNameDB().getNameByLocation(a.location)) {
_postBodyBuffer.append(" <a ").append(getClass("summDetailArchiveBookmark")).append(" href=\"");
_postBodyBuffer.append(getBookmarkURL(a.name, a.location, a.locationSchema, "syndiearchive"));
- _postBodyBuffer.append("\">bookmark</a>");
+ _postBodyBuffer.append("\">bookmark it</a>");
}
}
_postBodyBuffer.append("<br />\n");
diff --git a/build.xml b/build.xml
index a4c7e37d195d1b609c9eb73c593e3f54655b9902..2878f87ca3bdecb733e423025e37f4da26f75709 100644
--- a/build.xml
+++ b/build.xml
@@ -272,6 +272,11 @@
<copy file="installer/resources/eepsite_index.html" tofile="pkg-temp/eepsite/docroot/index.html" />
<copy file="installer/resources/favicon.ico" tofile="pkg-temp/eepsite/docroot/favicon.ico" />
<copy file="installer/resources/jetty.xml" tofile="pkg-temp/eepsite/jetty.xml" />
+ <mkdir dir="pkg-temp/syndie" />
+ <mkdir dir="pkg-temp/syndie/archive" />
+ <mkdir dir="pkg-temp/syndie/archive/ovpBy2mpO1CQ7deYhQ1cDGAwI6pQzLbWOm1Sdd0W06c=" />
+ <copy file="installer/resources/blogMeta.snm" tofile="pkg-temp/syndie/archive/ovpBy2mpO1CQ7deYhQ1cDGAwI6pQzLbWOm1Sdd0W06c=/meta.snm" />
+ <copy file="installer/resources/blogPost.snd" tofile="pkg-temp/syndie/archive/ovpBy2mpO1CQ7deYhQ1cDGAwI6pQzLbWOm1Sdd0W06c=/1126915200003.snd" />
</target>
<target name="tarball" depends="preppkg">
<tar compression="bzip2" destfile="i2p.tar.bz2">
@@ -330,6 +335,11 @@
<mkdir dir="pkg-temp/eepsite" />
<mkdir dir="pkg-temp/eepsite/webapps" />
<mkdir dir="pkg-temp/eepsite/cgi-bin" />
+ <mkdir dir="pkg-temp/syndie" />
+ <mkdir dir="pkg-temp/syndie/archive" />
+ <mkdir dir="pkg-temp/syndie/archive/ovpBy2mpO1CQ7deYhQ1cDGAwI6pQzLbWOm1Sdd0W06c=" />
+ <copy file="installer/resources/blogMeta.snm" tofile="pkg-temp/syndie/archive/ovpBy2mpO1CQ7deYhQ1cDGAwI6pQzLbWOm1Sdd0W06c=/meta.snm" />
+ <copy file="installer/resources/blogPost.snd" tofile="pkg-temp/syndie/archive/ovpBy2mpO1CQ7deYhQ1cDGAwI6pQzLbWOm1Sdd0W06c=/1126915200003.snd" />
</target>
<taskdef name="izpack" classpath="${basedir}/installer/lib/izpack/standalone-compiler.jar" classname="com.izforge.izpack.ant.IzPackTask" />
<target name="installer" depends="preppkg">
diff --git a/core/java/src/net/i2p/CoreVersion.java b/core/java/src/net/i2p/CoreVersion.java
index c9e75c3849d22ecc7d00ecf898b0492a78aaeea2..06b3501cea6b8ba9fbc4a95a1966d4c577ff1c6e 100644
--- a/core/java/src/net/i2p/CoreVersion.java
+++ b/core/java/src/net/i2p/CoreVersion.java
@@ -14,8 +14,8 @@ package net.i2p;
*
*/
public class CoreVersion {
- public final static String ID = "$Revision: 1.0 $ $Date: 2005/09/01 15:27:36 $";
- public final static String VERSION = "0.6.0.5";
+ public final static String ID = "$Revision: 1.41 $ $Date: 2005/09/02 14:10:08 $";
+ public final static String VERSION = "0.6.0.6";
public static void main(String args[]) {
System.out.println("I2P Core version: " + VERSION);
diff --git a/history.txt b/history.txt
index 2d3b79364de21c0d4b337ba73d8c8bd1b53a34d6..842556b83940a3b2c2ed15a5d35156e1b5c8c584 100644
--- a/history.txt
+++ b/history.txt
@@ -1,4 +1,11 @@
-$Id: history.txt,v 1.255 2005/09/17 15:08:26 jrandom Exp $
+$Id: history.txt,v 1.256 2005/09/17 18:01:45 jrandom Exp $
+
+* 2005-09-17 0.6.0.6 released
+
+2005-09-17 jrandom
+ * Clean up syndie a bit more and bundle a default introductory post with
+ both new installs and updates.
+ * Typo fixes on the console (thanks bar!)
2005-09-17 jrandom
* Updated the bandwidth limiter to use two tiers of bandwidth - our normal
diff --git a/initialNews.xml b/initialNews.xml
index 620577323f929ab97343ae63194205459f983538..fcc260252a5aceebe97b514abbd3f476437096c7 100644
--- a/initialNews.xml
+++ b/initialNews.xml
@@ -1,5 +1,5 @@
-<i2p.news date="$Date: 2005/09/01 15:27:35 $">
- <i2p.release version="0.6.0.5" date="2005/09/02" minVersion="0.6"
+<i2p.news date="$Date: 2005/09/02 14:10:05 $">
+ <i2p.release version="0.6.0.6" date="2005/09/17" minVersion="0.6"
anonurl="http://i2p/NF2RLVUxVulR3IqK0sGJR0dHQcGXAzwa6rEO4WAWYXOHw-DoZhKnlbf1nzHXwMEJoex5nFTyiNMqxJMWlY54cvU~UenZdkyQQeUSBZXyuSweflUXFqKN-y8xIoK2w9Ylq1k8IcrAFDsITyOzjUKoOPfVq34rKNDo7fYyis4kT5bAHy~2N1EVMs34pi2RFabATIOBk38Qhab57Umpa6yEoE~rbyR~suDRvD7gjBvBiIKFqhFueXsR2uSrPB-yzwAGofTXuklofK3DdKspciclTVzqbDjsk5UXfu2nTrC1agkhLyqlOfjhyqC~t1IXm-Vs2o7911k7KKLGjB4lmH508YJ7G9fLAUyjuB-wwwhejoWqvg7oWvqo4oIok8LG6ECR71C3dzCvIjY2QcrhoaazA9G4zcGMm6NKND-H4XY6tUWhpB~5GefB3YczOqMbHq4wi0O9MzBFrOJEOs3X4hwboKWANf7DT5PZKJZ5KorQPsYRSq0E3wSOsFCSsdVCKUGsAAAA/i2p/i2pupdate.sud"
publicurl="http://dev.i2p.net/i2p/i2pupdate.sud"
anonannouncement="http://i2p/NF2RLVUxVulR3IqK0sGJR0dHQcGXAzwa6rEO4WAWYXOHw-DoZhKnlbf1nzHXwMEJoex5nFTyiNMqxJMWlY54cvU~UenZdkyQQeUSBZXyuSweflUXFqKN-y8xIoK2w9Ylq1k8IcrAFDsITyOzjUKoOPfVq34rKNDo7fYyis4kT5bAHy~2N1EVMs34pi2RFabATIOBk38Qhab57Umpa6yEoE~rbyR~suDRvD7gjBvBiIKFqhFueXsR2uSrPB-yzwAGofTXuklofK3DdKspciclTVzqbDjsk5UXfu2nTrC1agkhLyqlOfjhyqC~t1IXm-Vs2o7911k7KKLGjB4lmH508YJ7G9fLAUyjuB-wwwhejoWqvg7oWvqo4oIok8LG6ECR71C3dzCvIjY2QcrhoaazA9G4zcGMm6NKND-H4XY6tUWhpB~5GefB3YczOqMbHq4wi0O9MzBFrOJEOs3X4hwboKWANf7DT5PZKJZ5KorQPsYRSq0E3wSOsFCSsdVCKUGsAAAA/pipermail/i2p/2005-September/000878.html"
diff --git a/installer/install.xml b/installer/install.xml
index 77749e36e7c122a15731450eb3fd5eeb9661d135..d045b43bb0782466e1adb5d617b5fbba55693970 100644
--- a/installer/install.xml
+++ b/installer/install.xml
@@ -4,7 +4,7 @@
<info>
<appname>i2p</appname>
- <appversion>0.6.0.5</appversion>
+ <appversion>0.6.0.6</appversion>
<authors>
<author name="I2P" email="support@i2p.net"/>
</authors>
diff --git a/installer/resources/blogMeta.snm b/installer/resources/blogMeta.snm
new file mode 100644
index 0000000000000000000000000000000000000000..1345eab1089d8b64f3ad6d618903a78b124d52a2
--- /dev/null
+++ b/installer/resources/blogMeta.snm
@@ -0,0 +1,7 @@
+Owner:U1oHd4XghnvqZzFaxx2Z8ogH9bfkJ4MCMUZKIu5lGV~0098TLaqB~pOc~GyAPtP55ckS54KX1uJN3pttaawwt61edntulHpatOCwrw5lpAytJcpZhJaahs64NhdnNeFCindHbXFxYU7BiRt7iyHswMlGjup~03uy7xp-JdWlNjw=
+Posters:
+Name:jrandom
+Edition:0
+ContactURL:jrandom@i2p.net
+Description:jrandom's ranting
+Signature:PstiGeiWOV8VKARVNvk4NRe-EOAwS10yGHMkXb~FUS7GBMVHxaGeDA==
diff --git a/installer/resources/blogPost.snd b/installer/resources/blogPost.snd
new file mode 100644
index 0000000000000000000000000000000000000000..7bac111d640bd3bad75905df496c9e6b93bc823a
Binary files /dev/null and b/installer/resources/blogPost.snd differ
diff --git a/news.xml b/news.xml
index ad9029bc56d77f1eae1070c55ab1c42e28090142..37d9ae5ab895feac2933f9cfffbbeef989a58fea 100644
--- a/news.xml
+++ b/news.xml
@@ -1,5 +1,5 @@
-<i2p.news date="$Date: 2005/09/15 00:56:10 $">
- <i2p.release version="0.6.0.5" date="2005/09/02" minVersion="0.6"
+<i2p.news date="$Date: 2005/09/15 00:57:28 $">
+ <i2p.release version="0.6.0.6" date="2005/09/17" minVersion="0.6"
anonurl="http://i2p/NF2RLVUxVulR3IqK0sGJR0dHQcGXAzwa6rEO4WAWYXOHw-DoZhKnlbf1nzHXwMEJoex5nFTyiNMqxJMWlY54cvU~UenZdkyQQeUSBZXyuSweflUXFqKN-y8xIoK2w9Ylq1k8IcrAFDsITyOzjUKoOPfVq34rKNDo7fYyis4kT5bAHy~2N1EVMs34pi2RFabATIOBk38Qhab57Umpa6yEoE~rbyR~suDRvD7gjBvBiIKFqhFueXsR2uSrPB-yzwAGofTXuklofK3DdKspciclTVzqbDjsk5UXfu2nTrC1agkhLyqlOfjhyqC~t1IXm-Vs2o7911k7KKLGjB4lmH508YJ7G9fLAUyjuB-wwwhejoWqvg7oWvqo4oIok8LG6ECR71C3dzCvIjY2QcrhoaazA9G4zcGMm6NKND-H4XY6tUWhpB~5GefB3YczOqMbHq4wi0O9MzBFrOJEOs3X4hwboKWANf7DT5PZKJZ5KorQPsYRSq0E3wSOsFCSsdVCKUGsAAAA/i2p/i2pupdate.sud"
publicurl="http://dev.i2p.net/i2p/i2pupdate.sud"
anonannouncement="http://i2p/NF2RLVUxVulR3IqK0sGJR0dHQcGXAzwa6rEO4WAWYXOHw-DoZhKnlbf1nzHXwMEJoex5nFTyiNMqxJMWlY54cvU~UenZdkyQQeUSBZXyuSweflUXFqKN-y8xIoK2w9Ylq1k8IcrAFDsITyOzjUKoOPfVq34rKNDo7fYyis4kT5bAHy~2N1EVMs34pi2RFabATIOBk38Qhab57Umpa6yEoE~rbyR~suDRvD7gjBvBiIKFqhFueXsR2uSrPB-yzwAGofTXuklofK3DdKspciclTVzqbDjsk5UXfu2nTrC1agkhLyqlOfjhyqC~t1IXm-Vs2o7911k7KKLGjB4lmH508YJ7G9fLAUyjuB-wwwhejoWqvg7oWvqo4oIok8LG6ECR71C3dzCvIjY2QcrhoaazA9G4zcGMm6NKND-H4XY6tUWhpB~5GefB3YczOqMbHq4wi0O9MzBFrOJEOs3X4hwboKWANf7DT5PZKJZ5KorQPsYRSq0E3wSOsFCSsdVCKUGsAAAA/pipermail/i2p/2005-September/000878.html"
diff --git a/readme.html b/readme.html
index 2d1941a5702a8b6e77d27b37dac8ce94f31a4edc..b192e07e06d8177aacdf721b07401fd3965d337e 100644
--- a/readme.html
+++ b/readme.html
@@ -4,6 +4,7 @@ only need to do it if that link shows up). Within 5 minutes, you should see
the number of "Active: " peers rise, and you should see some local "destinations"
listed (if not, <a href="#trouble">see below</a>). Once those are up, you can:</p>
<ul>
+ <li><b>blog anonymously</b> - check out <a href="/syndie/">Syndie</a></li>
<li><b>chat anonymously</b> - fire up your own IRC client and connect to the
server at <b>localhost port 6668</b>. This points at one of two anonymously hosted
IRC servers, but neither you nor they know where the other is.</li>
@@ -17,7 +18,7 @@ listed (if not, <a href="#trouble">see below</a>). Once those are up, you can:<
<li><a href="http://search.i2p/">search.i2p</a>: an anonymously hosted search engine of eepsites</li>
<li><a href="http://ugha.i2p/">ugha.i2p</a>: ugha's eepsite, a wiki that anyone can edit, and lots of links</li>
<li><a href="http://dev.i2p/">dev.i2p</a>: a secure and anonymous connection to <a href="http://dev.i2p.net/">dev.i2p.net</a></li>
- <li>Freenet proxies: <a href="http://fproxy.i2p/">fproxy.i2p</a></li>
+ <li>Freenet proxies: <a href="http://fproxy.i2p/">fproxy.i2p</a> and <a href="fproxy.tino.i2p">fproxy.tino.i2p</a></li>
</ul>
There are many more eepsites - just follow the links from the ones you see,
bookmark your favorites, and visit them often!</li>
@@ -25,13 +26,13 @@ listed (if not, <a href="#trouble">see below</a>). Once those are up, you can:<
up to your own HTTP proxy on port 4444 - simply set your browser's proxy to
use it (as above) and go to any normal URL - your requests will be bounced
through the I2P network.</li>
- <li><b>transfer files</b> - there is an <a href="http://duck.i2p/i2p-bt/">I2P port</a>
+ <li><b>transfer files</b> - there is an <a href="http://i2p-bt.postman.i2p/">I2P port</a>
of the <a href="http://www.bittorrent.com/">BitTorrent</a> application available.</li>
<li><b>use anonymous email</b> - postman has created a mail system compatible with normal mail
clients (POP3 / SMTP) that allows email within I2P as well as mail from and to the normal
internet! get your account at <a href="http://hq.postman.i2p/">hq.postman.i2p</a>.
- We bundle <a href="http://susi.i2p/">susimail</a>, a web based anonymity-oriented pop3/smtp client
- configured to access postman's mail services.</li>
+ We bundle <a href="http://susi.i2p/">Susi's</a> <a href="/susimail/susimail">susimail</a>,
+ a web based anonymity-oriented pop3/smtp client configured to access postman's mail services.</li>
<li>and lots more</li>
</ul>
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index fe4b9058648fe9a256d8a98d5a53b9f076279d50..e8d88f70372870f644fd12220abc4e9616cd7808 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -15,9 +15,9 @@ import net.i2p.CoreVersion;
*
*/
public class RouterVersion {
- public final static String ID = "$Revision: 1.239 $ $Date: 2005/09/16 16:24:43 $";
- public final static String VERSION = "0.6.0.5";
- public final static long BUILD = 14;
+ public final static String ID = "$Revision: 1.240 $ $Date: 2005/09/17 18:01:44 $";
+ public final static String VERSION = "0.6.0.6";
+ public final static long BUILD = 0;
public static void main(String args[]) {
System.out.println("I2P Router version: " + VERSION + "-" + BUILD);
System.out.println("Router ID: " + RouterVersion.ID);