Merge branch 'hotfix/9.4.01' into develop

source/command-line.rst

@@ -4,7 +4,7 @@ Command line tools
 Since GLPI 9.2.2, command line tools are provided as supported scripts and are available from the ``scripts`` directory of the archive. On previous versions, those scripts were present in the ``tools`` directory that is not official and therefore not in the release archive.
 
 Since GLPI 9.4.0, command line tools are being centralized in a console application (``bin/console``).
-Calling ``bin/console`` from GLPI directory displays the list of available commands.
+Calling ``php bin/console`` from GLPI directory displays the list of available commands.
 
 .. note::
 
@@ -30,7 +30,7 @@ For every console command, following options are available:
 Install
 -------
 
-The ``bin/console db:install`` has been made to install GLPI database in CLI mode.
+The ``php bin/console db:install`` has been made to install GLPI database in CLI mode.
 
 Possible options for this command are:
 
@@ -51,7 +51,7 @@ See also :ref:`console options <cdline_options>`.
 Update
 ------
 
-The ``bin/console db:update`` has been made to update GLPI database in CLI mode from a previously installed version.
+The ``php bin/console db:update`` has been made to update GLPI database in CLI mode from a previously installed version.
 
 There is no required arguments, just run the command so it updates your database automatically.
 
@@ -71,13 +71,13 @@ Database tools
 
 Database schema check
 ^^^^^^^^^^^^^^^^^^^^^
-The ``bin/console db:check`` command can be used to check if your database schema differs from expected one.
+The ``php bin/console db:check`` command can be used to check if your database schema differs from expected one.
 
 If you have any diff, output will looks like :
 
 .. code-block:: none
 
-    $ bin/console glpi:database:check
+    $ php bin/console glpi:database:check
     Table schema differs for table "glpi_rulecriterias".
     --- Original
     +++ New
@@ -97,7 +97,7 @@ Tasks tools
 Task unlock
 ^^^^^^^^^^^
 
-The ``bin/console task:unlock`` command can be used to unlock stucked cron tasks.
+The ``php bin/console task:unlock`` command can be used to unlock stucked cron tasks.
 
 .. warning::
 
@@ -122,7 +122,7 @@ From MyISAM to InnoDB
 
 Since version 9.3.0, GLPI uses the ``InnoDB`` engine instead of previously used ``MyISAM`` engine.
 
-The ``bin/console glpi:migration:myisam_to_innodb`` command can be used to migrate exiting tables to ``InnoDB`` engine.
+The ``php bin/console glpi:migration:myisam_to_innodb`` command can be used to migrate exiting tables to ``InnoDB`` engine.
 
 Missing timestamps builder
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -131,4 +131,4 @@ Missing timestamps builder
 
 Prior to GLPI 9.1.0, fields corresponding to creation and modification dates were not existing.
 
-The ``bin/console glpi:migration:build_missing_timestamps`` command can be used to rebuild missing values using available logs.
+The ``php bin/console glpi:migration:build_missing_timestamps`` command can be used to rebuild missing values using available logs.

source/install/index.rst

@@ -82,10 +82,17 @@ Following this instructions, we'll create a ``inc/downstream.php`` file into GLP
    <?php
    define('GLPI_CONFIG_DIR', '/etc/glpi/');
 
+   if (file_exists(GLPI_CONFIG_DIR . '/local_define.php')) {
+      require_once GLPI_CONFIG_DIR . '/local_define.php';
+   }
+
+
 .. warning::
 
    GLPI packages will certainly provide a ``inc/downstream.php`` file. This one must not be edited!
 
+   GLPI looks for a `local_define.php` file in its own `config` directory. If you want to use one form new config directory, you have to load it.
+
 Then, create a file in ``/etc/glpi/local_define.php`` with the following contents:
 
 .. code-block:: php
@@ -121,10 +128,6 @@ Then, create a file in ``/etc/glpi/local_define.php`` with the following content
 
       Of course, it is always possible to redefine any of those paths if needed.
 
-.. note::
-
-   GLPI configuration directory cannot be defined in the ``local_define.php`` file just because this one will be... in the configuration directory itself ;)
-
 Post installation
 -----------------
 

source/prerequisites.rst

@@ -68,11 +68,11 @@ PHP configuration file (``php.ini``) must be adapted to reflect following variab
 
     memory_limit = 64M ;        // max memory limit
     file_uploads = on ;
-    max_execution_time = 600 ;  // not mandatory but adviced
-    register_globals = off ;    // not mandatory but adviced
+    max_execution_time = 600 ;  // not mandatory but recommended
+    register_globals = off ;    // not mandatory but recommended
     magic_quotes_sybase = off ;
     session.auto_start = off ;
-    session.use_trans_sid = 0 ; // not mandatory but adviced
+    session.use_trans_sid = 0 ; // not mandatory but recommended
 
 Database
 --------

source/update.rst

@@ -9,7 +9,7 @@ Update
    * backup your files directory;
    * backup your configuration.
 
-GLPI update process is automated. To start it, just go to your GLPI instance URI, or (recommended) use the :doc:`command line tools <command-line>`.
+First, download latest GLPI version and extract files. GLPI update process is then automated. To start it, just go to your GLPI instance URI, or (recommended) use the :doc:`command line tools <command-line>`.
 
 Once a new version will be installed; you will not be able to use the application until a migration has been done.