diff options
| author | Lukas Winkler <git@lw1.at> | 2020-04-08 13:30:16 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-08 13:30:16 +0300 |
| commit | 2c5c72e2da4c015efa78069c9c1b407fc55a6483 (patch) | |
| tree | fecec8638249689fb02b93a883517cc7c64f52d6 /config | |
| parent | bb4cad6d756e119f92f397a8dd4574d0d1bf539c (diff) | |
many typo fixes in the code thanks to codespell (#15730)
* many typo fixes in the code thanks to codespell
* reset submodules
I really need to stop using `git commit -a`
* reset change in library
* rebuilt piwik.js
* fix test
* updates expected UI file
Co-authored-by: sgiehl <sgiehl@users.noreply.github.com>
Co-authored-by: Stefan Giehl <stefan@matomo.org>
Diffstat (limited to 'config')
| -rwxr-xr-x | config/global.ini.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/config/global.ini.php b/config/global.ini.php index b38e688281..ba5c30c047 100755 --- a/config/global.ini.php +++ b/config/global.ini.php @@ -292,7 +292,7 @@ adding_segment_requires_access = "view" allow_adding_segments_for_all_websites = 1 ; When archiving segments for the first time, this determines the oldest date that will be archived. -; This option can be used to avoid archiving (for isntance) the lastN years for every new segment. +; This option can be used to avoid archiving (for instance) the lastN years for every new segment. ; Valid option values include: "beginning_of_time" (start date of archiving will not be changed) ; "segment_last_edit_time" (start date of archiving will be the earliest last edit date found, ; if none is found, the created date is used) @@ -332,8 +332,8 @@ default_day = yesterday default_period = day ; Time in seconds after which an archive will be computed again. This setting is used only for today's statistics. -; This setting is overriden in the UI, under "General Settings". -; This setting is only used if it hasn't been overriden via the UI yet, or if enable_general_settings_admin=0 +; This setting is overridden in the UI, under "General Settings". +; This setting is only used if it hasn't been overridden via the UI yet, or if enable_general_settings_admin=0 time_before_today_archive_considered_outdated = 900 ; Time in seconds after which an archive will be computed again. This setting is used only for week's statistics. @@ -350,7 +350,7 @@ time_before_year_archive_considered_outdated = -1 ; Same as config setting "time_before_week_archive_considered_outdated" but it is only applied to range archives time_before_range_archive_considered_outdated = -1 -; This setting is overriden in the UI, under "General Settings". +; This setting is overridden in the UI, under "General Settings". ; The default value is to allow browsers to trigger the Matomo archiving process. ; This setting is only used if it hasn't been overridden via the UI yet, or if enable_general_settings_admin=0 enable_browser_archiving_triggering = 1 @@ -669,7 +669,7 @@ tmp_path = "/tmp" ; litespeed. To find out the type of interface for a PHP binary execute this command: php -r "echo php_sapi_name();" php_binary_path = "" -; In some rare cases it may be useful to explicitely tell Matomo not to use LOAD DATA INFILE +; In some rare cases it may be useful to explicitly tell Matomo not to use LOAD DATA INFILE ; This may for example be useful when doing Mysql AWS replication enable_load_data_infile = 1 |