3 files changed, 7 insertions, 7 deletions

diff --git a/doc/documentation/chapters/developer.texi b/doc/documentation/chapters/developer.texi
index 6d85c813f..f4c954509 100644
--- a/doc/documentation/chapters/developer.texi
+++ b/doc/documentation/chapters/developer.texi
@@ -3702,7 +3702,7 @@ running a service with "valgrind" or "gdb"
 
 @item DEBUG Run in debug mode (much verbosity).
 
-@item AUTOSTART ARM will listen to UNIX domain socket and/or TCP port of
+@item START_ON_DEMAND ARM will listen to UNIX domain socket and/or TCP port of
 the service and start the service on-demand.
 
 @item FORCESTART ARM will always start this service when the peer
@@ -3716,7 +3716,7 @@ is started.
 
 
 Options that impact the operation of ARM overall are in the "[arm]"
-section. ARM is a normal service and has (except for AUTOSTART) all of the
+section. ARM is a normal service and has (except for START_ON_DEMAND) all of the
 options that other services do. In addition, ARM has the
 following options:
 
@@ -8642,11 +8642,11 @@ In the following paragraph the important details are highlighted.
 
 Announcing of the regular expressions is done by the
 gnunet-daemon-regexprofiler, therefore you have to make sure it is
-started, by adding it to the AUTOSTART set of ARM:
+started, by adding it to the START_ON_DEMAND set of ARM:
 
 @example
 [regexprofiler]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 @end example
 
 @noindent
diff --git a/doc/documentation/chapters/user.texi b/doc/documentation/chapters/user.texi
index fa742b229..3b829559b 100644
--- a/doc/documentation/chapters/user.texi
+++ b/doc/documentation/chapters/user.texi
@@ -2574,7 +2574,7 @@ sqLite, MySQL and Postgres.
 
 In order to use GNUnet for file-sharing, you first need to make sure
 that the file-sharing service is loaded.
-This is done by setting the @code{AUTOSTART} option in
+This is done by setting the @code{START_ON_DEMAND} option in
 section @code{[fs]} to "YES". Alternatively, you can run
 
 @example
@@ -2666,7 +2666,7 @@ The configuration section for the transport service itself is quite
 similar to all the other services
 
 @example
-AUTOSTART = YES
+START_ON_DEMAND = YES
 @@UNIXONLY@@ PORT = 2091
 HOSTNAME = localhost
 HOME = $SERVICEHOME
diff --git a/doc/man/gnunet.conf.5 b/doc/man/gnunet.conf.5
index 1a94a0a66..b0f1c152c 100644
--- a/doc/man/gnunet.conf.5
+++ b/doc/man/gnunet.conf.5
@@ -59,7 +59,7 @@ The following options are generic and shared by all services:
     Start the service always when the peer starts.  Set to YES for services
     that should always be launched, even if no other service explicitly needs
     them.
-.IP AUTOSTART
+.IP START_ON_DEMAND
     Set to YES to automatically start the service when it is requested by
     another service. YES for most GNUnet services.
 .IP NOARMBIND