diff --git a/apps/routerconsole/jsp/help-advancedsettings.jsi b/apps/routerconsole/jsp/help-advancedsettings.jsi
index 33723fdb26..a27438b56c 100644
--- a/apps/routerconsole/jsp/help-advancedsettings.jsi
+++ b/apps/routerconsole/jsp/help-advancedsettings.jsi
@@ -9,7 +9,7 @@
| routerconsole.advanced={true|false} |
|---|
| Only set this to true if you know what you are doing! |
-| When set to true, additional functionality will be enabled in the console and the user will be able to edit settings directly on the Advanced Configuration page. Extra display options are provided in the Network Database section, including the Sybil Analysis tool, and there are additional configuration options on the Clients Configuration page. This will also enable the installation of unsigned updates, manual configuration of the news URL, and the installation of plugins. You may also wish to enable the "Advanced" sidebar section on the Summary Bar Configuration page. |
+| When set to true, additional functionality will be enabled in the console and the user will be able to edit settings directly on the Advanced Configuration page. Extra display options are provided in the Network Database section, including the Sybil Analysis tool, and there are additional configuration options on the Clients Configuration page. This will also enable the installation of unsigned updates, manual configuration of the news URL, and the installation of plugins. You may also wish to enable the "Advanced" sidebar section on the Summary Bar Configuration page. |
| routerconsole.browser={/path/to/browser} |
|---|
| This setting allows the manual selection of the browser which I2P will launch on startup (if the console is configured to launch a browser on startup), overriding the OS default browser. |
@@ -21,7 +21,7 @@
This setting allows you to configure the update url for the unsigned update feature, if enabled. The url should end with /i2pupdate.zip. Note: do not install unsigned updates unless you trust the source of the update! |
| routerconsole.enablePluginInstall={true|false} |
|---|
-When set to true, this enables plugin installation on the Plugin Configuration page. Setting routerconsole.advanced=true will also enable this feature. |
+When set to true, this enables plugin installation on the Plugin Configuration page. Setting routerconsole.advanced=true will also enable this feature. [Enabled by default] |
| routerconsole.allowUntrustedPlugins={true|false} |
|---|
| Plugins signed with the cryptographic key of the developer are the recommended format, but if you wish to install unsigned plugins you can set this to true. Note that you may still encounter issues attempting to install an unsigned plugin if the developer has included additional checks in the plugin build process. |
@@ -30,7 +30,7 @@
| When set to true, a configurable search bar will appear on the console homepage. Additional searches may then be added on the home configuration page. |
| router.buildHandlerThreads={n} |
|---|
-| Allocate number of processor threads for building tunnels. If your processor supports hyperthreading, you may multiply the number of processor cores by 2 to get the maximum number of threads to allocate, otherwise number of processor cores = maximum number of threads available. Note that you may wish to allocate less than the theoretical maximum to ensure you have headroom for other tasks. |
+| Allocate number of processor threads for building tunnels. If your processor supports hyperthreading or simultaneous multithreading, you may multiply the number of processor cores by 2 to get the maximum number of threads to allocate, otherwise number of processor cores = maximum number of threads available. Note that you may wish to allocate less than the theoretical maximum to ensure you have headroom for other tasks. |
| router.maxParticipatingTunnels={n} |
|---|
| Determines the maximum number of participating tunnels the router can build. To disable participation completely, set to 0. |
diff --git a/apps/routerconsole/jsp/help-faq.jsi b/apps/routerconsole/jsp/help-faq.jsi
new file mode 100644
index 0000000000..2b8b021917
--- /dev/null
+++ b/apps/routerconsole/jsp/help-faq.jsi
@@ -0,0 +1,80 @@
+Abridged I2P FAQ
+
+This is a shortened version of the official FAQ. For the full version, please visit https://geti2p.net/faq or http://i2p-projekt.i2p/faq.
+
+
My router has been up for several minutes and has zero or very few connections
+
+If after a few minutes of uptime your router is indicating 0 Active Peers and 0 Known Peers, with a notification in the sidebar that you need to check your network connection, verify that you can access the internet. If your internet connection is functional, you may need to unblock Java in your firewall. Otherwise, you may need to reseed your I2P router. Visit the Reseed Configuration page and click the Save Changes and Reseed Now button.
+
+My router has very few active peers, is this OK?
+
+If your router has 10 or more active peers, everything is fine. The router should maintain connections to a few peers at all times. The best way to stay "better-connected" to the network is to share more bandwidth.
+
+I'm missing lots of hosts in my addressbook. What are some good subscription links?
+
+The default subscription is to http://i2p-projekt.i2p/hosts.txt which is seldom updated. If you don't have another subscription, you may often have to use "jump" links which is much slower but ensures that your addressbook is only populated by sites you use (in addition to the default subscription addresses). To speed up browsing on I2P, it's a good idea to add some addressbook subscriptions.
+
+Here are some other public addressbook subscription links. You may wish to add one or two to your susidns subscription list. In the event that addresses conflict in the subscriptions, the lists placed at the top of your susidns configuration will take precedence over those placed further down.
+
+
+http://stats.i2p/cgi-bin/newhosts.txthttp://no.i2p/export/alive-hosts.txthttp://identiguy.i2p/hosts.txt
+
+Note that subscribing to a hosts.txt service is an act of trust, as a malicious subscription could give you incorrect addresses, so be careful subscribing to lists from unknown sources. The operators of these services may have various policies for listing hosts. Presence on this list does not imply endorsement.
+
+How do I access IRC, BitTorrent, or other services on the regular Internet?
+
+Unless an outproxy has been set up for the service you want to connect to, this is not possible. There are only three types of outproxies running right now: HTTP, HTTPS, and email. Note that there is currently no publicly listed SOCKS outproxy. If this type of service is required, try Tor.
+
+How do I configure my browser to access .i2p websites?
+You will need to configure your browser to use the HTTP proxy server (by default on host: 127.0.0.1 port: 4444). See the Browser Proxy Configuration Guide for a more detailed explanation.
+
+What is an eepsite?
+
+An eepsite is a website that is hosted anonymously on the I2P network - you can access it by configuring your web browser to use I2P's HTTP proxy (see above) and browsing to the .i2p suffixed website (e.g. http://i2p-projekt.i2p). Also ensure your browser is configured to resolve DNS remotely when using the proxy to avoid DNS leaks.
+
+Most of the eepsites are down?
+
+If you consider every eepsite that has ever been created, yes, most of them are down. People and eepsites come and go. A good way to get started in I2P is check out a list of eepsites that are currently up. http://identiguy.i2p tracks active eepsites.
+
+How do I connect to IRC within I2P?
+
+A tunnel to the main IRC server network within I2P, Irc2P, is created when I2P is installed (see the I2P Tunnel Manager), and is automatically started when the I2P router starts. To connect to it, tell your IRC client to connect to server: 127.0.0.1 port: 6668.
+
+XChat-like client users can create a new network with the server 127.0.0.1/6668 (remember to tick Bypass proxy server if you have a proxy server configured), or you can connect with the command /server 127.0.0.1 6668. Different IRC clients may vary the syntax.
+
+What ports does I2P use?
+
+
+| LOCAL PORTS |
|---|
+| These are the local I2P port mappings, listening only to local connections by default, except where noted. Unless you require access from other machines, they should only be accessible from localhost. |
+| Port | Function | Notes |
|---|
+| 1900 | UPnP SSDP UDP multicast listener | Cannot be changed. Binds to all interfaces. Can be disabled on the Network Configuration page. |
+| 2827 | BOB bridge | A higher level socket API for clients. Can be enabled/disabled on the Client Configuration page. Can be changed in the bob.config file. [Disabled by default] |
+| 4444 | HTTP proxy | Can be disabled or changed in the I2P Tunnel Manager. Can also be configured to bind to a specific interface or all interfaces. |
+| 4445 | HTTPS proxy | Can be disabled or changed in the I2P Tunnel Manager. Can also be configured to bind to a specific interface or all interfaces. |
+| 6668 | IRC proxy | Can be disabled or changed in the I2P Tunnel Manager. Can also be configured to bind to a specific interface or all interfaces. |
+| 7652 | UPnP HTTP TCP event listener | Binds to the LAN address. Can be changed with advanced config i2np.upnp.HTTPPort=nnnn. Can be disabled on the Network Configuration page. |
+| 7653 | UPnP SSDP UDP search response listener | Binds to all interfaces. Can be changed with advanced config i2np.upnp.SSDPPort=nnnn. Can be disabled on the Client Configuration page. |
+| 7654 | I2P Client Protocol port | Used by client apps. Can be changed to a different port on the Client Configuration page but this is not recommended. Can be bound to a different interface or all interfaces, or disabled, on the Client Configuration page. |
+| 7655 | UDP for SAM bridge | A higher level socket API for clients. Only opened when a SAM V3 client requests a UDP session. Can be enabled/disabled on the Client Configuration page. Can be changed in the clients.config file with the SAM command line option sam.udp.port=nnnn. |
+| 7656 | SAM bridge | A higher level socket API for clients. Can be enabled/disabled on the Client Configuration page. Can be changed in the clients.config file. [Disabled by default] |
+| 7657 | I2P Router Console (Web interface) | Can be disabled in the clients.config file. Can also be configured to bind to a specific interface or all interfaces in that file. If you make the Router Console available over the network, you might wish to enforce an access password to prevent unauthorized access. |
+| 7658 | I2P Web Server | Can be disabled in the clients.config file. Can also be configured to bind to a specific interface or all interfaces in the jetty.xml file. |
+
+| 7659 | Outgoing mail to smtp.postman.i2p | Can be disabled or changed in the I2P Tunnel Manager. Can also be configured to bind to a specific interface or all interfaces. |
+| 7660 | Incoming mail from pop.postman.i2p | Can be disabled or changed in the I2P Tunnel Manager. Can also be configured to bind to a specific interface or all interfaces. |
+| 8998 | mtn.i2p2.i2p (I2P's Monotone DVCS) | Can be disabled or changed in the I2P Tunnel Manager. Can also be configured to bind to a specific interface or all interfaces. [Disabled by default] |
+| 31000 | Local connection to wrapper control channel port | Outbound to 32000 only, does not listen on this port. Starts at 31000 and will increment until 31999 looking for a free port. To change, see the wrapper documentation. |
+| 32000 | Local control channel for the service wrapper | To change, see the wrapper documentation. |
+| INTERNET FACING PORTS |
|---|
+| I2P selects a random port between 9000 and 31000 to communicate with other routers when the program is run for the first time, or when your external IP address changes when running in Laptop Mode. The selected port is shown on the Network Configuration page. |
+| Outbound UDP from the random port noted on the Network Configuration page to arbitrary remote UDP ports, allowing replies. |
+| Outbound TCP from random high ports to arbitrary remote TCP ports. |
+| Inbound UDP to the port noted on the Network Configuration page from arbitrary locations (optional, but recommended). |
+| Inbound TCP to the port noted on the Network Configuration page from arbitrary locations (optional, but recommended). Inbound TCP may be disabled on the Network Configuration page. |
+Outbound UDP on port 123, allowing replies: this is necessary for I2P's internal time sync (via SNTP - querying a random SNTP host in pool.ntp.org or another server you specify). |
+
+
diff --git a/apps/routerconsole/jsp/help-legal.jsi b/apps/routerconsole/jsp/help-legal.jsi
index c2b31bd68f..b243607220 100644
--- a/apps/routerconsole/jsp/help-legal.jsi
+++ b/apps/routerconsole/jsp/help-legal.jsi
@@ -1,38 +1,34 @@
Legal stuff
-The I2P router (router.jar) and SDK (i2p.jar) are almost entirely public domain, with
-a few notable exceptions:
+The I2P router (router.jar) and SDK (i2p.jar) are almost entirely public domain, with a few notable exceptions:
+
- ElGamal and DSA code, under the BSD license, written by TheCrypto
-- SHA256 and HMAC-SHA256, under the MIT license, written by the Legion of the Bouncycastle
-- AES code, under the Cryptix (MIT) license, written by the Cryptix team
-- SNTP code, under the BSD license, written by Adam Buckley
-- The rest is outright public domain, written by jrandom, mihi, hypercubus, oOo,
- ugha, duck, shendaras, and others.
+- SHA256 and HMAC-SHA256, under the MIT license, written by the Legion of the Bouncycastle
+- AES code, under the Cryptix (MIT) license, written by the Cryptix team
+- SNTP code, under the BSD license, written by Adam Buckley
+- The rest is outright public domain, written by jrandom, mihi, hypercubus, oOo, ugha, duck, shendaras, and others.
-On top of the I2P router are a series of client applications, each with their own set of
-licenses and dependencies. This webpage is being served as part of the I2P routerconsole
-client application, which is built off a trimmed down Jetty
-instance (trimmed down, as in, we do not include the demo apps or other add-ons, and we simplify configuration),
-allowing you to deploy standard JSP/Servlet web applications into your router. Jetty in turn makes use of
-Apache's javax.servlet (javax.servlet.jar) implementation.
-This product includes software developed by the Apache Software Foundation
-(http://www.apache.org/).
+On top of the I2P router are a series of client applications, each with their own set of licenses and dependencies:
-
Another application you can see on this webpage is I2PTunnel
-(your web interface) - a GPL'ed application written by mihi that
-lets you tunnel normal TCP/IP traffic over I2P (such as the eepproxy and the irc proxy). There is also a
-susimail web based mail client available on
-the console, which is a GPL'ed application written by susi23. The addressbook application, written by
-Ragnarok helps maintain your hosts.txt files (see ./addressbook/ for
-more information).
+
+- I2PTunnel - a GPL'ed application written by mihi
+that lets you tunnel normal TCP/IP traffic over I2P (such as the http proxy and the irc proxy), with a browser-based front end.
+- Susimail, a GPL'ed browser based mail client written by susi23.
+- The addressbook application,
+written by Ragnarok helps maintain your hosts.txt files, with a front end written by susi23.
+- The SAM bridge by human (public domain), an API
+which other client applications (such the I2P Tahoe-LAFS cloud filesystem) can use to interface with I2P.
+- jbigi - an optimized library for doing large number calculations which uses the
+LGPL licensed GMP library, tuned for various PC architectures.
+- Launchers for windows users are built with Launch4J,
+and the installer is built with IzPack.
+- The I2P Router Console, built from a streamlined Jetty Web Server instance
+which allows you to deploy standard JSP/Servlet web applications in your router.
+- Jetty makes use of Apache's javax.servlet
+(javax.servlet.jar) implementation. This product includes software developed by the Apache Software Foundation.
+- Source for the I2P code and most bundled client applications can be found on our download page.
+
-The router by default also includes human's public domain SAM bridge,
-which other client applications (such the bittorrent port) can use.
-There is also an optimized library for doing large number calculations - jbigi - which in turn uses the
-LGPL licensed GMP library, tuned for various PC architectures. Launchers for windows users
-are built with Launch4J, and the installer is built with
-IzPack. For
-details on other applications available, as well as their licenses, please see the
-license policy. Source for the I2P code and most bundled
-client applications can be found on our download page.
+For details on other applications available, as well as their licenses, please see the
+license policy. Additional licenses can be found in the licenses sub-directory of your I2P installation.
diff --git a/apps/routerconsole/jsp/help.jsi b/apps/routerconsole/jsp/help.jsi
index 0c06c21f4a..5bfa202b81 100644
--- a/apps/routerconsole/jsp/help.jsi
+++ b/apps/routerconsole/jsp/help.jsi
@@ -1,11 +1,9 @@
Further Assistance
-If you'd like to help improve or translate the documentation, or
-help with other aspects of the project, please see the documentation for
-volunteers.
+If you'd like to help improve or translate the documentation, or help with other aspects of the project, please see the documentation for volunteers.
Further assistance is available here:
-You may also try zzz's developer forum,
+
FAQ on i2p-projekt.i2p
+I2PWiki
+I2P forum
+You may also try zzz's developer forum,
or I2P's IRC network.
diff --git a/apps/routerconsole/jsp/help.jsp b/apps/routerconsole/jsp/help.jsp
index 8a609eb855..035938f8ba 100644
--- a/apps/routerconsole/jsp/help.jsp
+++ b/apps/routerconsole/jsp/help.jsp
@@ -14,13 +14,24 @@
<%@include file="summary.jsi" %>
I2P Router Help & Support
-
+
+
+
<%@include file="help.jsi" %>
<%@include file="help-configuration.jsi" %>
<%@include file="help-reachability.jsi" %>
<%@include file="help-advancedsettings.jsi" %>
+
<%@include file="help-faq.jsi" %>
<%@include file="help-legal.jsi" %>
Change Log
diff --git a/apps/routerconsole/jsp/help_ar.jsp b/apps/routerconsole/jsp/help_ar.jsp
index d605d61fa8..13dfb45906 100644
--- a/apps/routerconsole/jsp/help_ar.jsp
+++ b/apps/routerconsole/jsp/help_ar.jsp
@@ -14,16 +14,30 @@
<%@include file="summary.jsi" %>
I2P مساعدة لوحة التحكم
-
-اذا رغبت في المساعدة أو ترجمة الوثائق، أو المساعدة في أشياء أخرى، انظر اسفله
-تطوع
-
المزيد من المساعدة هنا:
+
+
+
+
+
+
+<% /* untranslated */ %>
+
<%@include file="help-configuration.jsi" %>
+
<%@include file="help-reachability.jsi" %>
+
<%@include file="help-advancedsettings.jsi" %>
<% /* untranslated */ %>
+
<%@include file="help-faq.jsi" %>
<% /* untranslated */ %>
+
+
Legal stuff
The I2P router (router.jar) and SDK (i2p.jar) are almost entirely public domain, with
a few notable exceptions:
- ElGamal and DSA code, under the BSD license, written by TheCrypto
- SHA256 and HMAC-SHA256, under the MIT license, written by the Legion of the Bouncycastle
- AES code, under the Cryptix (MIT) license, written by the Cryptix team
- SNTP code, under the BSD license, written by Adam Buckley
-- The rest is outright public domain, written by jrandom, mihi, hypercubus, oOo,
- ugha, duck, shendaras, and others.
+- The rest is outright public domain, written by jrandom, mihi, hypercubus, oOo, ugha, duck, shendaras, and others.
On top of the I2P router are a series of client applications, each with their own set of
@@ -169,7 +190,9 @@ details on other applications available, as well as their licenses, please see t
license policy. Source for the I2P code and most bundled
client applications can be found on our download page.
.
+
+
Change Log
<% java.io.File fpath = new java.io.File(net.i2p.I2PAppContext.getGlobalContext().getBaseDir(), "history.txt"); %>
@@ -178,5 +201,7 @@ client applications can be found on our
-
View the full change log
-