From a0d4b6eee6cc34796ce2bae6339d5f6ff781c267 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 13 Nov 2014 13:40:39 +0100
Subject: [PATCH] CLI/Webserver Setup: Don't use camelCase arguments

refs #6120
---
 .../setup/application/clicommands/ConfigCommand.php  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/setup/application/clicommands/ConfigCommand.php b/modules/setup/application/clicommands/ConfigCommand.php
index d97ee8a15..4f0fcdf1b 100644
--- a/modules/setup/application/clicommands/ConfigCommand.php
+++ b/modules/setup/application/clicommands/ConfigCommand.php
@@ -73,18 +73,18 @@ class ConfigCommand extends Command
      *
      * OPTIONS:
      *
-     *  --path=<webpath>        Path for the web server, default /icingaweb
+     *  --path=<urlpath>                    The URL path to Icinga Web 2
      *
-     *  --publicPath=<wwwroot>  Path to htdocs system path
+     *  --root/--document-root=<directory>  The directory from which the webserver will serve files
      *
-     *  --file=<filename>       Write configuration to file
+     *  --file=<filename>                   Write configuration to file
      *
      *
      * EXAMPLES:
      *
      * icingacli setup config webserver apache
      *
-     * icingacli setup config webserver apache --path /icingaweb --publicPath /usr/share/icingaweb/public
+     * icingacli setup config webserver apache --path /icingaweb --document-root /usr/share/icingaweb/public
      *
      * icingacli setup config webserver apache --file /etc/apache2/conf.d/icingaweb.conf
      *
@@ -104,10 +104,10 @@ class ConfigCommand extends Command
         if (! is_string($path) || strlen(trim($path)) === 0) {
             $this->fail($this->translate('The argument --path expects a URL path'));
         }
-        $documentRoot = $this->params->get('documentRoot', $webserver->getDocumentRoot());
+        $documentRoot = $this->params->get('root', $this->params->get('document-root', $webserver->getDocumentRoot()));
         if (! is_string($documentRoot) || strlen(trim($documentRoot)) === 0) {
             $this->fail($this->translate(
-                'The argument --documentRoot expects a directory from which the webserver will serve files'
+                'The argument --root/--document-root expects a directory from which the webserver will serve files'
             ));
         }
         $webserver->setWebPath($path);