Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/add-ons/consent.md
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ If this tag would not output any consent requests due to your filters, the conte
No Consent Requests Available
{/if}

### Conesnt Form Examples
### Consent Form Examples

#### Simple Bulk Consent Form

Expand Down Expand Up @@ -466,7 +466,7 @@ If you need to exclude one or several types from display, use `not ` before the

provider='ee'

Limits display of cookies by cookie provider.
Limits display of cookies by cookie provider.
If the cookie is provided by an add-on, the provider matches the add-ons short name, e.g. `comment` or `forum`
The core ExpressionEngine cookies are identified by `ee` as provider.
If cookie is only being used in Control Panel, the provider is set to `cp`.
Expand Down
2 changes: 1 addition & 1 deletion docs/add-ons/pro-search/parameters.md
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ This is equal to:

### SQL parameters

Pro Search supports SQL parameters. This means you can use a SQL query in any pararameter. SQL queries are limited to SELECTs only and should always end with a semi-colon (;). Pro Search will take the first item in the SELECT statement and creates a pipe-separated list from it. If the SQL query produces no results, it sets the parameter value to what comes after the semi-colon. You can optionally prefix the SQL query for better matching. Schematically, such a query looks like this:
Pro Search supports SQL parameters. This means you can use a SQL query in any parameter. SQL queries are limited to SELECTs only and should always end with a semi-colon (;). Pro Search will take the first item in the SELECT statement and creates a pipe-separated list from it. If the SQL query produces no results, it sets the parameter value to what comes after the semi-colon. You can optionally prefix the SQL query for better matching. Schematically, such a query looks like this:

`param="prefix SELECT field FROM table WHERE lorem = 'ipsum';no results"`

Expand Down
4 changes: 2 additions & 2 deletions docs/add-ons/pro-search/settings.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ The same query with GET variables would look like this:

`domain.com/search/results?keywords=hello+world`

Using GET variables is not possible if the `uri_protocol` config setting is set to QUERY_STRING. It can also cause unexpected behaviour if you’re using the second exception (the question mark) in your `.htaccess` file when hiding `index.php`. If you can, use the encoded query instead as this will always work.
Using GET variables is not possible if the `uri_protocol` config setting is set to QUERY_STRING. It can also cause unexpected behavior if you’re using the second exception (the question mark) in your `.htaccess` file when hiding `index.php`. If you can, use the encoded query instead as this will always work.

NOTE:**Note:** When using GET variables, make sure Dynamic Channel Query Caching is turned off.

Expand All @@ -54,7 +54,7 @@ Choose a tag which is used to highlight keywords in the search excerpt. Options

### Minimum word length

The ft_min_word_len setting of your MySQL installation determines the minimum length of words indexed by the Full Text index. Setting that value here will trigger an alternative search algorithm when the search term is smaller than this size. Defaults to 4. Do not alter unless you have customised your MySQL installation.
The ft_min_word_len setting of your MySQL installation determines the minimum length of words indexed by the Full Text index. Setting that value here will trigger an alternative search algorithm when the search term is smaller than this size. Defaults to 4. Do not alter unless you have customized your MySQL installation.

### Stop words

Expand Down
2 changes: 1 addition & 1 deletion docs/add-ons/pro-variables/manage.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ When using the suffix option, you can use `{suffix}` in both the variable name a

## Variable groups

You can create any number of groups to organise your variables. These groups will appear in the Group drop down for each variable, so you can assign a group to it. On the module home page, variable managers can sort the groups using drag and drop. Variable managers can also edit and delete the groups from here, by clicking on the edit or delete icon next to the group name. You can alter the variable order in a group by editing the group’s properties.
You can create any number of groups to organize your variables. These groups will appear in the Group drop down for each variable, so you can assign a group to it. On the module home page, variable managers can sort the groups using drag and drop. Variable managers can also edit and delete the groups from here, by clicking on the edit or delete icon next to the group name. You can alter the variable order in a group by editing the group’s properties.


### Group label
Expand Down
2 changes: 1 addition & 1 deletion docs/add-ons/rte.md
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ WARN: **Advanced users only.** Please be careful with using this feature and che

Initially the field is loaded with the saved configuration of tool set being edited.

Consult [Redactor Docs](https://imperavi.com/redactor/docs/settings/) or [CKEDitor Docs](https://ckeditor.com/docs/ckeditor5/latest/installation/getting-started/configuration.html) for the list of properties. Note that not all features are supported by the ExpressionEngine implementation.
Consult [Redactor Docs](https://imperavi.com/redactor/docs/settings/) or [CKEditor Docs](https://ckeditor.com/docs/ckeditor5/latest/installation/getting-started/configuration.html) for the list of properties. Note that not all features are supported by the ExpressionEngine implementation.

#### Extra JavaScript
JavaScript template to be included with fields using this tool set. Typically used to include extra plugins when using advanced configuration with Redactor.
Expand Down
2 changes: 1 addition & 1 deletion docs/add-ons/spam.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ The Spam Module has three important configuration settings:

### Sensitivity

The Spam Module works by calculating the probability that a piece of content is spam based on all the examples it's seen before. The sensitivity is the cutoff for what we consider spam. This defaults to 70 which means there has to be at least a 70% probability something is spam for it to get flagged. If this is higher you will have fewere false positives but more spam will slip through.
The Spam Module works by calculating the probability that a piece of content is spam based on all the examples it's seen before. The sensitivity is the cutoff for what we consider spam. This defaults to 70 which means there has to be at least a 70% probability something is spam for it to get flagged. If this is higher you will have fewer false positives but more spam will slip through.

### Word Limit

Expand Down
8 changes: 4 additions & 4 deletions docs/advanced-usage/front-end/dock.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
[TOC]

## Overview
The Dock is a central component of ExpressionEngine's front-end functionality.
The Dock is a central component of ExpressionEngine's front-end functionality.

![dock overview](_images/ee-pro-dock.png)

Expand Down Expand Up @@ -47,7 +47,7 @@ The Control Panel button on the Dock will open the site's Control Panel in a new
Prolets are add-on components that reveal some of add-on's functionality for the Control Panel to the front-end, making it possible to edit data directly on the page where it belongs.

### Built-in Prolets
ExpressionEngine is shipped with the Entries and Publish prolets.
ExpressionEngine is shipped with the Entries and Publish prolets.

Clicking on the Entries prolet opens a prolet window with all entries currently listed. Allowing you to quickly find and edit other entries in your site.

Expand All @@ -61,6 +61,6 @@ Developers may create third-party prolets that can be installed with add-ons. Re
![dock prolets](_images/ee-pro-dock-prolets.png)

## Disabling
The Dock can be disabled by either the setting in the [Control Panel](control-panel/settings/front-end-editing.md#general-settings) or [config override](general/system-configuration-overrides.md#enable_dock).
The Dock can be disabled by either the setting in the [Control Panel](control-panel/settings/front-end-editing.md#enable-dock) or [config override](general/system-configuration-overrides.md#enable_dock).

WARN **Warning**: If the Dock is disabled, all of ExpressionEngine's [Front-End Content Management](advanced-usage/front-end/overview.md) is turned off for the front-end.
WARN **Warning**: If the Dock is disabled, all of ExpressionEngine's [Front-End Content Management](advanced-usage/front-end/overview.md) is turned off for the front-end.
2 changes: 1 addition & 1 deletion docs/channels/channel-form/status.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ Or use the alternative syntax:
{/statuses}
</select>

To manually set an entry's status upon sutmitting the Channel Form, you can use a Hidden field:
To manually set an entry's status upon submitting the Channel Form, you can use a Hidden field:

<input type="hidden" name="status" value="Shipped" />
6 changes: 3 additions & 3 deletions docs/channels/entries.md
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ And, you can use an inclusive stack to only get entries with _all_ of the catego

category="3&7&8"

Or you can negate the inclusive stack and get entries that do not of _all_ of those categories
Or you can negate the inclusive stack and get entries that do not match _all_ of those categories

category="not 3&5"

Expand Down Expand Up @@ -274,7 +274,7 @@ When used in an RSS/Atom feed, this parameter allows ExpressionEngine to dynamic
You can hard code the channel tag to show a specific channel entry. You may also specify multiple entries by separating them with the pipe character:

entry_id="13|42|147"

Or use "not" to exclude entries::

entry_id="not 45|534|807"
Expand Down Expand Up @@ -422,7 +422,7 @@ This parameter is for use with entry [pagination](templates/pagination.md) and d

If no parameter is specified, the navigation block will default to the "bottom" behavior.

If the pagination tag pair is not included, the entries returned will not respond to a page indicator in the URL. In othat case you would need to set the parameter to _hidden_ to allow the entries to reflect the pagination in the URL.
If the pagination tag pair is not included, the entries returned will not respond to a page indicator in the URL. In that case you would need to set the parameter to _hidden_ to allow the entries to reflect the pagination in the URL.

### `paginate_base=`

Expand Down
2 changes: 1 addition & 1 deletion docs/channels/entry-spanning.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ The {multi_field=} variable is the core of the ability to span a channel entry a

{multi_field="page1|page2|page3"}

3. When you initially visit your comment page for an entry, where you xhave the {multi_field} tag in your Template, you will see the content of your "page1" field, just as if you had used the regular {page1} variable.
3. When you initially visit your comment page for an entry, where you have the {multi_field} tag in your Template, you will see the content of your "page1" field, just as if you had used the regular {page1} variable.
4. If your entry has content in the "page2" field then you will see a "next page" link.
5. When you click that link, you'll see your entry again, but instead of {page1} being displayed, in its place would be {page2}.
6. This would continue with as many variables/pages as needed.
Expand Down
2 changes: 1 addition & 1 deletion docs/cli/built-in-commands/sync-conditional-fields.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# sync:conditional-fields

Sync Conditional Field Logic -- Checks each channel entry to see if its connditional logic is correct. If it is not, it updates the conditional logic and saves the entry.
Sync Conditional Field Logic -- Checks each channel entry to see if its conditional logic is correct. If it is not, it updates the conditional logic and saves the entry.

## Options list:

Expand Down
2 changes: 1 addition & 1 deletion docs/config/config-files.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ This file contains an array of foreign characters for transliteration conversion

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.

The mime types are grouped by file type. You can add the allowed mime types directly or you can add new file types containing miltiple mimes.
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.

#### 'Remember me' expiration

Expand Down
14 changes: 7 additions & 7 deletions docs/control-panel/access.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,22 @@
Access to the control panel is determined on a per member role level. Super admins automatically have full access to the control panel. For all other member roles, access is specified in the [Member Role Settings](control-panel/member-manager.md). Access settings determine not just the ability to login to the control panel, but which sections and actions can be taken by the member role. The navigation will automatically reflect the access permissions a user has.

**Control Panel Access Location**
By default, the control panel may be accessed via the admin.php file and, if below root, the system/index.php file. As per the post-install security recommendations, the system folder may have been renamed or be inaccessable via browser. The admin.php file may also have been renamed.

By default, the control panel may be accessed via the admin.php file and, if below root, the system/index.php file. As per the post-install security recommendations, the system folder may have been renamed or be inaccessible via browser. The admin.php file may also have been renamed.

**Adminstrator Sessions**

How long a user stays logged into the control panel is determined by two factors, the session length and the idle check. Any activity such as clicking a link or submitting a form restarts the countdown for both times. If an admin closes the browser or leaves the site and returns before the session expires, they will not need to log back in. If the site sits open in the browser for longer than allowed by the idle check but before the session expires, they will be required to confirm their password before accessing the open browser pages.

***Session Length***

Session Time to Logout (TTL) refers to how long a user stays logged into the control panel after logging in. By default, after 1 hour of inactivity, administrators will be logged out of the control panel and required to log back in with their username and password. The default TTL length can be overriden by the [cp_session_length](general/system-configuration-overrides.md#cp_session_length) setting.
Session Time to Logout (TTL) refers to how long a user stays logged into the control panel after logging in. By default, after 1 hour of inactivity, administrators will be logged out of the control panel and required to log back in with their username and password. The default TTL length can be overriden by the [cp_session_length](general/system-configuration-overrides.md#cp_session_length) setting.

If control panel sessions are set to use cookies only, the 'Remember me' login option will allow the session cookie to persist for 2 weeks. This may be overriden using the [remember.php configuration file](config/config-files.md#remember_me).
If control panel sessions are set to use cookies only, the 'Remember me' login option will allow the session cookie to persist for 2 weeks. This may be overriden using the [remember.php configuration file](config/config-files.md#remember-me-expiration).

***Adminstrator Idle Check***

For added security, ExpressionEngine triggers a modal when an administrator is logged into the control panel but idle beyond a set length of time. The modal triggers afer 30 minutes if the control panel is in focus and idle, or 45 minutes if idle and out of focus. Unlike a fresh login, if the user logs back in via the modal before the TTL is exceeded, they remain on the same page(s) with no alteration of unsaved data. The idle check is not a factor if the site is no longer loaded in the browser.
For added security, ExpressionEngine triggers a modal when an administrator is logged into the control panel but idle beyond a set length of time. The modal triggers after 30 minutes if the control panel is in focus and idle, or 45 minutes if idle and out of focus. Unlike a fresh login, if the user logs back in via the modal before the TTL is exceeded, they remain on the same page(s) with no alteration of unsaved data. The idle check is not a factor if the site is no longer loaded in the browser.

![](_images/admin-access-modal.png)

Expand All @@ -38,7 +38,7 @@ For added security, ExpressionEngine triggers a modal when an administrator is l
Sessions are stored in cookies, session ID (URL) or both, see [Security and Privacy Settings](control-panel/settings/security-privacy.md#settings). The control panel and the frontend may have different session types. If the frontend uses cookies only for storage and the control panel uses cookies and sessions, logging into the frontend will not result in being logged into the control panel. However, logging into the control panel will result in being logged into the frontend. Logging into an area that sets a session cookie will apply to any area that requires session cookies only.

So if you're logged into the control panel but the website acts like you're a guest? You probably don't have session data stored in a cookie per the control panel session settings.




10 changes: 5 additions & 5 deletions docs/control-panel/file-manager/file-manager.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ The File Manager is composed of several sections to help easily manage your file

### Sidebar

The sidebar gives you access to creating, viewing, and managing [Upload Directories](control-panel/file-manager/upload-directories.md); [Watermarks](control-panel/file-manager/watermarks.md); and Exporting All Files.
The sidebar gives you access to creating, viewing, and managing [Upload Directories](control-panel/file-manager/upload-directories.md); [Watermarks](control-panel/file-manager/watermarks.md); and Exporting All Files.

![File manager sidebar](_images/cp_file_manager_sidebar.png)

The sidebar can also be collapsed using the arrow icon ( <img style="margin-bottom: 0px; vertical-align: middle;display:inline-block;" src="../../_images/cp_collapase_arrow.png" alt="cp collapase arrow"> ) that is displayed to the side of the sidebar when hovering over the sidebar.
The sidebar can also be collapsed using the arrow icon ( <img style="margin-bottom: 0px; vertical-align: middle;display:inline-block;" src="../../_images/cp_collapse_arrow.png" alt="cp collapase arrow"> ) that is displayed to the side of the sidebar when hovering over the sidebar.


### Filters
Expand All @@ -45,7 +45,7 @@ Filters allow you to quickly filter the files listed to find exactly what you ne
The following selectable filters are available:

* Type - Filter by the file type. Available types are Image, Document, Archive, Audio, Video (only file types of currently uploaded files are displayed)
* Category - Filter by categories available to files.
* Category - Filter by categories available to files.
* Date Added - Filter by date added. Available options are Custom Date (enter in a specific date), Last 24 Hours, Last 7 Days, Last 30 Days, Last 180 Days, Last 365 Days
* Added By - Filter by the member who uploaded files

Expand All @@ -55,7 +55,7 @@ Files can also be filtered using the keyword search option.

### File Listing

The bulk of the File Manager screen is composed of the file list.
The bulk of the File Manager screen is composed of the file list.

![File Manager Listing](_images/cp_file-manager-listing.png)

Expand All @@ -75,7 +75,7 @@ The List View also exposes a Utility Action menu which quickly allows for action

![File Manager Utility Action Menu](_images/cp_file_manager_utility_action.png)

The columns displayed in the List View can also be adjusted to display file information relevant to your needs.
The columns displayed in the List View can also be adjusted to display file information relevant to your needs.
These columns include:

* Title
Expand Down
Loading