aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/documentation/chapters/developer.texi8
-rw-r--r--doc/documentation/chapters/user.texi2
-rw-r--r--doc/documentation/gnunet-c-tutorial.texi2
-rw-r--r--doc/man/gnunet-auto-share.12
-rw-r--r--doc/man/gnunet-namestore-fcfsd.12
-rw-r--r--doc/man/gnunet.conf.58
6 files changed, 12 insertions, 12 deletions
diff --git a/doc/documentation/chapters/developer.texi b/doc/documentation/chapters/developer.texi
index f4c954509..22b175a3f 100644
--- a/doc/documentation/chapters/developer.texi
+++ b/doc/documentation/chapters/developer.texi
@@ -2297,15 +2297,15 @@ is to set
2297 2297
2298@example 2298@example
2299[core] 2299[core]
2300FORCESTART = YES 2300IMMEDIATE_START = YES
2301@end example 2301@end example
2302 2302
2303@noindent 2303@noindent
2304in the configuration file. 2304in the configuration file.
2305Alternatively, having any service that directly or indirectly depends on 2305Alternatively, having any service that directly or indirectly depends on
2306@code{CORE} being started with @code{FORCESTART} will also do. 2306@code{CORE} being started with @code{IMMEDIATE_START} will also do.
2307This issue largely arises if users try to over-optimize by not 2307This issue largely arises if users try to over-optimize by not
2308starting any services with @code{FORCESTART}. 2308starting any services with @code{IMMEDIATE_START}.
2309 2309
2310@c *********************************************************************** 2310@c ***********************************************************************
2311@node ATS must want the connections 2311@node ATS must want the connections
@@ -3705,7 +3705,7 @@ running a service with "valgrind" or "gdb"
3705@item START_ON_DEMAND ARM will listen to UNIX domain socket and/or TCP port of 3705@item START_ON_DEMAND ARM will listen to UNIX domain socket and/or TCP port of
3706the service and start the service on-demand. 3706the service and start the service on-demand.
3707 3707
3708@item FORCESTART ARM will always start this service when the peer 3708@item IMMEDIATE_START ARM will always start this service when the peer
3709is started. 3709is started.
3710 3710
3711@item ACCEPT_FROM IPv4 addresses the service accepts connections from. 3711@item ACCEPT_FROM IPv4 addresses the service accepts connections from.
diff --git a/doc/documentation/chapters/user.texi b/doc/documentation/chapters/user.texi
index 3b829559b..3d4f55e41 100644
--- a/doc/documentation/chapters/user.texi
+++ b/doc/documentation/chapters/user.texi
@@ -3703,7 +3703,7 @@ gnunet-arm -c ~/.config/gnunet.conf -k fs
3703@noindent 3703@noindent
3704Assuming that you want certain services (like file-sharing) to be always 3704Assuming that you want certain services (like file-sharing) to be always
3705automatically started whenever you start GNUnet, you can activate them by 3705automatically started whenever you start GNUnet, you can activate them by
3706setting "FORCESTART=YES" in the respective section of the configuration 3706setting "IMMEDIATE_START=YES" in the respective section of the configuration
3707file (for example, "[fs]"). Then GNUnet with file-sharing support would 3707file (for example, "[fs]"). Then GNUnet with file-sharing support would
3708be started whenever you@ enter: 3708be started whenever you@ enter:
3709 3709
diff --git a/doc/documentation/gnunet-c-tutorial.texi b/doc/documentation/gnunet-c-tutorial.texi
index 0e2adaee7..fb6e717ae 100644
--- a/doc/documentation/gnunet-c-tutorial.texi
+++ b/doc/documentation/gnunet-c-tutorial.texi
@@ -647,7 +647,7 @@ If you want to use the @code{peerinfo} tool to connect your
647peers, you should: 647peers, you should:
648 648
649@itemize 649@itemize
650@item Set @code{FORCESTART = NO} in section @code{hostlist} 650@item Set @code{IMMEDIATE_START = NO} in section @code{hostlist}
651(to not connect to the global GNUnet) 651(to not connect to the global GNUnet)
652@item Start both peers running @command{gnunet-arm -c peer1.conf -s} 652@item Start both peers running @command{gnunet-arm -c peer1.conf -s}
653and @command{gnunet-arm -c peer2.conf -s} 653and @command{gnunet-arm -c peer2.conf -s}
diff --git a/doc/man/gnunet-auto-share.1 b/doc/man/gnunet-auto-share.1
index f655f6ccd..fc2668d44 100644
--- a/doc/man/gnunet-auto-share.1
+++ b/doc/man/gnunet-auto-share.1
@@ -111,7 +111,7 @@ Share a directory "$HOME/gnunet\-share/":
111 111
112 [gnunet-auto-share] 112 [gnunet-auto-share]
113 OPTIONS = $HOME/gnunet\-share 113 OPTIONS = $HOME/gnunet\-share
114 FORCESTART = YES # start this service when the peer starts 114 IMMEDIATE_START = YES # start this service when the peer starts
115 115
116.SH FILES 116.SH FILES
117.TP 117.TP
diff --git a/doc/man/gnunet-namestore-fcfsd.1 b/doc/man/gnunet-namestore-fcfsd.1
index 7fc4093c2..88ab72071 100644
--- a/doc/man/gnunet-namestore-fcfsd.1
+++ b/doc/man/gnunet-namestore-fcfsd.1
@@ -20,7 +20,7 @@ configuration file in section "[fcfsd]" under the name "HTTPPORT".
20 20
21It is possible to manage gnunet\-gns\-fcfsd using 21It is possible to manage gnunet\-gns\-fcfsd using
22gnunet\-(service\-arm) by starting the daemon using "gnunet\-arm \-i 22gnunet\-(service\-arm) by starting the daemon using "gnunet\-arm \-i
23fcfsd" or by setting "FORCESTART=YES" in the "fcfds" section of your 23fcfsd" or by setting "IMMEDIATE_START=YES" in the "fcfds" section of your
24configuration and the "-z ZONE" in as the "OPTION". 24configuration and the "-z ZONE" in as the "OPTION".
25 25
26An FCFS\-zone is run at http://gnunet.org/fcfs/. GNS users are 26An FCFS\-zone is run at http://gnunet.org/fcfs/. GNS users are
diff --git a/doc/man/gnunet.conf.5 b/doc/man/gnunet.conf.5
index b0f1c152c..3dd8c7b62 100644
--- a/doc/man/gnunet.conf.5
+++ b/doc/man/gnunet.conf.5
@@ -55,7 +55,7 @@ The following options are generic and shared by all services:
55 This is usually "localhost". 55 This is usually "localhost".
56.IP BINARY 56.IP BINARY
57 The filename that implements the service. For example "gnunet-service-ats". 57 The filename that implements the service. For example "gnunet-service-ats".
58.IP FORCESTART 58.IP IMMEDIATE_START
59 Start the service always when the peer starts. Set to YES for services 59 Start the service always when the peer starts. Set to YES for services
60 that should always be launched, even if no other service explicitly needs 60 that should always be launched, even if no other service explicitly needs
61 them. 61 them.
@@ -66,13 +66,13 @@ The following options are generic and shared by all services:
66 Set to YES to never have ARM bind to the respective socket. This option is 66 Set to YES to never have ARM bind to the respective socket. This option is
67 mostly for debugging in situations where ARM cannot pass the pre-bound 67 mostly for debugging in situations where ARM cannot pass the pre-bound
68 socket to the child due to interference from PREFIX-commands. 68 socket to the child due to interference from PREFIX-commands.
69 This option is only effective in combination with FORCESTART being YES. 69 This option is only effective in combination with IMMEDIATE_START being YES.
70 NO by default. 70 NO by default.
71.IP PREFIX 71.IP PREFIX
72 PREFIX the given command (with its arguments) to the actual BINARY to be 72 PREFIX the given command (with its arguments) to the actual BINARY to be
73 executed. Useful to run certain services under special supervisors (like 73 executed. Useful to run certain services under special supervisors (like
74 strace or valgrind). Typically used in combination with FORCESTART and 74 strace or valgrind). Typically used in combination with IMMEDIATE_START
75 NOARMBIND. Empty by default. 75 and NOARMBIND. Empty by default.
76.IP ACCEPT_FROM 76.IP ACCEPT_FROM
77 A semi-column separated list of IPv4 addresses that are allowed to use 77 A semi-column separated list of IPv4 addresses that are allowed to use
78 the service; usually 127.0.0.1. 78 the service; usually 127.0.0.1.