Merge branch '7.dev' into nep-patch-captcha

Author: nep

README.md

@@ -32,7 +32,12 @@ To build the theme assets, run `npm run buildAssets`. You can also dynamically r
 
 ### Viewing local changes
 
-Manually load `/build/index.html` in your browser to view your local build. For example, `file:///Users/<username>/Documents/ExpressionEngine-User-Guide/build/index.html`. You can use the side navigation to navigate to different local files, but the search functionality always takes you to the live version at docs.expressionengine.com.
+There are 2 options for viewing your local changes.
+
+1. Run `npx http-server -o` which should make the site available at [http://127.0.0.1:8080/build/](http://127.0.0.1:8080/build/).
+2. Manually view any HTML file in `/build/` in your browser. For example, `file:///Users/<username>/Documents/ExpressionEngine-User-Guide/build/index.html` to view the home page.
+
+You can use the side navigation to navigate to different local files, but the search functionality takes you to the live version at [https://docs.expressionengine.com](https://docs.expressionengine.com) unless you follow the steps at [Using DocSearch Locally](#using-docsearch-locally).
 
 ## Using DocSearch Locally
 

docs/_images/cp_comments.png

@@ -97,7 +97,7 @@ The Template_Group/Template where you would like the search results to be shown.
 
     results="20"
 
-The number of results to show per page on the search results.
+The number of results to show per page. The maximum value of `results` is 255. This means one page of results can't have more than 255 items, though you can have more than 255 results once you paginate the results.
 
 ### `search_in=`
 

docs/_images/overview.png

@@ -8,7 +8,7 @@
 -->
 # ENV File Support
 
-Config files can also be configured using [PHP Environment variables ($_ENV)](https://www.php.net/manual/en/reserved.variables.environment.php). To utilize this, create a file named `.env.php` in the root of your ExpressionEngine install. 
+Config files can also be configured using [PHP Environment variables ($_ENV)](https://www.php.net/manual/en/reserved.variables.environment.php). To utilize this, create a file named `.env.php` in the root of your ExpressionEngine install.
 
 NOTE: The `.env.php` file must be placed in same directory as the `system` directory. If you move the `system` directory above the webroot you must also move `.env.php`.
 
@@ -31,19 +31,20 @@ This variable can now be used in your `/system/user/config.php` as illustrated b
 Here is an example of what it might look like to manage all your database connection settings, and Base URL in `.env.php`
 
 ```
-// .env.php
-
-// URLs
+#.env.php
+#URLs
 BASE_URL=http://mysite.test/
 
-// DATABASE SETTINGS
+#DATABASE SETTINGS
 DB_HOSTNAME=db
 DB_DATABASE=db
 DB_USERNAME=db
 DB_PASSWORD=db
 DB_PORT=3306
 ```
 
+NOTE: You must use `#` for comments within `.env.php`. Using `//` will result in your `.env.php` being unable to be read.
+
 ```
 // system/user/config.php
 <?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
@@ -53,7 +54,7 @@ $config['save_tmpl_files'] = 'y';
 $config['base_url'] = $_ENV['BASE_URL'];
 $config['site_url'] = $config['base_url'];
 
-$config['app_version'] = '7.2.0';
+$config['app_version'] = '7.5.8';
 $config['encryption_key'] = 'bb748b72de235352315122d00';
 $config['session_crypt_key'] = '985796e4444444563463e2c80242';
 
@@ -83,15 +84,15 @@ The site short name can be accessed in the code using `$GLOBALS['assign_to_confi
 The below example demonstrates this approach, assuming you have 2 MSM sites with short names of `default_site` and `second_site`
 
 ```
-// .env.php
-// SITE-SPECIFIC SETTINGS
+#.env.php
+#SITE-SPECIFIC SETTINGS
 default_site.BASE_PATH=/home/sites/mysite.test/
 default_site.BASE_URL=http://mysite.test/
 
 second_site.BASE_PATH=/home/sites/anothersite.test/
 second_site.BASE_URL=http://anothersite.test/
 
-// DATABASE SETTINGS
+#DATABASE SETTINGS
 DB_HOSTNAME=db
 DB_DATABASE=db
 DB_USERNAME=db
@@ -110,7 +111,7 @@ $config['base_url'] = $_ENV[$GLOBALS['assign_to_config']['site_name'] . '.' . 'B
 
 $config['site_url'] = $config['base_url'];
 
-$config['app_version'] = '7.2.0';
+$config['app_version'] = '7.5.8';
 $config['encryption_key'] = 'bb748b72de235352315122d00';
 $config['session_crypt_key'] = '985796e4444444563463e2c80242';
 

docs/add-ons/search/simple.md

@@ -46,13 +46,12 @@ The Channel Form tag will automatically load jQuery for you. If you prefer to in
 
 ### Allowing Guests to Post Entries
 
-Allowing guest posts is controlled in the Channel Form settings at `Developer --> Channels` in the channel's **Settings** tab.
+Allowing guest posts is controlled in the Channel Form settings in `Channels` in the channel's **Settings** tab.
 
-To allow guests to post in a certain channel, locate the options for "Allow Guest Posts" next to the channel you want to allow guest posts for, and choose "Yes".
+You can optionally choose an author that entries entered as guests appear as authored by in the Guest Author field.
 
-You can optionally require the guest to pass a captcha before they submit the Channel Form by choosing "Yes" under "Guest Captcha".
+Requirements regarding use of a captcha for guest posting are controlled in `Settings --> CAPTCHA`.
 
-Finally, you can optionally choose an author that entries entered as guests appear as authored by under Guest Author.
 
 ### Form Validation
 

docs/advanced-usage/env-support.md

@@ -789,6 +789,10 @@ If five entries are being displayed per page, then for the fourth entry on the s
 
 **BONUS:** Since the Search module utilizes channel variables, {absolute_count} is also available to the Search Results tag.
 
+### `{absolute_index}`
+
+Similar to `absolute_count` but starts at 0 instead of 1. So the first entry will have value of "0" and the second entry will have a value of "1" etc.
+
 ### `{absolute_results}`
 
 This variable will always display the absolute total number of results that are returned by the tag, regardless of pagination.
@@ -963,6 +967,10 @@ The date the entry was submitted in GMT. This variable is **not** localized for
 
 The date on which the entry was last edited in GMT. This variable is **not** localized for each user's date settings. See [Date Variable Formatting](templates/date-variable-formatting.md) for more information.
 
+### `{index}`
+
+Similar to `count` but starts at 0 instead of 1. So the first entry will have value of "0" and the second entry will have a value of "1" etc.
+
 ### `{ip_address}`
 
 The IP address of the author when they posted the entry.

docs/channels/channel-form/overview.md

@@ -0,0 +1,7 @@
+# `sync:upload-directory`
+
+This command updates old file format data to the modern format and synchronizes the file usage records in the database. File usage data for a given file in the file manager can be viewed in the [File Editor](control-panel/file-manager/file-edit.md). This functionality is also available through [Utilities - File Usage](control-panel/utilities/data-operations.md#update-file-usage-information).
+
+## Example:
+
+`php eecli.php sync:file-usage`

docs/channels/entries.md

@@ -29,6 +29,7 @@ By default the CLI is located `system/ee/eecli.php` .
         - [migrate:rollback - Rolls back most recent migration group](cli/built-in-commands/migrate.md)
     - Sync
         - [sync:conditional-fields - Sync channel entry conditional logic](cli/built-in-commands/sync-conditional-fields.md)
+        - [sync:file-usage - Sync files usage](cli/built-in-commands/sync-file-usage.md)		
         - [sync:reindex - Sync content used in search indexes](cli/built-in-commands/sync-reindex.md)
         - [sync:upload-directory - Sync files in an upload directory](cli/built-in-commands/sync-upload-directory.md)
     - [Update ExpressionEngine](cli/built-in-commands/update.md)

docs/cli/built-in-commands/sync-file-usage.md

@@ -13,7 +13,7 @@ In addition to `config.php` ExpressionEngine has a number of other configuration
 
 As a general rule, the values provided in those config files (located in `system/ee/ExpressionEngine/Config` folder) are good for most sites, however there might be cases where certain setup would need to override some of the values.
 
-In order to do that, simply copy the corresponding file to `system/user/config` folder and change or add the values that are needed. There is no need to keep the full copy of config file, just keep the properties that need to be changed and remove the ones that you are fine with - the default values will be used for those.
+In order to do that, simply copy the corresponding file to `system/user/config` folder and change or add the values that are needed. 
 
 [TOC=4]
 
@@ -33,15 +33,20 @@ This file contains an array of foreign characters for transliteration conversion
 
 `valid_form_attributes.php`
 
-A list of HTML attributes that are allowed to be passed via EE template tag parameters to the `form` tag when creating forms with `ee()->functions->form_declaration()`. Additionally, attributes prefixed with `data-` and `aria-` can be used.
+A list of HTML attributes that are allowed to be passed via EE template tag parameters to the `form` tag when creating forms with `ee()->functions->form_declaration()`. Additionally, attributes prefixed with `data-` and `aria-` can be used without being specified in the config settings.
 
 #### Allowed Mime Types
 
 `mimes.php`
 
-These are the mime types that are allowed to be uploaded using the upload class. For security reasons the list is kept as small as possible.  If you need to upload types that are not in the list you can add them.
+This file sets the mime types that are allowed to be uploaded using the upload class. For security reasons the list is kept as small as possible.  The `mimes.php` file in your `system/user/config` folder will override the system `mimes.php` entirely.  If you need to upload mime types that are not in the list you can add them. If you want to disallow a mime type that is allowed by default, you can remove it from your mimes.php file and it will be disallowed.  
 
-The mime types are grouped by file type. You can add the allowed mime types directly or you can add new file types containing multiple mimes.
+The mime types are grouped by file type. These file types make up the 'Allowed File Types' options in the [upload directory](control-panel/file-manager/upload-directories.md#allowed-file-types) settings. You can add new mimes to an existing file type or create a new file type and add to that. Your new file type will be included as an option in the file upload preferrence file types.
+
+Tip: Customizing Allowed File Types in ExpressionEngine
+<div class="video-wrapper">
+<iframe src="https://www.youtube.com/embed/W6-NEmd7Urk" width="1920" height="1080" title="Customizing Allowed File Types in ExpressionEngine" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
+</div>
 
 #### Reverse Proxy IP addresses