From 33b72f9e1b3724f77bfb5d91313af7db7d3e4e2e Mon Sep 17 00:00:00 2001
From: Vladimir Sapronov <vladimir.sapronov@gmail.com>
Date: Mon, 7 Oct 2013 14:54:25 -0400
Subject: [PATCH] Partial automatic configuration, pull request:
 https://github.com/owncloud/core/pull/4982

---
 .../configuration_automation.rst              | 78 ++++++++++++++-----
 1 file changed, 58 insertions(+), 20 deletions(-)

diff --git a/admin_manual/configuration/configuration_automation.rst b/admin_manual/configuration/configuration_automation.rst
index 9caa39a2b..3ba0ebcac 100644
--- a/admin_manual/configuration/configuration_automation.rst
+++ b/admin_manual/configuration/configuration_automation.rst
@@ -4,7 +4,9 @@ Automatic Configuration
 If you need to install ownCloud on multiple servers you normally do not want
 to set-up each instance separately as described in the :doc:`configuration_database`. For this reason the automatic configuration feature has been introduced.
 
-To take advantage of this feature you need to create a configuration file, called :file:`../owncloud/config/autoconfig.php` and set the parameters as required. The file will automatically be removed after the initial configuration has been applied.
+To take advantage of this feature you need to create a configuration file, called :file:`../owncloud/config/autoconfig.php` and set the parameters as required. You can provide all parameters or just part of them - parameters which haven't been provided (if any) will be asked at "Finish setup" screen at first run of ownCloud.
+
+The :file:`../owncloud/config/autoconfig.php` will be automatically removed after the initial configuration has been applied.
 
 Parameters
 ----------
@@ -19,8 +21,25 @@ configuration file compared to the normal :file:`config.php`.
 | dbpass         | dbpassword    |
 +----------------+---------------+
 
+Sample Automatic Configurations
+-------------------------------
+
+Data Directory
+~~~~~~~~~~~~~~
+With the configuration below the "Finish setup" screen still will ask for database and admin credentials settings.
+
+.. code-block:: php
+
+    <?php
+    $AUTOCONFIG = array(
+      "directory"     => "/www/htdocs/owncloud/data",
+    );
+
+
 SQLite Database
 ~~~~~~~~~~~~~~~
+With the configuration below the "Finish setup" screen still will ask for data directory and admin credentials settings.
+
 .. code-block:: php
 
     <?php
@@ -28,13 +47,50 @@ SQLite Database
       "dbtype"        => "sqlite",
       "dbname"        => "owncloud",
       "dbtableprefix" => "",
-      "directory"     => "/www/htdocs/owncloud/data",
     );
 
 MySQL Database
 ~~~~~~~~~~~~~~
 Keep in mind that the automatic configuration does not unburden you from creating the database user and database in advance, as described in :doc:`configuration_database`.
 
+With the configuration below the "Finish setup" screen still will ask for data directory and admin credentials settings.
+
+.. code-block:: php
+
+    <?php
+    $AUTOCONFIG = array(
+      "dbtype"        => "mysql",
+      "dbname"        => "owncloud",
+      "dbuser"        => "username",
+      "dbpass"        => "password",
+      "dbhost"        => "localhost",
+      "dbtableprefix" => "",
+    );
+
+PostgreSQL Database
+~~~~~~~~~~~~~~~~~~~
+Keep in mind that the automatic configuration does not unburden you from creating the database user and database in advance, as described in :doc:`configuration_database`.
+
+With the configuration below the "Finish setup" screen still will ask for data directory and admin credentials settings.
+
+.. code-block:: php
+
+    <?php
+    $AUTOCONFIG = array(
+      "dbtype"        => "pgsql",
+      "dbname"        => "owncloud",
+      "dbuser"        => "username",
+      "dbpass"        => "password",
+      "dbhost"        => "localhost",
+      "dbtableprefix" => "",
+    );
+    
+All Parameters
+~~~~~~~~~~~~~~
+Keep in mind that the automatic configuration does not unburden you from creating the database user and database in advance, as described in :doc:`configuration_database`.
+
+With the configuration below "Finish setup" will be skipped at first ownCloud run since all parameters are already preconfigured.
+
 .. code-block:: php
 
     <?php
@@ -50,21 +106,3 @@ Keep in mind that the automatic configuration does not unburden you from creatin
       "directory"     => "/www/htdocs/owncloud/data",
     );
 
-PostgreSQL Database
-~~~~~~~~~~~~~~~~~~~
-Keep in mind that the automatic configuration does not unburden you from creating the database user and database in advance, as described in :doc:`configuration_database`.
-
-.. code-block:: php
-
-    <?php
-    $AUTOCONFIG = array(
-      "dbtype"        => "pgsql",
-      "dbname"        => "owncloud",
-      "dbuser"        => "username",
-      "dbpass"        => "password",
-      "dbhost"        => "localhost",
-      "dbtableprefix" => "",
-      "adminlogin"    => "root",
-      "adminpass"     => "root-password",
-      "directory"     => "/www/htdocs/owncloud/data",
-    );