Merge branch 'master' of git+ssh://gnunet.org/gnunet

3 files changed, 11 insertions, 11 deletions

diff --git a/doc/documentation/chapters/developer.texi b/doc/documentation/chapters/developer.texi
index 10319e7a6..6d85c813f 100644
--- a/doc/documentation/chapters/developer.texi
+++ b/doc/documentation/chapters/developer.texi
@@ -1362,8 +1362,8 @@ Next, edit the file @file{/etc/gnunet.conf} to contain the following:
 
 @example
 [arm]
-SYSTEM_ONLY = YES
-USER_ONLY = NO
+START_SYSTEM_SERVICES = YES
+START_USER_SERVICES = NO
 @end example
 
 @noindent
@@ -1409,8 +1409,8 @@ with the lines:
 
 @example
 [arm]
-SYSTEM_ONLY = NO
-USER_ONLY = YES
+START_SYSTEM_SERVICES = NO
+START_USER_SERVICES = YES
 DEFAULTSERVICES = gns
 @end example
 
diff --git a/doc/documentation/chapters/user.texi b/doc/documentation/chapters/user.texi
index 07dd781b0..fa742b229 100644
--- a/doc/documentation/chapters/user.texi
+++ b/doc/documentation/chapters/user.texi
@@ -3742,8 +3742,8 @@ contain the lines:@
 
 @example
 [arm]
-SYSTEM_ONLY = YES
-USER_ONLY = NO
+START_SYSTEM_SERVICES = YES
+START_USER_SERVICES = NO
 @end example
 
 @noindent
@@ -3771,8 +3771,8 @@ $USER with the lines:
 
 @example
 [arm]
-SYSTEM_ONLY = NO
-USER_ONLY = YES
+START_SYSTEM_SERVICES = NO
+START_USER_SERVICES = YES
 @end example
 
 @noindent
diff --git a/doc/man/gnunet.conf.5 b/doc/man/gnunet.conf.5
index 707964579..1a94a0a66 100644
--- a/doc/man/gnunet.conf.5
+++ b/doc/man/gnunet.conf.5
@@ -88,7 +88,7 @@ The following options are generic and shared by all services:
 .IP UNIX_MATCH_GID
     If UNIX domain sockets are used, set this to YES if only users with the same
     GID are allowed to access the service.
-.IP USER_SERVICE
+.IP RUN_PER_USER
     Set to YES if this service should be run per-user, NO if this is a system
     service.  End-users should never have to change the defaults GNUnet provides
     for this option.
@@ -137,8 +137,8 @@ to the actual external address for your usage.
     EXTERNAL_ADDRESS = 157.166.249.10
 
     [arm]
-    SYSTEM_ONLY = YES
-    USER_ONLY = NO
+    START_SYSTEM_SERVICES = YES
+    START_USER_SERVICES = NO
 
 .SH FILES
 .TP