diff options
author | Nils Gillmann <ng0@n0.is> | 2018-06-13 08:05:15 +0000 |
---|---|---|
committer | Nils Gillmann <ng0@n0.is> | 2018-06-13 08:05:15 +0000 |
commit | 5c7f4f919d2569f49e4223d77000452dd2ec4e97 (patch) | |
tree | 8cec76a5dda6b034d1e5b85eee76a43fafd8a4a5 /doc | |
parent | 1f7a2dd68d1e6260fad4af042878c0a07d39bc12 (diff) | |
parent | 8503c6fa26449228fa691c1dedfe3ca1a8d0b9ba (diff) | |
download | gnunet-5c7f4f919d2569f49e4223d77000452dd2ec4e97.tar.gz gnunet-5c7f4f919d2569f49e4223d77000452dd2ec4e97.zip |
Merge branch 'master' of gnunet.org:gnunet
Signed-off-by: Nils Gillmann <ng0@n0.is>
Diffstat (limited to 'doc')
-rw-r--r-- | doc/.gitignore | 2 | ||||
-rw-r--r-- | doc/man/gnunet-namestore-fcfsd.1 | 19 |
2 files changed, 11 insertions, 10 deletions
diff --git a/doc/.gitignore b/doc/.gitignore index c56a90359..b12f3e008 100644 --- a/doc/.gitignore +++ b/doc/.gitignore | |||
@@ -19,4 +19,4 @@ gnunet.t2p/ | |||
19 | gnunet-c-tutorial.t2p/ | 19 | gnunet-c-tutorial.t2p/ |
20 | *.t2p/ | 20 | *.t2p/ |
21 | documentation/manuals | 21 | documentation/manuals |
22 | .\#* \ No newline at end of file | 22 | .\#*doxygen/gnunet.tag |
diff --git a/doc/man/gnunet-namestore-fcfsd.1 b/doc/man/gnunet-namestore-fcfsd.1 index 6b13c3db4..7fc4093c2 100644 --- a/doc/man/gnunet-namestore-fcfsd.1 +++ b/doc/man/gnunet-namestore-fcfsd.1 | |||
@@ -17,19 +17,18 @@ names to be mapped to their GNS zone. Names are made available on a | |||
17 | First Come First Served basis (hence fcfs). Registered names do not | 17 | First Come First Served basis (hence fcfs). Registered names do not |
18 | expire. The HTTP server is run on the port that is specified in the | 18 | expire. The HTTP server is run on the port that is specified in the |
19 | configuration file in section "[fcfsd]" under the name "HTTPPORT". | 19 | configuration file in section "[fcfsd]" under the name "HTTPPORT". |
20 | The key of the zone in which the names are registered must be | 20 | |
21 | specified under the name "ZONEKEY" in the same section. It is | 21 | It is possible to manage gnunet\-gns\-fcfsd using |
22 | possible to manage gnunet\-gns\-fcfsd using gnunet\-(service\-arm) by | 22 | gnunet\-(service\-arm) by starting the daemon using "gnunet\-arm \-i |
23 | starting the daemon using "gnunet\-arm \-i fcfsd" or by setting | 23 | fcfsd" or by setting "FORCESTART=YES" in the "fcfds" section of your |
24 | "FORCESTART=YES" in the "fcfds" section of your configuration. | 24 | configuration and the "-z ZONE" in as the "OPTION". |
25 | 25 | ||
26 | An FCFS\-zone is run at http://gnunet.org/fcfs/. GNS users are | 26 | An FCFS\-zone is run at http://gnunet.org/fcfs/. GNS users are |
27 | encouraged to register their zone with the gnunet.org FCFS authority. | 27 | encouraged to register their zone with the gnunet.org FCFS authority. |
28 | 28 | ||
29 | If you want to run your own FCFS registrar, you need to first create a | 29 | If you want to run your own FCFS registrar, you need to first create a |
30 | pseudonym (using "gnunet\-identity \-C NAME"), and then assign it to | 30 | pseudonym (using "gnunet\-identity \-C NAME"), and use it with the |
31 | be used for the "fcfsd" service using "gnunet\-identity \-e NAME \-s | 31 | "-z" option. After that, you can start the FCFSD service (possibly using |
32 | fcfsd". After that, you can start the FCFSD service (possibly using | ||
33 | gnunet\-arm). | 32 | gnunet\-arm). |
34 | 33 | ||
35 | .SH OPTIONS | 34 | .SH OPTIONS |
@@ -46,7 +45,9 @@ ERROR. | |||
46 | .B | 45 | .B |
47 | .IP "\-v, \-\-version" | 46 | .IP "\-v, \-\-version" |
48 | Print GNUnet version number. | 47 | Print GNUnet version number. |
49 | 48 | .B | |
49 | .IP "\-z EGO, \-\-zone=EGO" | ||
50 | Specifies for which EGO should FCFSD manage the zone. | ||
50 | 51 | ||
51 | .SH BUGS | 52 | .SH BUGS |
52 | Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending electronic mail to <bug\-gnunet@gnu.org> | 53 | Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending electronic mail to <bug\-gnunet@gnu.org> |