[BUGFIX] Add missing information on Feature-84581-SiteHandling.rst 36/56936/3
authorRiccardo De Contardi <erredeco@gmail.com>
Sat, 12 May 2018 14:05:14 +0000 (16:05 +0200)
committerSusanne Moog <susanne.moog@typo3.org>
Sat, 12 May 2018 14:18:28 +0000 (16:18 +0200)
* Adds a description for the option "iso-639-1"
* Describes the location of "config.yaml" when TYPO3 runs in composer mode

Resolves: #84651
Releases: master
Change-Id: I0a0b5cf1a39e2c732653fe69bb0e0401eb493e7f
Reviewed-on: https://review.typo3.org/56936
Reviewed-by: Mathias Schreiber <mathias.schreiber@typo3.com>
Tested-by: Mathias Schreiber <mathias.schreiber@typo3.com>
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Susanne Moog <susanne.moog@typo3.org>
Tested-by: Susanne Moog <susanne.moog@typo3.org>
typo3/sysext/core/Documentation/Changelog/9.2/Feature-84581-SiteHandling.rst

index 02564da..f1d97d7 100644 (file)
@@ -23,6 +23,8 @@ typo3conf/sites folder
 New sites will live in the folder `typo3conf/sites/`. In the first iteration this folder will contain a file called
 `config.yaml` which holds all configuration for a given site.
 
+Note that if you are using a composer based installation, then the file location is `<project-root>/config/sites/<identifier>/config.yaml`
+
 In the future this folder can (and should) be used for more files like Fluid templates, and Backend layouts.
 
 
@@ -49,7 +51,7 @@ config.yaml
           base: /
           # sets the locale during frontend rendering
           locale: en_US.UTF-8
-          # ???
+          # two-letter code for the language according to ISO-639 nomenclature (see https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes)
           iso-639-1: en
           # FE href language
           hreflang: en-US