From 69b27f6d6c4522864556394db870a935b04056b0 Mon Sep 17 00:00:00 2001
From: Georg Ringer <georg.ringer@gmail.com>
Date: Thu, 30 Mar 2017 05:48:51 +0200
Subject: [PATCH] [TASK] Improve wording in Install Tool
- Fix typos
- Remove outdated text
- Wrap code into <code> tags
Resolves: #80563
Releases: master
Change-Id: Idfb65c294aaf62198d5581a89ab03b3678ab7ee1
Reviewed-on: https://review.typo3.org/52253
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Thomas Hohn <thomas@hohn.dk>
Tested-by: Thomas Hohn <thomas@hohn.dk>
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
Reviewed-by: Benni Mack <benni@typo3.org>
Tested-by: Benni Mack <benni@typo3.org>
---
.../DefaultConfigurationDescription.php | 50 +++++++++----------
.../Action/Tool/AllConfiguration.html | 4 +-
.../Templates/Action/Tool/Configuration.html | 4 +-
3 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/typo3/sysext/core/Configuration/DefaultConfigurationDescription.php b/typo3/sysext/core/Configuration/DefaultConfigurationDescription.php
index a62f6e7b1cd5..00d14779277b 100644
--- a/typo3/sysext/core/Configuration/DefaultConfigurationDescription.php
+++ b/typo3/sysext/core/Configuration/DefaultConfigurationDescription.php
@@ -16,16 +16,16 @@ return [
'GFX' => [ // Configuration of the image processing features in TYPO3. 'IM' and 'GD' are short for ImageMagick and GD library respectively.
'thumbnails' => 'Boolean: Enables the use of thumbnails in the backend interface.',
'thumbnails_png' => 'Boolean. If false, thumbnails from non-image files will be converted to \'gif\', otherwise \'png\' (default).',
- 'gif_compress' => 'Boolean: Enables the use of the \\TYPO3\\CMS\\Core\\Utility\\GeneralUtility::gifCompress() workaround function for compressing giffiles made with GD or IM, which probably use only RLE or no compression at all.',
+ 'gif_compress' => 'Boolean: Enables the use of the <code>\\TYPO3\\CMS\\Core\\Utility\\GeneralUtility::gifCompress()</code> workaround function for compressing giffiles made with GD or IM, which probably use only RLE or no compression at all.',
'imagefile_ext' => 'Commalist of file extensions perceived as images by TYPO3. List should be set to \'gif,png,jpeg,jpg\' if IM is not available. Lowercase and no spaces between!',
'gdlib' => 'Boolean: Enables the use of GD.',
'gdlib_png' => 'Boolean: Enables the use of GD, with PNG only. This means that all items normally generated as gif-files will be png-files instead!',
'processor_enabled' => 'Boolean: Enables the use of Image- or GraphicsMagick.',
'processor_path' => 'Path to the IM tools \'convert\', \'combine\', \'identify\'.',
- 'processor_path_lzw' => 'Path to the IM tool \'convert\' with LZW enabled! See \'gif_compress\'. If your version 4.2.9 of ImageMagick is compiled with LZW you may leave this field blank AND disable the flag \'gif_compress\'! Tip: You can call LZW \'convert\' with a prefix like \'myver_convert\' by setting this path with it, eg. \'/usr/bin/myver_\' instead of just \'/usr/bin/\'.',
+ 'processor_path_lzw' => 'Path to the IM tool \'convert\' with LZW enabled! See \'gif_compress\'. If your version 4.2.9 of ImageMagick is compiled with LZW you may leave this field blank AND disable the flag \'gif_compress\'! Tip: You can call LZW \'convert\' with a prefix like \'myver_convert\' by setting this path with it, eg. <code>/usr/bin/myver_</code> instead of just <code>/usr/bin/</code>.',
'processor' => 'String: Set this either to "ImageMagick" or "GraphicsMagick". Setting this value will automatically configure some settings for use with the specified program version.',
'processor_effects' => '<p>Integer (-1, 0, 1)</p><dl><dt>0</dt><dd>disabled</dd><dt>-1</dt><dd>Do not sharpen images by default</dd><dt>1</dt><dd>All; blur and sharpening is allowed in ImageMagick.</dd></dl>',
- 'processor_allowUpscaling' => 'Boolean: If set, images can be scaled up if told so (in \\TYPO3\\CMS\\Core\\Imaging\\GraphicalFunctions)',
+ 'processor_allowUpscaling' => 'Boolean: If set, images can be scaled up if told so (in <code>\\TYPO3\\CMS\\Core\\Imaging\\GraphicalFunctions</code>)',
'processor_allowFrameSelection' => 'Boolean: If set, the [x] frame selector is appended to input filenames in stdgraphic. This speeds up image processing for PDF files considerably. Disable if your image processor or environment can\'t cope with the frame selection.',
'processor_allowTemporaryMasksAsPng' => 'Boolean: This should be set if your processor supports using PNGs as masks as this is usually faster.',
'processor_stripColorProfileByDefault' => 'Boolean: If set, the processor_stripColorProfileCommand is used with all processor image operations by default. See tsRef for setting this parameter explicitly for IMAGE generation.',
@@ -38,14 +38,14 @@ return [
'fileCreateMask' => 'File mode mask for Unix file systems (when files are uploaded/created).',
'folderCreateMask' => 'As above, but for folders.',
'createGroup' => 'Group for newly created files and folders (Unix only). Group ownership can be changed on Unix file systems (see above). Set this if you want to change the group ownership of created files/folders to a specific group. This makes sense in all cases where the webserver is running with a different user/group as you do. Create a new group on your system and add you and the webserver user to the group. Now you can safely set the last bit in fileCreateMask/folderCreateMask to 0 (e.g. 770). Important: The user who is running your webserver needs to be a member of the group you specify here! Otherwise you might get some error messages.',
- 'sitename' => 'Name of the base-site. This title shows up in the root of the tree structure if you\'re an \'admin\' backend user.',
- 'encryptionKey' => 'This is a "salt" used for various kinds of encryption, CRC checksums and validations. You can enter any rubbish string here but try to keep it secret. You should notice that a change to this value might invalidate temporary information, URLs etc. At least, clear all cache if you change this so any such information can be rebuild with the new key.',
- 'cookieDomain' => 'Restricts the domain name for FE and BE session cookies. When setting the value to ".domain.com" (replace domain.com with your domain!), login sessions will be shared across subdomains. Alternatively, if you have more than one domain with sub-domains, you can set the value to a regular expression to match against the domain of the HTTP request. The result of the match is used as the domain for the cookie. eg. /\\.(example1|example2)\\.com$/ or /\\.(example1\\.com)|(example2\\.net)$/. Separate domains for FE and BE can be set using <a href="#FE-cookieDomain">$TYPO3_CONF_VARS[\'FE\'][\'cookieDomain\']</a> and <a href="#BE-cookieDomain">$TYPO3_CONF_VARS[\'BE\'][\'cookieDomain\']</a> respectively.',
+ 'sitename' => 'Name of the base-site.',
+ 'encryptionKey' => 'This is a "salt" used for various kinds of encryption, CRC checksums and validations. You can enter any rubbish string here but try to keep it secret. You should notice that a change to this value might invalidate temporary information, URLs etc. At least, clear all cache if you change this so any such information can be rebuilt with the new key.',
+ 'cookieDomain' => 'Restricts the domain name for FE and BE session cookies. When setting the value to ".domain.com" (replace domain.com with your domain!), login sessions will be shared across subdomains. Alternatively, if you have more than one domain with sub-domains, you can set the value to a regular expression to match against the domain of the HTTP request. The result of the match is used as the domain for the cookie. eg. <code>/\\.(example1|example2)\\.com$/</code> or <code>/\\.(example1\\.com)|(example2\\.net)$/</code>. Separate domains for FE and BE can be set using <a href="#FE-cookieDomain">$TYPO3_CONF_VARS[\'FE\'][\'cookieDomain\']</a> and <a href="#BE-cookieDomain">$TYPO3_CONF_VARS[\'BE\'][\'cookieDomain\']</a> respectively.',
'cookieSecure' => '<p>Integer (0, 1, 2): Indicates that the cookie should only be transmitted over a secure HTTPS connection from the client.</p><dl><dt>0</dt><dd>always send cookie</dd><dt>1 (force HTTPS)</dt><dd>the cookie will only be set if a secure (HTTPS) connection exists - use this in combination with lockSSL since otherwise the application will fail and throw an exception</dd><dt>2</dt><dd>the cookie will be set in each case, but uses the secure flag if a secure (HTTPS) connection exists.</dd></dl>',
'doNotCheckReferer' => 'Boolean: If set, it\'s NOT checked numerous places that the referring host is the same as the current. This is an option you should set if you have problems with proxies not passing the HTTP_REFERER variable.',
'recursiveDomainSearch' => 'Boolean: If set, the search for domain records will be done recursively by stripping parts of the hostname off until a matching domain record is found.',
'trustedHostsPattern' => 'String: Regular expression pattern that matches all allowed hostnames (including their ports) of this TYPO3 installation, or the string "SERVER_NAME" (default). The default value <code>SERVER_NAME</code> checks if the HTTP Host header equals the SERVER_NAME and SERVER_PORT. This is secure in correctly configured hosting environments and does not need further configuration. If you cannot change your hosting environment, you can enter a regular expression here. Examples: <code>.*\\.domain\\.com</code> matches all hosts that end with <code>.domain.com</code> with all corresponding subdomains. <code>(.*\\.domain|.*\\.otherdomain)\\.com</code> matches all hostnames with subdomains from <code>.domain.com</code> and <code>.otherdomain.com</code>. Be aware that HTTP Host header may also contain a port. If your installation runs on a specific port, you need to explicitly allow this in your pattern, e.g. <code>www\\.domain\\.com:88</code> allows only <code>www.domain.com:88</code>, <strong>not</strong> <code>www.domain.com</code>. To disable this check completely (not recommended because it is <strong>insecure</strong>) you can use ".*" as pattern.',
- 'devIPmask' => 'Defines a list of IP addresses which will allow development-output to display. The debug() function will use this as a filter. See the function \\TYPO3\\CMS\\Core\\Utility\\GeneralUtility::cmpIP() for details on syntax. Setting this to blank value will deny all. Setting to "*" will allow all.',
+ 'devIPmask' => 'Defines a list of IP addresses which will allow development-output to display. The debug() function will use this as a filter. See the function <code>\\TYPO3\\CMS\\Core\\Utility\\GeneralUtility::cmpIP()</code> for details on syntax. Setting this to blank value will deny all. Setting to "*" will allow all.',
'sqlDebug' => '<p>Integer (0, 1, 2). Allows displaying executed SQL queries in the browser (for debugging purposes and development)</p><dl><dt>0</dt><dd>no SQL shown (default)</dd><dt>1</dt><dd>show only failed queries</dd><dt>2</dt><dd>show all queries</dd></dl>',
'enable_DLOG' => 'Boolean: Whether the developer log is enabled. See constant "TYPO3_DLOG"',
'ddmmyy' => 'Format of Date-Month-Year - see PHP-function <a href="http://php.net/date" target="_blank">date()</a>',
@@ -56,7 +56,7 @@ return [
'textfile_ext' => 'Text file extensions. Those that can be edited. Executable PHP files may not be editable in webspace if disallowed!',
'mediafile_ext' => 'Commalist of file extensions perceived as media files by TYPO3. Lowercase and no spaces between!',
'binPath' => 'String: List of absolute paths where external programs should be searched for. Eg. <code>/usr/local/webbin/,/home/xyz/bin/</code>. (ImageMagick path have to be configured separately)',
- 'binSetup' => 'String (textarea): List of programs (separated by newline or comma). By default programs will be searched in default paths and the special paths defined by \'binPath\'. When PHP has openbasedir enabled the programs can not be found and have to be configured here. Example: <code>perl=/usr/bin/perl,unzip=/usr/local/bin/unzip</code>',
+ 'binSetup' => 'String (textarea): List of programs (separated by newline or comma). By default programs will be searched in default paths and the special paths defined by <code>binPath</code>. When PHP has openbasedir enabled the programs can not be found and have to be configured here. Example: <code>perl=/usr/bin/perl,unzip=/usr/local/bin/unzip</code>',
'no_pconnect' => 'Boolean: If TRUE, "connect" is used to connect to the database. If FALSE, a persistent connection using "pconnect" will be established!',
'dbClientCompress' => 'Boolean: if TRUE, data exchange between TYPO3 and database server will be compressed. This may improve performance if (1) database serever is on the different server and (2) network connection speed to database server is 100mbps or less. CPU usage will be higher if this option is used but database operations will be executed faster due to much less (up to 3 times) database network traffic. This option has no effect if MySQL server is localhost.',
'setDBinit' => 'String (textarea): These commands are executed after the database connection was established. Hint: The previous default "SET NAMES utf8;" is not required any more and will be removed automatically if set!',
@@ -94,29 +94,29 @@ return [
'excludeForPackaging' => 'String: List of directories and files which will not be packaged into extensions nor taken into account otherwise by the Extension Manager. Perl regular expression syntax!',
],
'BE' => [ // Backend Configuration.
- 'languageDebug' => 'Boolean: If set languageDebug will be enabled in LanguageService',
- 'fileadminDir' => 'Path to the fileadmin dir. This is relative to PATH_site, DefaultStorage will be created with that configuration, do not access manually but ResourceFactory::getDefaultStorage()',
- 'RTE_imageStorageDir' => 'Default storage directory for Rich Text Editor files',
+ 'languageDebug' => 'Boolean: If set languageDebug will be enabled in LanguageService.',
+ 'fileadminDir' => 'Path to the fileadmin dir. This is relative to PATH_site, DefaultStorage will be created with that configuration, do not access manually but <code>\\TYPO3\\CMS\\Core\\Resource\\ResourceFactory::getDefaultStorage().</code>',
+ 'RTE_imageStorageDir' => 'Default storage directory for Rich Text Editor files.',
'lockRootPath' => 'This path is used to evaluate if paths outside of PATH_site should be allowed. Ending slash required!',
- 'userHomePath' => 'Combined folder identifier of the directory where TYPO3 backend-users have their home-dirs. A combined folder identifier looks like this: [storageUid]:[folderIdentifier]. Eg. \'2:users/\'. A home for backend user 2 would be: \'2:users/2/\'. Ending slash required!',
- 'groupHomePath' => 'Combined folder identifier of the directory where TYPO3 backend-groups have their home-dirs. A combined folder identifier looks like this: [storageUid]:[folderIdentifier]. Eg. \'2:groups/\'. A home for backend group 1 would be: \'2:groups/1/\'. Ending slash required!',
- 'userUploadDir' => 'Suffix to the user home dir which is what gets mounted in TYPO3. Eg. if the user dir is "../123_user/" and this value is "/upload" then "../123_user/upload" gets mounted.',
+ 'userHomePath' => 'Combined folder identifier of the directory where TYPO3 backend-users have their home-dirs. A combined folder identifier looks like this: [storageUid]:[folderIdentifier]. Eg. <code>2:users/</code>. A home for backend user 2 would be: <code>2:users/2/</code>. Ending slash required!',
+ 'groupHomePath' => 'Combined folder identifier of the directory where TYPO3 backend-groups have their home-dirs. A combined folder identifier looks like this: [storageUid]:[folderIdentifier]. Eg. <code>2:groups/</code>. A home for backend group 1 would be: <code>2:groups/1/</code>. Ending slash required!',
+ 'userUploadDir' => 'Suffix to the user home dir which is what gets mounted in TYPO3. Eg. if the user dir is <code>../123_user/</code> and this value is <code>/upload</code> then <code>../123_user/upload</code> gets mounted.',
'warning_email_addr' => 'Email address that will receive notification whenever an attempt to login to the Install Tool is made and that will also receive warnings whenever more than 3 failed backend login attempts (regardless of user) are detected within an hour.',
- 'warning_mode' => 'Bit 1: If set, warning_email_addr will be notified every time a backend user logs in. Bit 2: If set, warning_email_addr will be notified every time an ADMIN backend user logs in. Other bits are reserved for future options.',
+ 'warning_mode' => 'Bit 1: If set, <code>warning_email_addr</code> will be notified every time a backend user logs in. Bit 2: If set, <code>warning_email_addr</code> will be notified every time an ADMIN backend user logs in.',
'lockIP' => 'Integer (0-4). Session IP locking for backend users. See <a href="#FE-lockIP">[FE][lockIP]</a> for details. Default is 4 (which is locking the FULL IP address to session).',
'sessionTimeout' => 'Integer: seconds. Session time out for backend users. The value must be at least 180 to avoid side effects. Default is 3600 seconds = 1 hour.',
- 'IPmaskList' => 'String: Lets you define a list of IP-numbers (with *-wildcards) that are the ONLY ones allowed access to ANY backend activity. On error an error header is sent and the script exits. Works like IP masking for users configurable through TSconfig. See syntax for that (or look up syntax for the function \\TYPO3\\CMS\\Core\\Utility\\GeneralUtility::cmpIP())',
+ 'IPmaskList' => 'String: Lets you define a list of IP-numbers (with *-wildcards) that are the ONLY ones allowed access to ANY backend activity. On error an error header is sent and the script exits. Works like IP masking for users configurable through TSconfig. See syntax for that (or look up syntax for the function <code>\\TYPO3\\CMS\\Core\\Utility\\GeneralUtility::cmpIP())</code>',
'lockBeUserToDBmounts' => 'Boolean: If set, the backend user is allowed to work only within his page-mount. It\'s advisable to leave this on because it makes security easy to manage.',
'lockSSL' => 'Boolean. If set, the backend can only be operated from an SSL-encrypted connection (https). A redirect to the SSL version of a URL will happen when a user tries to access non-https admin-urls',
'lockSSLPort' => 'Integer: Use a non-standard HTTPS port for lockSSL. Set this value if you use lockSSL and the HTTPS port of your webserver is not 443.',
- 'enabledBeUserIPLock' => 'Boolean: If set, the User/Group TSconfig option \'option.lockToIP\' is enabled.',
+ 'enabledBeUserIPLock' => 'Boolean: If set, the User/Group TSconfig option <code>option.lockToIP</code> is enabled.',
'cookieDomain' => 'Same as <a href="#SYS-cookieDomain">$TYPO3_CONF_VARS[\'SYS\'][\'cookieDomain\']</a> but only for BE cookies. If empty, $TYPO3_CONF_VARS[\'SYS\'][\'cookieDomain\'] value will be used.',
'cookieName' => 'String: Set the name for the cookie used for the back-end user session',
'loginSecurityLevel' => 'String: Keywords that determines the security level of login to the backend. "normal" means the password from the login form is sent in clear-text, "rsa" uses RSA password encryption (only if the rsaauth extension is installed).',
'showRefreshLoginPopup' => 'Boolean: If set, the Ajax relogin will show a real popup window for relogin after the count down. Some auth services need this as they add custom validation to the login form. If it\'s not set, the Ajax relogin will show an inline relogin window.',
'adminOnly' => '<p>Integer (-1, 0, 1, 2)</p><dl><dt>-1</dt><dd>total shutdown for maintenance purposes</dd><dt>0</dt><dd>normal operation, everyone can login (default)</dd><dt>1</dt><dd>only admins can login (no CLI)</dd><dt>2</dt><dd>only admins and regular CLI users can login</dd></dl>',
- 'disable_exec_function' => 'Boolean: Don\'t use exec() function (except for ImageMagick which is disabled by <a href="#GFX-im">[GFX][im]</a>=0). If set, all fileoperations are done by the default PHP-functions. This is necessary under Windows! On Unix the system commands by exec() can be used, unless this is disabled.',
- 'compressionLevel' => 'Determines output compression of BE output. Makes output smaller but slows down the page generation depending on the compression level. Requires a) zlib in your PHP installation and b) special rewrite rules for .css.gzip and .js.gzip (please see _.htacces for an example). Range 1-9, where 1 is least compression and 9 is greatest compression. \'true\' as value will set the compression based on the PHP default settings (usually 5). Suggested and most optimal value is 5.',
+ 'disable_exec_function' => 'Boolean: Don\'t use exec() function (except for ImageMagick which is disabled by <a href="#GFX-im">[GFX][im]</a>=0). If set, all file operations are done by the default PHP-functions. This is necessary under Windows! On Unix the system commands by exec() can be used, unless this is disabled.',
+ 'compressionLevel' => 'Determines output compression of BE output. Makes output smaller but slows down the page generation depending on the compression level. Requires a) zlib in your PHP installation and b) special rewrite rules for .css.gzip and .js.gzip (please see <code>_.htacces</code> for an example). Range 1-9, where 1 is least compression and 9 is greatest compression. \'true\' as value will set the compression based on the PHP default settings (usually 5). Suggested and most optimal value is 5.',
'installToolPassword' => 'String: This is the md5-hashed, salted password for the Install Tool. Set this to \'\' and access will be totally denied. You may consider to externally protect the typo3/sysext/install/ folder, eg. with a .htaccess file.',
'checkStoredRecords' => 'Boolean: If set, values of the record are validated after saving in DataHandler. Disable only if using a database in strict mode.',
'checkStoredRecordsLoose' => 'Boolean: If set, make a loose comparison (\'\' equals 0) when validating record values after saving in DataHandler.',
@@ -129,7 +129,7 @@ return [
'debug' => 'Boolean: If set, the loginrefresh is disabled and pageRenderer is set to debug mode. Use this to debug the backend only!',
],
'FE' => [ // Configuration for the TypoScript frontend (FE). Nothing here relates to the administration backend!
- 'addAllowedPaths' => 'Additional relative paths (comma-list) to allow TypoScript resources be in. Should be prepended with \'/\'. If not, then any path where the first part is like this path will match. That is: \'myfolder/ , myarchive\' will match eg. \'myfolder/\', \'myarchive/\', \'myarchive_one/\', \'myarchive_2/\' ... No check is done to see if this directory actually exists in the root of the site. Paths are matched by simply checking if these strings equals the first part of any TypoScript resource filepath. (See class template, function init() in \\TYPO3\\CMS\\Core\\TypoScript\\Parser\\TypoScriptParser)',
+ 'addAllowedPaths' => 'Additional relative paths (comma-list) to allow TypoScript resources be in. Should be prepended with \'/\'. If not, then any path where the first part is like this path will match. That is: \'myfolder/ , myarchive\' will match eg. \'myfolder/\', \'myarchive/\', \'myarchive_one/\', \'myarchive_2/\' ... No check is done to see if this directory actually exists in the root of the site. Paths are matched by simply checking if these strings equals the first part of any TypoScript resource filepath. (See class template, function init() in <code>\\TYPO3\\CMS\\Core\\TypoScript\\Parser\\TypoScriptParser)</code>',
'debug' => 'Boolean: If set, some debug HTML-comments may be output somewhere. Can also be set by TypoScript.',
'noPHPscriptInclude' => 'Boolean: If set, PHP-scripts are not included by TypoScript configurations, unless they reside in the folders typo3/ext/, typo3/sysext/ or typo3conf/ext. This is a security option to ensure that users with template-access do not terrorize',
'compressionLevel' => 'Integer: Determines output compression of FE output. Makes output smaller but slows down the page generation depending on the compression level. Requires zlib in your PHP installation. Range 1-9, where 1 is least compression and 9 is greatest compression. \'true\' as value will set the compression based on the PHP default settings (usually 5). Suggested and most optimal value is 5.',
@@ -140,12 +140,12 @@ return [
'pageUnavailable_handling_statheader' => 'If \'pageUnavailable_handling\' is enabled, this string will always be sent as header before the actual handling.',
'pageUnavailable_force' => 'Boolean: If TRUE, pageUnavailable_handling is used for every frontend page. If the client matches <a href="#SYS-devIPmask">[SYS][devIPmask]</a>, the page is shown as normal. This is useful during temporary site maintenance.',
'addRootLineFields' => 'Comma-list of fields from the \'pages\'-table. These fields are added to the select query for fields in the rootline.',
- 'checkFeUserPid' => 'Boolean: If set, the pid of fe_user logins must be sent in the form as the field \'pid\' and then the user must be located in the pid. If you unset this, you should change the fe_users.username eval-flag \'uniqueInPid\' to \'unique\' in $TCA. This will do: $TCA[\'fe_users\'][\'columns\'][\'username\'][\'config\'][\'eval\']= \'nospace,lower,required,unique\';',
+ 'checkFeUserPid' => 'Boolean: If set, the pid of fe_user logins must be sent in the form as the field \'pid\' and then the user must be located in the pid. If you unset this, you should change the fe_users.username eval-flag \'uniqueInPid\' to \'unique\' in $TCA. This will do: <code>$TCA[\'fe_users\'][\'columns\'][\'username\'][\'config\'][\'eval\']= \'nospace,lower,required,unique\';</code>',
'lockIP' => 'Integer (0-4). If >0, fe_users are locked to (a part of) their REMOTE_ADDR IP for their session. Enhances security but may throw off users that may change IP during their session (in which case you can lower it to 2 or 3). The integer indicates how many parts of the IP address to include in the check. Reducing to 1-3 means that only first, second or third part of the IP address is used. 4 is the FULL IP address and recommended. 0 (zero) disables checking of course.',
- 'loginSecurityLevel' => 'See description for <a href="#BE-loginSecurityLevel">[BE][loginSecurityLevel]</a>. Default state for frontend is "normal". Alternative authentication services can implement higher levels if preferred. For example, "rsa" level uses RSA password encryption (only if the rsaauth extension is installed)',
+ 'loginSecurityLevel' => 'See description for <a href="#BE-loginSecurityLevel">[BE][loginSecurityLevel]</a>. Default state for frontend is "normal". Alternative authentication services can implement higher levels if preferred. For example, "rsa" level uses RSA password encryption (only if the rsaauth extension is installed).',
'lifetime' => 'Integer: positive. If >0 and the option permalogin is >=0, the cookie of FE users will have a lifetime of the number of seconds this value indicates. Otherwise it will be a session cookie (deleted when browser is shut down). Setting this value to 604800 will result in automatic login of FE users during a whole week, 86400 will keep the FE users logged in for a day.',
'sessionDataLifetime' => 'Integer: positive. If >0, the session data will timeout and be removed after the number of seconds given (86400 seconds represents 24 hours).',
- 'maxSessionDataSize' => 'Integer: Setting (deprecated) the maximum size (bytes) of frontend session data stored in the table fe_session_data. Set to zero (0) means no limit, but this is not recommended since it also disables a check that session data is stored only if a confirmed cookie is set. @deprecated since TYPO3 v8, will be removed in TYPO3 v9',
+ 'maxSessionDataSize' => 'Integer: Setting (deprecated) the maximum size (bytes) of frontend session data stored in the table fe_session_data. Set to zero (0) means no limit, but this is not recommended since it also disables a check that session data is stored only if a confirmed cookie is set. <code>@deprecated since TYPO3 v8, will be removed in TYPO3 v9.</code>',
'permalogin' => 'In any case, permanent login is only possible if <a href="#FE-lifetime">[FE][lifetime]</a> lifetime is > 0.</dd></dl>',
'cookieDomain' => 'Same as <a href="#SYS-cookieDomain">$TYPO3_CONF_VARS[\'SYS\'][\'cookieDomain\']</a> but only for FE cookies. If empty, $TYPO3_CONF_VARS[\'SYS\'][\'cookieDomain\'] value will be used.',
'cookieName' => 'String: Set the name for the cookie used for the front-end user session',
@@ -162,8 +162,8 @@ return [
'cHashOnlyForParameters' => 'String: Only the given parameters will be evaluated in the cHash calculation. Example: tx_news_pi1[uid]',
'cHashRequiredParameters' => 'Optional: Configure Parameters that require a cHash. If no cHash is given but one of the parameters are set, then TYPO3 triggers the configured cHash Error behaviour',
'cHashExcludedParametersIfEmpty' => 'Optional: Configure Parameters that are only relevant for the chash if there\'s an associated value available. And asterisk "*" can be used to skip all empty parameters.',
- 'workspacePreviewLogoutTemplate' => 'If set, points to an HTML file relative to the TYPO3_site root which will be read and outputted as template for this message. Example: fileadmin/templates/template_workspace_preview_logout.html. Inside you can put the marker %1$s to insert the URL to go back to. Use this in <a href="%1$s">Go back...</a> links',
- 'versionNumberInFilename' => 'String: embed,querystring,\'\'. Allows to automatically include a version number (timestamp of the file) to referred CSS and JS filenames on the rendered page. This will make browsers and proxies reload the files if they change (thus avoiding caching issues). Set to \'embed\' will have the timestamp embedded in the filename, ie. filename.1269312081.js. IMPORTANT: \'embed\' requires extra .htaccess rules to work (please refer to _.htaccess or the _.htaccess file from the dummy package)<p>Set to \'querystring\' (default setting) to append the version number as a query parameter (doesn\'t require mod_rewrite). Set to \'\' will turn this functionality off (behaves like TYPO3 < v4.4).</p>',
+ 'workspacePreviewLogoutTemplate' => 'If set, points to an HTML file relative to the TYPO3_site root which will be read and outputted as template for this message. Example: <code>fileadmin/templates/template_workspace_preview_logout.html</code>. Inside you can put the marker %1$s to insert the URL to go back to. Use this in <code><a href="%1$s">Go back...</a></code> links.',
+ 'versionNumberInFilename' => 'String: embed,querystring,\'\'. Allows to automatically include a version number (timestamp of the file) to referred CSS and JS filenames on the rendered page. This will make browsers and proxies reload the files if they change (thus avoiding caching issues). Set to \'embed\' will have the timestamp embedded in the filename, ie. filename.1269312081.js. IMPORTANT: \'embed\' requires extra .htaccess rules to work (please refer to _.htaccess or the _.htaccess file from the dummy package)<p>Set to \'querystring\' (default setting) to append the version number as a query parameter (doesn\'t require mod_rewrite).</p>',
],
'MAIL' => [ // Mail configurations to tune how \TYPO3\CMS\Core\Mail\ classes will send their mails.
'transport' => '<p>String:</p><dl><dt>mail</dt><dd>Sends messages by delegating to PHP\'s internal mail() function. No further settings required. This is the most unreliable option. If you are serious about sending mails, consider using "smtp" or "sendmail".</dd><dt>smtp</dt><dd>Sends messages over the (standardized) Simple Message Transfer Protocol. It can deal with encryption and authentication. Most flexible option, requires a mail server and configurations in transport_smtp_* settings below. Works the same on Windows, Unix and MacOS.</dd><dt>sendmail</dt><dd>Sends messages by communicating with a locally installed MTA - such as sendmail. See setting transport_sendmail_command bellow.<dd><dt>mbox</dt><dd>This doesn\'t send any mail out, but instead will write every outgoing mail to a file adhering to the RFC 4155 mbox format, which is a simple text file where the mails are concatenated. Useful for debugging the mail sending process and on development machines which cannot send mails to the outside. Configure the file to write to in the \'transport_mbox_file\' setting below</dd><dt><classname></dt><dd>Custom class which implements Swift_Transport. The constructor receives all settings from the MAIL section to make it possible to add custom settings.</dd></dl>',
diff --git a/typo3/sysext/install/Resources/Private/Templates/Action/Tool/AllConfiguration.html b/typo3/sysext/install/Resources/Private/Templates/Action/Tool/AllConfiguration.html
index bc2ae4882402..a42615d0f172 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Action/Tool/AllConfiguration.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Action/Tool/AllConfiguration.html
@@ -39,9 +39,9 @@
<h1>Change configuration values</h1>
<p>
- Changed values are written to LocalConfiguration.php. The optional file AdditionalConfiguration.php
+ Changed values are written to <code>LocalConfiguration.php</code>. The optional file <code>AdditionalConfiguration.php</code>
is not controlled by the TYPO3 CMS core and may override single settings again. Administrators
- must maintain AdditionalConfiguration.php on their own and should use it with care.
+ must maintain <code>AdditionalConfiguration.php</code> on their own and should use it with care.
</p>
<div class="form-group">
<div class="input-group">
diff --git a/typo3/sysext/install/Resources/Private/Templates/Action/Tool/Configuration.html b/typo3/sysext/install/Resources/Private/Templates/Action/Tool/Configuration.html
index de9e4c3d6a5b..645bff3c8d98 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Action/Tool/Configuration.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Action/Tool/Configuration.html
@@ -20,9 +20,9 @@
TypoScript configuration to customize settings accordingly.
</p>
<p>
- Changed values are written to LocalConfiguration.php. The optional file AdditionalConfiguration.php
+ Changed values are written to <code>LocalConfiguration.php</code>. The optional file <code>AdditionalConfiguration.php</code>
is not controlled by the TYPO3 CMS core and may override single settings again. Administrators
- must maintain AdditionalConfiguration.php on their own and should use it with care.
+ must maintain <code>AdditionalConfiguration.php</code> on their own and should use it with care.
</p>
<form method="post" class="form-horizontal">
<f:render partial="Action/Common/HiddenFormFields" arguments="{_all}" />
--
GitLab