From 634bf5f7e3f2a0359d692f84f94847e40eca8d23 Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 1 Nov 2014 18:50:26 +0000 Subject: [PATCH] 0.9.16 Fix history.txt UTF-8 breakage Javadoc fixes after review --- .../src/org/klomp/snark/web/I2PSnarkServlet.java | 4 ++-- .../src/freenet/support/CPUInformation/CPUID.java | 2 +- core/java/src/net/i2p/CoreVersion.java | 2 +- history.txt | 14 ++++++++------ installer/install.xml | 2 +- router/java/src/net/i2p/router/RouterVersion.java | 4 ++-- .../transport/udp/OutboundEstablishState.java | 2 +- 7 files changed, 16 insertions(+), 14 deletions(-) diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java index b12a52907..b550b1060 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java @@ -721,7 +721,7 @@ public class I2PSnarkServlet extends BasicServlet { /** * hidden inputs for nonce and paramters p, st, and sort * - * @param out appends to it + * @param buf appends to it * @param action if non-null, add it as the action * @since 0.9.16 */ @@ -3080,7 +3080,7 @@ public class I2PSnarkServlet extends BasicServlet { } /** - * @param null ok + * @param so null ok * @return query string or "" * @since 0.9.16 */ diff --git a/core/java/src/freenet/support/CPUInformation/CPUID.java b/core/java/src/freenet/support/CPUInformation/CPUID.java index 0140eb92c..519ffd7cd 100644 --- a/core/java/src/freenet/support/CPUInformation/CPUID.java +++ b/core/java/src/freenet/support/CPUInformation/CPUID.java @@ -143,7 +143,7 @@ public class CPUID { } /** - * Only valid if family == 15. + * Only valid if family == 15, or, for Intel only, family == 6. * Left shift by 4 and then add model to get full model. * @return 0-15 */ diff --git a/core/java/src/net/i2p/CoreVersion.java b/core/java/src/net/i2p/CoreVersion.java index 49e6ba714..8407e972b 100644 --- a/core/java/src/net/i2p/CoreVersion.java +++ b/core/java/src/net/i2p/CoreVersion.java @@ -16,7 +16,7 @@ package net.i2p; public class CoreVersion { /** deprecated */ public final static String ID = "Monotone"; - public final static String VERSION = "0.9.15"; + public final static String VERSION = "0.9.16"; public static void main(String args[]) { System.out.println("I2P Core version: " + VERSION); diff --git a/history.txt b/history.txt index d362df868..a59b64c91 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,5 @@ +* 2014-11-01 0.9.16 released + 2014-10-30 kytv * Updates to geoip.txt and geoipv6.dat.gz based on Maxmind GeoLite Country database from 2014-10-07. @@ -548,7 +550,7 @@ Prop from i2p.i2p.zzz.test2: 2014-05-15 kytv * Translations, imported from Transifex: - - Dutch, French, German, Italian, Japanese, Norwegian Bokml, and Ukrainian + - Dutch, French, German, Italian, Japanese, Norwegian Bokmål, and Ukrainian translation updates - Start of Slovak language translation * Updates to geoip.txt and geoipv6.dat.gz based on Maxmind GeoLite Country @@ -2115,7 +2117,7 @@ i2psnark: Fix ConnectionAcceptor not restarting after tunnel transifex. 2013-02-13 kytv - * Flag for Curaao (CW), public domain + * Flag for Curaçao (CW), public domain 2013-02-12 zzz * NetDB: Randomize delay before floodfill store verify @@ -2142,8 +2144,8 @@ i2psnark: Fix ConnectionAcceptor not restarting after tunnel - Allow any domain name to be mapped, not just .i2p 2013-01-31 kytv - * Add Norwegian Bokml language to the router console - * Add Bokml translations from Transifex + * Add Norwegian Bokmål language to the router console + * Add Bokmål translations from Transifex 2013-01-31 zzz * EepGet: @@ -5032,7 +5034,7 @@ i2psnark: Fix ConnectionAcceptor not restarting after tunnel * Reseed: Log tweak 2011-04-02 m1xxy - * routerconsole, i2psnark, ... I2P ahora tambin en espaol: Bienvenidos los hispanohablantes! + * routerconsole, i2psnark, ... I2P ahora también en español: ¡Bienvenidos los hispanohablantes! - routerconsole, i2ptunnel, i2psnark, SusiDNS, Susimail fully translated into Spanish (thx to PunkiBastardo and user) * routerconsole, i2psnark, ... @@ -7174,7 +7176,7 @@ i2psnark: Fix ConnectionAcceptor not restarting after tunnel - Java 5 cleanups * Console: - Put favicon on every page - - Make every page UTF-8, safe for snowmen + - Make every page UTF-8, ☃ safe for snowmen - Remove options boxes on configtunnels.jsp - Fix UTF-8 form submission (i2ptunnel too) - Throw 403 instead of 404 from flags.jsp and viewstat.jsp diff --git a/installer/install.xml b/installer/install.xml index ab917edbc..cde35c91b 100644 --- a/installer/install.xml +++ b/installer/install.xml @@ -4,7 +4,7 @@ i2p - 0.9.15 + 0.9.16 diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 987fc2f75..a411b0099 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,10 +18,10 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 19; + public final static long BUILD = 0; /** for example "-test" */ - public final static String EXTRA = "-rc"; + public final static String EXTRA = ""; public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA; public static void main(String args[]) { System.out.println("I2P Router version: " + FULL_VERSION); diff --git a/router/java/src/net/i2p/router/transport/udp/OutboundEstablishState.java b/router/java/src/net/i2p/router/transport/udp/OutboundEstablishState.java index 897cd1de2..63497b5ea 100644 --- a/router/java/src/net/i2p/router/transport/udp/OutboundEstablishState.java +++ b/router/java/src/net/i2p/router/transport/udp/OutboundEstablishState.java @@ -221,7 +221,7 @@ class OutboundEstablishState { return _sentX; } - /**x + /** * The remote side (Bob) - note that in some places he's called Charlie. * Warning - may change after introduction. May be null before introduction. */