diff options
author | ng0 <ng0@n0.is> | 2019-03-08 16:50:41 +0000 |
---|---|---|
committer | ng0 <ng0@n0.is> | 2019-03-08 16:50:41 +0000 |
commit | 7326379321392c77bc31736b93342063c252d98b (patch) | |
tree | 945d69449b812df897251e8053525491142114e4 | |
parent | 1375e4e4e2436c394348aa9652fcfb9c2b0ecd7d (diff) | |
parent | eced0089b4b990a053459f46b20e23b1d1dfa1b2 (diff) | |
download | gnunet-7326379321392c77bc31736b93342063c252d98b.tar.gz gnunet-7326379321392c77bc31736b93342063c252d98b.zip |
Merge branch 'master' of gnunet.org:gnunet
-rw-r--r-- | doc/handbook/chapters/user.texi | 6 | ||||
-rw-r--r-- | src/hostlist/hostlist.conf | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/handbook/chapters/user.texi b/doc/handbook/chapters/user.texi index e7ab51335..a1c1417aa 100644 --- a/doc/handbook/chapters/user.texi +++ b/doc/handbook/chapters/user.texi | |||
@@ -1915,8 +1915,8 @@ Ascension | |||
1915 | Usage: | 1915 | Usage: |
1916 | ascension <domain> [-d] [-p] | 1916 | ascension <domain> [-d] [-p] |
1917 | ascension <domain> <port> [-d] [-p] | 1917 | ascension <domain> <port> [-d] [-p] |
1918 | ascension <domain> -ns <transferns> [-d] [-p] | 1918 | ascension <domain> -n <transferns> [-d] [-p] |
1919 | ascension <domain> -ns <transferns> <port> [-d] [-p] | 1919 | ascension <domain> -n <transferns> <port> [-d] [-p] |
1920 | ascension -p | --public | 1920 | ascension -p | --public |
1921 | ascension -h | --help | 1921 | ascension -h | --help |
1922 | ascension -v | --version | 1922 | ascension -v | --version |
@@ -1940,7 +1940,7 @@ To migrate the Syrian top level domain - one of the few top level domains that | |||
1940 | still supports zone transfers - into GNS use the following command: | 1940 | still supports zone transfers - into GNS use the following command: |
1941 | 1941 | ||
1942 | @example | 1942 | @example |
1943 | $ ascension sy. -ns ns1.tld.sy. -p | 1943 | $ ascension sy. -n ns1.tld.sy. -p |
1944 | @end example | 1944 | @end example |
1945 | 1945 | ||
1946 | The -p flag will tell GNS to put these records on the DHT so that other users | 1946 | The -p flag will tell GNS to put these records on the DHT so that other users |
diff --git a/src/hostlist/hostlist.conf b/src/hostlist/hostlist.conf index 32e5d8320..6b7a6aac7 100644 --- a/src/hostlist/hostlist.conf +++ b/src/hostlist/hostlist.conf | |||
@@ -20,7 +20,7 @@ HOSTLISTFILE = $GNUNET_CONFIG_HOME/hostlist/learned.txt | |||
20 | OPTIONS = -b | 20 | OPTIONS = -b |
21 | 21 | ||
22 | # Default list of hostlist servers for bootstrapping | 22 | # Default list of hostlist servers for bootstrapping |
23 | SERVERS = http://v10.gnunet.org/hostlist https://gnunet.io/hostlist | 23 | SERVERS = http://v11.gnunet.org/hostlist https://gnunet.io/hostlist |
24 | # http://silent.0xdeadc0de.eu:8080/ | 24 | # http://silent.0xdeadc0de.eu:8080/ |
25 | 25 | ||
26 | # bind hostlist http server to a specific IPv4 | 26 | # bind hostlist http server to a specific IPv4 |