[BUGFIX] Better description of [BE][unzip_path]/[BE][diff_path] 80/25680/5
authorMarkus Klein <klein.t3@mfc-linz.at>
Tue, 26 Nov 2013 00:29:37 +0000 (01:29 +0100)
committerStefan Neufeind <typo3.neufeind@speedpartner.de>
Fri, 24 Jan 2014 00:28:27 +0000 (01:28 +0100)
The options [BE][unzip_path] and [BE][diff_path] expect different values.
Adjust the descriptions accordingly.

Resolves: #53964
Releases: 6.2, 6.1, 6.0
Change-Id: Id433091f2be77f5c13304619e080a2d1adfb7b0c
Reviewed-on: https://review.typo3.org/25680
Reviewed-by: Wouter Wolters
Tested-by: Wouter Wolters
Reviewed-by: Stefan Neufeind
Tested-by: Stefan Neufeind
typo3/sysext/core/Configuration/DefaultConfiguration.php

index 822d9a4..853a65b 100644 (file)
@@ -299,8 +299,8 @@ return array(
                'lang' => array(
                        'debug' => FALSE
                ),
                'lang' => array(
                        'debug' => FALSE
                ),
-               'unzip_path' => '',                                                             // Path to "unzip".
-               'diff_path' => 'diff',                                                  // Path to "diff"For Windows this program can be downloaded here: <a href="http://unxutils.sourceforge.net/" target="_blank">unxutils.sourceforge.net</a>
+               'unzip_path' => '',                                                             // Path to "unzip". Only specify the path here, do not include the program name, it is expected to be called "unzip".
+               'diff_path' => 'diff',                                                  // Path to "diff" including the program name. Example: /somepath/specialdiff<br />For Windows this program can be downloaded here: <a href="http://unxutils.sourceforge.net/" target="_blank">unxutils.sourceforge.net</a>
                'fileadminDir' => 'fileadmin/',                                 // Path to the fileadmin dir. This is relative to PATH_site. (Automatically mounted for admin-users if set)
                'RTEenabled' => TRUE,                                                   // Boolean: If set, the Rich Text editor will be an option in the backend. Notice that the editor must be enabled per-user and options are configurable. See admin guide.
                'RTE_imageStorageDir' => 'uploads/',                    // Default storage directory for Rich Text Editor files
                'fileadminDir' => 'fileadmin/',                                 // Path to the fileadmin dir. This is relative to PATH_site. (Automatically mounted for admin-users if set)
                'RTEenabled' => TRUE,                                                   // Boolean: If set, the Rich Text editor will be an option in the backend. Notice that the editor must be enabled per-user and options are configurable. See admin guide.
                'RTE_imageStorageDir' => 'uploads/',                    // Default storage directory for Rich Text Editor files