diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.yml b/.github/ISSUE_TEMPLATE/BUG_REPORT.yml
index 9ad25fa82b..b17166286e 100644
--- a/.github/ISSUE_TEMPLATE/BUG_REPORT.yml
+++ b/.github/ISSUE_TEMPLATE/BUG_REPORT.yml
@@ -3,29 +3,34 @@ about: Create a report to help us improve the Strapi documentation.
 title: "[Bug]: "
 labels: "type: bug, status: pending reproduction"
 issue_body: true
-inputs:
+body:
 - type: input
   attributes:
     label: Link to the documentation page or resource
-    required: true
     placeholder: https://strapi.io/documentation/developer-docs/latest/somepage.html
+  validations:
+    required: true
 - type: textarea
   attributes:
     label: Describe the bug
-    required: true
     placeholder: "A clear and concise description of what the bug is."
+  validations:
+    required: true
 - type: textarea
   attributes:
     label: Additional context
-    required: false
     placeholder: "Add any other context about the problem here."
+  validations:
+    required: false
 - type: textarea
   attributes:
     label: Suggested improvements or fixes
-    required: false
     placeholder: "A clear and concise description of what you want to happen."
+  validations:
+    required: false
 - type: textarea
   attributes:
     label: Related issue(s)/PR(s)
-    required: false
     placeholder: "Let us know if this is related to any issue/pull request."
+  validations:
+    required: false
diff --git a/.github/ISSUE_TEMPLATE/DOC_REQUEST.yml b/.github/ISSUE_TEMPLATE/DOC_REQUEST.yml
index 95db9561a4..afd302ac60 100644
--- a/.github/ISSUE_TEMPLATE/DOC_REQUEST.yml
+++ b/.github/ISSUE_TEMPLATE/DOC_REQUEST.yml
@@ -3,24 +3,28 @@ about: Suggest a new part of the documentation we are missing!
 title: "[Request]: "
 labels: "type: doc request"
 issue_body: false
-inputs:
+body:
 - type: textarea
   attributes:
     label: Summary
-    required: true
     placeholder: Quick summary what's this documentation request about.
+  validations:
+    required: true
 - type: textarea
   attributes:
     label: Why is it needed?
-    required: true
     placeholder: "A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]"
+  validations:
+    required: true
 - type: textarea
   attributes:
     label: Suggested solution(s)
-    required: false
     placeholder: "A clear and concise description of what you want to happen."
+  validations:
+    required: false
 - type: textarea
   attributes:
     label: Related issue(s)/PR(s)
-    required: false
     placeholder: "Let us know if this is related to any issue/pull request."
+  validations:
+    required: false
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 4a1acd5e69..4ab69ebe6d 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -3,7 +3,7 @@ Hello 👋 Thank you for submitting a pull request.
 
 To help us merge your PR, make sure to follow the instructions below:
 
-- Create or update the documentation. (Should be made against the documentation branch)
+- Create or update the documentation. (Should be made against the `main` branch)
 - Create or update the tests.
 - Refer to the issue you are closing in the PR description - fix #issue
 - Specify if the PR is in WIP (work in progress) state or ready to be merged
diff --git a/.gitignore b/.gitignore
index 4cedecc917..f60df091be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -105,3 +105,7 @@ dist
 
 # Other
 *.DS_Store
+
+# IDE
+.idea
+.vscode
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index aaa24cb0be..1f0f2713da 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -20,7 +20,7 @@ This project and everyone participating in it are governed by the [Strapi Code o
 
 ## Documentation
 
-Pull requests relating to fixing documentation for the latest release should be directed towards the [documentation branch](https://github.com/strapi/documentation/tree/documentation) **not** towards the main branch. Any PRs made towards the main branch will not be released until the next Strapi version release.
+Pull requests relating to fixing documentation for the latest release should be directed towards the `main` branch.
 
 ## Bugs
 
@@ -28,28 +28,82 @@ We are using [GitHub Issues](https://github.com/strapi/documentation/issues) to
 
 ---
 
-## Before Submitting a Pull Request
+## Submitting a Pull Request
 
 The core team will review your pull request and will either merge it, request changes to it, or close it.
 
-**Before submitting your pull request** make sure the following requirements are fulfilled:
+### Contribution Prerequisites
 
-- Fork the repository and create your branch from `documentation`.
-- Run `yarn` and `yarn dev` in the specific documentation root. (Please use yarn, not npm as we maintain a yarn.lock file instead of a package-lock.json)
-
-## Contribution Prerequisites
-
-- You have [Node](https://nodejs.org/en/) at v12 only (Node v13+ are not supported) and [Yarn](https://yarnpkg.com/en/) at v1.2.0+.
+<!-- TODO Update warning about using yarn when npm v7 is out since it will support yarn.lock files — see https://blog.npmjs.org/post/621733939456933888/npm-v7-series-why-keep-package-lockjson.html -->
+- You installed the following softwares:
+  - [Node](https://nodejs.org/en/) at v12 only (Node v13+ are not supported)
+  - [Yarn](https://yarnpkg.com/en/) at v1.2.0+. **Please use yarn**, not npm, as we maintain a `yarn.lock` file instead of `package-lock.json`
 - You are familiar with Git.
 
-## Development Workflow
+### Contribution Workflow
 
 <!-- TODO add contrib-docs and link here -->
 
-**Currently WIP**
+#### Setting up
+
+1. Fork the `documentation` repository.
+2. Clone your forked `documentation` repository.
+
+    ```bash
+    # HTTPS
+    git clone https://github.com/yourgithubname/documentation.git
+
+    # SSH
+    git clone git@github.com:yourgithubname/documentation.git
+    ```
+
+3. Enter in the folder which contains either the user documentation or developer documentation (depending on what you want to contribute to).
+
+    ```bash
+    #user documentation
+    cd documentation/user-docs
+
+    #developer documentation
+    cd documentation/developer-docs
+    ```
+
+4. From the `main` branch, retrieve the latest modifications to work on an up-to-date branch.
+
+    ```bash
+    git checkout main
+    git pull
+    ```
 
-At the moment we are under a contribution freeze from the community, we will update this guide once we lift the freeze.
+5. Create your own branch on which you will work on your documentation contribution. Make sure the name of your branch indicates both the type of documentation and the topic.
 
+    ```bash
+    #user documentation
+    git checkout -b <user/branch-name>
+
+    #developer documentation
+    git checkout -b <dev/branch-name>
+    ```
+
+6. Make sure all dependencies are installed, then run the server:
+
+    ```bash
+    yarn && yarn dev
+    ```
+
+#### Writing
+We can't provide you specific procedures with step-by-step instructions to write technical documentation. But if you have any question or need help, do feel free to reach us through [our forum](https://forum.strapi.io/).
+
+#### Sharing & reviewing
+
+1. Create a pull request from your forked `documentation` repository to the original `documentation` repository, to share your contribution to the documentation.
+2. Wait for your pull request to be reviewed by a Strapi team member.
+You do not need to assign anyone. Your pull request will be handled by our team in the next 48 hours (business days).
+3. *(optional)* Once the PR has been reviewed, you may have additional fixes to make before it's validated.
+
+Congratulations, and thank you for your contribution!
+Once your PR is validated, the Strapi team takes over and make sure your new content will soon be deployed!
+
+---
 ## Miscellaneous
 
 ### Repository Organization
@@ -64,11 +118,11 @@ We have various types of documentation that are maintained on their own:
 We have a few primary branches that are used for different purposes:
 
 - **main**
-  - This branch is used by the Strapi to push documentation on new features before they are released, it should not be used for PRs by the community unless instructed to do so by a Strapi team member
-- **documentation**
-  - This branch is for the current released version of Strapi, all documentation requests, updates, and removals should be pointed here
-- **docs/***
+  - This branch is used to store the current version of the documentation, all PRs should target this branch
+- **docs/\***
   - This collection of branches is for current work in progress changes, Strapi team members push our changes here to make PRs against the documentation branch
+- **feature/\***
+  - This is a collection of branches used as documentation for features currently in development in the main [strapi/strapi](https://github.com/strapi/strapi) repo
 
 ### Reporting an issue
 
diff --git a/developer-docs/latest/concepts/middlewares.md b/developer-docs/latest/concepts/middlewares.md
new file mode 100644
index 0000000000..952782e426
--- /dev/null
+++ b/developer-docs/latest/concepts/middlewares.md
@@ -0,0 +1,270 @@
+# Middlewares
+
+The middlewares are functions which are composed and executed in a stack-like manner upon request. If you are not familiar with the middleware stack in Koa, we highly recommend you to read the [Koa's documentation introduction](http://koajs.com/#introduction).
+
+## Structure
+
+### File structure
+
+```js
+module.exports = strapi => {
+  return {
+    // can also be async
+    initialize() {
+      strapi.app.use(async (ctx, next) => {
+        // await someAsyncCode()
+
+        await next();
+
+        // await someAsyncCode()
+      });
+    },
+  };
+};
+```
+
+- `initialize` (function): Called during the server boot.
+
+The middlewares are accessible through the `strapi.middleware` variable.
+
+### Node modules
+
+Every folder that follows this name pattern `strapi-middleware-*` in your `./node_modules` folder will be loaded as a middleware.
+
+A middleware needs to follow the structure below:
+
+```
+/middleware
+└─── lib
+     - index.js
+- LICENSE.md
+- package.json
+- README.md
+```
+
+The `index.js` is the entry point to your middleware. It should look like the example above.
+
+### Custom middlewares
+
+The framework allows the application to override the default middlewares and add new ones. You have to create a `./middlewares` folder at the root of your project and put the middlewares into it.
+
+```
+/project
+└─── api
+└─── config
+└─── middlewares
+│   └─── responseTime // It will override the core default responseTime middleware.
+│        - index.js
+│   └─── views // It will be added into the stack of middleware.
+│        - index.js
+└─── public
+- favicon.ico
+- package.json
+- server.js
+```
+
+Every middleware will be injected into the Koa stack. To manage the load order, please refer to the [Middleware order section](#load-order).
+
+## Configuration and activation
+
+To configure the middlewares of your application, you need to create or edit the `./config/middleware.js` file in your Strapi app.
+
+By default this file doesn't exist, you will have to create it.
+
+**Available options**
+
+- `timeout` (integer): Defines the maximum allowed milliseconds to load a middleware.
+- `load` (Object): Configuration middleware loading. See details [here](#load-order)
+- `settings` (Object): Configuration of each middleware
+  - `{middlewareName}` (Object): Configuration of one middleware
+    - `enabled` (boolean): Tells Strapi to run the middleware or not
+
+### Settings
+
+**Example**:
+
+**Path —** `./config/middleware.js`.
+
+```js
+module.exports = {
+  //...
+  settings: {
+    cors: {
+      origin: ['http://localhost', 'https://mysite.com', 'https://www.mysite.com'],
+    },
+  },
+};
+```
+
+### Load order
+
+The middlewares are injected into the Koa stack asynchronously. Sometimes it happens that some of these middlewares need to be loaded in a specific order. To define a load order, create or edit the file `./config/middleware.js`.
+
+**Path —** `./config/middleware.js`.
+
+```js
+module.exports = {
+  load: {
+    before: ['responseTime', 'logger', 'cors', 'responses'],
+    order: [
+      "Define the middlewares' load order by putting their name in this array in the right order",
+    ],
+    after: ['parser', 'router'],
+  },
+};
+```
+
+- `load`:
+  - `before`: Array of middlewares that need to be loaded in the first place. The order of this array matters.
+  - `order`: Array of middlewares that need to be loaded in a specific order.
+  - `after`: Array of middlewares that need to be loaded at the end of the stack. The order of this array matters.
+
+## Core middleware configurations
+
+The core of Strapi embraces a small list of middlewares for performances, security and great error handling.
+
+- boom
+- cors
+- cron
+- csp
+- favicon
+- gzip
+- hsts
+- ip
+- language
+- logger
+- p3p
+- parser
+- public
+- responses
+- responseTime
+- router
+- session
+- xframe
+- xss
+
+::: tip
+The following middlewares cannot be disabled: responses, router, logger and boom.
+:::
+
+### Global middlewares
+
+- `favicon`
+  - `path` (string): Path to the favicon file. Default value: `favicon.ico`.
+  - `maxAge` (integer): Cache-control max-age directive in ms. Default value: `86400000`.
+- `public`
+  - `path` (string): Path to the public folder. Default value: `./public`.
+  - `maxAge` (integer): Cache-control max-age directive in ms. Default value: `60000`.
+  - `defaultIndex` (boolean): Display default index page at `/` and `/index.html`. Default value: `true`.
+
+### Request middlewares
+
+- `session`
+  - `enabled` (boolean): Enable or disable sessions. Default value: `false`.
+- `logger`
+  - `level` (string): Default log level. Default value: `debug`.
+  - `exposeInContext` (boolean): Expose logger in context so it can be used through `strapi.log.info(‘my log’)`. Default value: `true`.
+  - `requests` (boolean): Enable or disable requests logs. Default value: `false`.
+- `parser` (See [koa-body](https://github.com/dlau/koa-body#options) for more information)
+  - `enabled`(boolean): Enable or disable parser. Default value: `true`.
+  - `multipart` (boolean): Enable or disable multipart bodies parsing. Default value: `true`.
+  - `jsonLimit` (string|integer): The byte (if integer) limit of the JSON body. Default value: `1mb`.
+  - `formLimit` (string|integer): The byte (if integer) limit of the form body. Default value: `56k`.
+  - `queryStringParser` (see [qs](https://github.com/ljharb/qs) for a full list of options).
+    - `arrayLimit` (integer): the maximum length of an array in the query string. Any array members with an index of greater than the limit will instead be converted to an object with the index as the key. Default value: `100`.
+    - `depth` (integer): maximum parsing depth of nested query string objects. Default value: `20`.
+
+::: tip
+The session doesn't work with `mongo` as a client. The package that we should use is broken for now.
+:::
+
+### Response middlewares
+
+- [`gzip`](https://en.wikipedia.org/wiki/Gzip)
+  - `enabled` (boolean): Enable or not GZIP response compression.
+  - `options` (Object): Allow passing of options from [koa-compress](https://github.com/koajs/compress#options).
+- `responseTime`
+  - `enabled` (boolean): Enable or not `X-Response-Time header` to response. Default value: `false`.
+- `poweredBy`
+  - `enabled` (boolean): Enable or not `X-Powered-By` header to response. Default value: `true`.
+  - `value` (string): The value of the header. Default value: `Strapi <strapi.io>`
+
+::: tip
+`gzip` compression via `koa-compress` uses [Brotli](https://en.wikipedia.org/wiki/Brotli) by default, but is not configured with sensible defaults for most cases. If you experience slow response times with `gzip` enabled, consider disabling Brotli by passing `{br: false}` as an option. You may also pass more sensible params with `{br: { params: { // YOUR PARAMS HERE } }}`
+:::
+
+### Security middlewares
+
+- [`csp`](https://en.wikipedia.org/wiki/Content_Security_Policy)
+  - `enabled` (boolean): Enable or disable CSP to avoid Cross Site Scripting (XSS) and data injection attacks.
+  - `policy` (string): Configures the `Content-Security-Policy` header. If not specified uses default value. Default value: `undefined`.
+- [`p3p`](https://en.wikipedia.org/wiki/P3P)
+  - `enabled` (boolean): Enable or disable p3p.
+- [`hsts`](https://en.wikipedia.org/wiki/HTTP_Strict_Transport_Security)
+  - `enabled` (boolean): Enable or disable HSTS.
+  - `maxAge` (integer): Number of seconds HSTS is in effect. Default value: `31536000`.
+  - `includeSubDomains` (boolean): Applies HSTS to all subdomains of the host. Default value: `true`.
+- [`xframe`](https://en.wikipedia.org/wiki/Clickjacking)
+  - `enabled` (boolean): Enable or disable `X-FRAME-OPTIONS` headers in response.
+  - `value` (string): The value for the header, e.g. DENY, SAMEORIGIN or ALLOW-FROM uri. Default value: `SAMEORIGIN`.
+- [`xss`](https://en.wikipedia.org/wiki/Cross-site_scripting)
+  - `enabled` (boolean): Enable or disable XSS to prevent Cross Site Scripting (XSS) attacks in older IE browsers (IE8).
+- [`cors`](https://en.wikipedia.org/wiki/Cross-origin_resource_sharing)
+  - `enabled` (boolean): Enable or disable CORS to prevent your server to be requested from another domain.
+  - `origin` (string or array): Allowed URLs (`http://example1.com, http://example2.com`, `['http://www.example1.com', 'http://example1.com']` or allows everyone `*`). Default value: `*`.
+  - `expose` (array): Configures the `Access-Control-Expose-Headers` CORS header. If not specified, no custom headers are exposed. Default value: `["WWW-Authenticate", "Server-Authorization"]`.
+  - `maxAge` (integer): Configures the `Access-Control-Max-Age` CORS header. Default value: `31536000`.
+  - `credentials` (boolean): Configures the `Access-Control-Allow-Credentials` CORS header. Default value: `true`.
+  - `methods` (array)|String - Configures the `Access-Control-Allow-Methods` CORS header. Default value: `["GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS", "HEAD"]`.
+  - `headers` (array): Configures the `Access-Control-Allow-Headers` CORS header. If not specified, defaults to reflecting the headers specified in the request's Access-Control-Request-Headers header. Default value: `["Content-Type", "Authorization", "X-Frame-Options"]`.
+- `ip`
+  - `enabled` (boolean): Enable or disable IP blocker. Default value: `false`.
+  - `whiteList` (array): Whitelisted IPs. Default value: `[]`.
+  - `blackList` (array): Blacklisted IPs. Default value: `[]`.
+
+## Example
+
+Create your custom middleware.
+
+**Path —** `./middlewares/timer/index.js`
+
+```js
+module.exports = strapi => {
+  return {
+    initialize() {
+      strapi.app.use(async (ctx, next) => {
+        const start = Date.now();
+
+        await next();
+
+        const delta = Math.ceil(Date.now() - start);
+
+        ctx.set('X-Response-Time', delta + 'ms');
+      });
+    },
+  };
+};
+```
+
+Enable the middleware in environments settings.
+
+Load a middleware at the very first place
+
+**Path —** `./config/middleware.js`
+
+```js
+module.exports = {
+  load: {
+    before: ['timer', 'responseTime', 'logger', 'cors', 'responses', 'gzip'],
+    order: [
+      "Define the middlewares' load order by putting their name in this array is the right order",
+    ],
+    after: ['parser', 'router'],
+  },
+  settings: {
+    timer: {
+      enabled: true,
+    },
+  },
+};
+```
diff --git a/developer-docs/latest/concepts/models.md b/developer-docs/latest/concepts/models.md
new file mode 100644
index 0000000000..5f7e7caf25
--- /dev/null
+++ b/developer-docs/latest/concepts/models.md
@@ -0,0 +1,1143 @@
+# Models
+
+## Concept
+
+### Content Type's models
+
+Models are a representation of the database's structure. They are split into two separate files. A JavaScript file that contains the model options (e.g: lifecycle hooks), and a JSON file that represents the data structure stored in the database.
+
+**Path —** `./api/restaurant/models/Restaurant.js`.
+
+```js
+module.exports = {
+  lifecycles: {
+    // Called before an entry is created
+    beforeCreate(data) {},
+    // Called after an entry is created
+    afterCreate(result) {},
+  },
+};
+```
+
+**Path —** `./api/restaurant/models/Restaurant.settings.json`.
+
+```json
+{
+  "kind": "collectionType",
+  "connection": "default",
+  "info": {
+    "name": "restaurant",
+    "description": "This represents the Restaurant Model"
+  },
+  "attributes": {
+    "cover": {
+      "collection": "file",
+      "via": "related",
+      "plugin": "upload"
+    },
+    "name": {
+      "default": "",
+      "type": "string"
+    },
+    "description": {
+      "default": "",
+      "type": "text"
+    }
+  }
+}
+```
+
+In this example, there is a `Restaurant` model which contains the attributes `cover`, `name` and `description`.
+
+### Component's models
+
+Another type of model is named `components`. A component is a data structure that can be used in one or many other API's model. There is no lifecycle related, only a JSON file definition.
+
+**Path —** `./components/default/simple.json`
+
+```json
+{
+  "connection": "default",
+  "collectionName": "components_default_simples",
+  "info": {
+    "name": "simple",
+    "icon": "arrow-circle-right"
+  },
+  "options": {},
+  "attributes": {
+    "name": {
+      "type": "string"
+    }
+  }
+}
+```
+
+In this example, there is a `Simple` component which contains the attribute `name`. And the component is in the category `default`.
+
+### Where are the models defined?
+
+The **Content Types** models are defined in each `./api/**/models/` folder. Every JavaScript or JSON file in these folders will be loaded as a model. They are also available through the `strapi.models` and `strapi.api.**.models` global variables. Usable everywhere in the project, they contain the ORM model object that they refer to. By convention, a model's name should be written in lowercase.
+
+The **Components** models are defined in the `./components` folder. Every component has to be inside a subfolder (the category name of the component).
+
+## How to create a model?
+
+::: tip
+If you are just starting out it is very convenient to generate some models with the Content Type Builder directly in the admin interface. You can then review the generated model mappings on the code level. The UI takes over a lot of validation tasks and gives you a feeling for available features.
+:::
+
+### For Content Types models
+
+Use the CLI and run the following command `strapi generate:model restaurant name:string description:text`.<br>Read the [CLI documentation](../cli/CLI.md) for more information.
+
+This will create two files located at `./api/restaurant/models`:
+
+- `Restaurant.settings.json`: contains the list of attributes and settings. The JSON format makes the file easily editable.
+- `Restaurant.js`: imports `Restaurant.settings.json` and extends it with additional settings and life cycle callbacks.
+
+::: tip
+When you create a new API using the CLI (`strapi generate:api <name>`), a model is automatically created.
+:::
+
+### For Components models
+
+To create a component you will have to use the Content Type Builder from the Admin panel, there is not a cli generator for components.
+
+Or you can create your component manually by following the file path described previously and by following the file structure described below.
+
+## Model settings
+
+Additional settings can be set on models:
+
+- `kind` (string) - Define if the model is a Collection Type (`collectionType`) of a Single Type (`singleType`) - _only for Content Types_
+- `connection` (string) - Connection name which must be used. Default value: `default`.
+- `collectionName` (string) - Collection name (or table name) in which the data should be stored.
+- `globalId` (string) - Global variable name for this model (case-sensitive) - _only for Content Types_
+- `attributes` (object) - Define the data structure of your model. Find available options [below](#define-the-attributes).
+
+**Path —** `Restaurant.settings.json`.
+
+```json
+{
+  "kind": "collectionType",
+  "connection": "mongo",
+  "collectionName": "Restaurants_v1",
+  "globalId": "Restaurants",
+  "attributes": {}
+}
+```
+
+In this example, the model `Restaurant` will be accessible through the `Restaurants` global variable. The data will be stored in the `Restaurants_v1` collection or table and the model will use the `mongo` connection defined in `./config/database.js`
+
+::: warning
+If not set manually in the JSON file, Strapi will adopt the filename as `globalId`.
+The `globalId` serves as a reference to your model within relations and Strapi APIs. If you chose to rename it (either by renaming your file or by changing the value of the `globalId`), you'd have to migrate your tables manually and update the references.
+Please note that you should not alter the Strapi's models `globalId` (plugins and core models) since they are used directly within Strapi APIs and other models' relations.
+:::
+
+::: tip
+The `connection` value can be changed whenever you want, but you should be aware that there is no automatic data migration process. Also if the new connection doesn't use the same ORM you will have to rewrite your queries.
+:::
+
+## Model information
+
+The info key on the model-json states information about the model. This information is used in the admin interface, when showing the model.
+
+- `name`: The name of the model, as shown in admin interface.
+- `description`: The description of the model.
+- `icon`: The fontawesome V5 name - _only for Components_
+
+**Path —** `Restaurant.settings.json`.
+
+```json
+{
+  "info": {
+    "name": "restaurant",
+    "description": ""
+  }
+}
+```
+
+## Model options
+
+The options key on the model-json states.
+
+- `timestamps`: This tells the model which attributes to use for timestamps. Accepts either `boolean` or `Array` of strings where first element is create date and second element is update date. Default value when set to `true` for Bookshelf is `["created_at", "updated_at"]` and for MongoDB is `["createdAt", "updatedAt"]`.
+
+- `privateAttributes`: This configuration allows to treat a set of attributes as private, even if they're not actually defined as attributes in the model. Accepts an `Array` of strings. It could be used to remove from API responses timestamps or `_v` when using MongoDB. The set of `privateAttributes` defined in the model are merged with the `privateAttributes` defined in the global Strapi configuration.
+
+- `populateCreatorFields`: Configure whether the API response should include `created_by` and `updated_by` fields or not. Accepts a `boolean`. The default value is `false`.
+
+- `draftAndPublish`: Enable the draft and publish feature. Accepts a `boolean`. The default value is `false`.
+
+**Path —** `Restaurant.settings.json`.
+
+```json
+{
+  "options": {
+    "timestamps": true,
+    "privateAttributes": ["id", "created_at"],
+    "populateCreatorFields": true,
+    "draftAndPublish": false
+  }
+}
+```
+
+## Define the attributes
+
+The following types are currently available:
+
+- `string`
+- `text`
+- `richtext`
+- `email`
+- `password`
+- `integer`
+- `biginteger`
+- `float`
+- `decimal`
+- `date`
+- `time`
+- `datetime`
+- `boolean`
+- `enumeration`
+- `json`
+- `uid`
+
+### Validations
+
+You can apply basic validations to attributes. The following supported validations are _only supported by MongoDB_ database connections.
+If you're using SQL databases, you should use the native SQL constraints to apply them.
+
+- `required` (boolean) — If true, adds a required validator for this property.
+- `unique` (boolean) — Whether to define a unique index on this property.
+- `index` (boolean) — Adds an index on this property, this will create a [single field index](https://docs.mongodb.com/manual/indexes/#single-field) that will run in the background. _Only supported by MongoDB._
+- `max` (integer) — Checks if the value is greater than or equal to the given maximum.
+- `min` (integer) — Checks if the value is less than or equal to the given minimum.
+
+**Security validations**
+
+To improve the Developer Experience when developing or using the administration panel, the framework enhances the attributes with these "security validations":
+
+- `private` (boolean) — If true, the attribute will be removed from the server response. (This is useful to hide sensitive data).
+- `configurable` (boolean) - If false, the attribute isn't configurable from the Content Type Builder plugin.
+- `autoPopulate` (boolean) - If false, the related data will not populate within REST responses. (This will not stop querying the relational data on GraphQL)
+
+### Exceptions
+
+**uid**
+
+- `targetField`(string) — The value is the name of an attribute that has `string` of the `text` type.
+- `options` (string) — The value is a set of options passed to [the underlying `uid` generator](https://github.com/sindresorhus/slugify). A caveat is that the resulting `uid` must abide to the following RegEx `/^[A-Za-z0-9-_.~]*$`.
+
+### Example
+
+**Path —** `Restaurant.settings.json`.
+
+```json
+{
+  ...
+  "attributes": {
+    "title": {
+      "type": "string",
+      "min": 3,
+      "max": 99,
+      "unique": true
+    },
+    "description": {
+      "default": "My description",
+      "type": "text",
+      "required": true
+    },
+    "slug": {
+      "type": "uid",
+      "targetField": "title"
+    }
+    ...
+  }
+}
+```
+
+## Relations
+
+Relations let you create links (relations) between your Content Types.
+
+:::: tabs
+
+::: tab One-Way
+
+One-way relationships are useful to link one entry to one other entry. However, only one of the models can be queried with its linked item.
+
+#### Example
+
+A `pet` can be owned by someone (a `user`).
+
+**Path —** `./api/pet/models/Pet.settings.json`.
+
+```json
+{
+  "attributes": {
+    "owner": {
+      "model": "user"
+    }
+  }
+}
+```
+
+**Example**
+
+```js
+// Create a pet
+const xhr = new XMLHttpRequest();
+xhr.open('POST', '/pets', true);
+xhr.setRequestHeader('Content-Type', 'application/json');
+xhr.send(
+  JSON.stringify({
+    owner: '5c151d9d5b1d55194d3209be', // The id of the user you want to link
+  })
+);
+```
+
+:::
+
+::: tab Many-way
+
+Many-way relationships are useful to link one entry to many other entries. However, only one of the models can be queried with its linked items.
+
+#### Example
+
+A `pet` can be owned by many people (multiple `users`).
+
+**Path —** `./api/pet/models/Pet.settings.json`.
+
+```json
+{
+  "attributes": {
+    "owners": {
+      "collection": "user"
+    }
+  }
+}
+```
+
+**Example**
+
+```js
+// Create a pet
+const xhr = new XMLHttpRequest();
+xhr.open('POST', '/pets', true);
+xhr.setRequestHeader('Content-Type', 'application/json');
+xhr.send(
+  JSON.stringify({
+    owners: ['5c151d9d5b1d55194d3209be', '5fc666a5bf16f48ed050ef5b'], // The id of the users you want to link
+  })
+);
+```
+
+:::
+
+::: tab One-to-One
+
+One-to-One relationships are useful when you have one entity that could be linked to only one other entity. _**And vice versa**_.
+
+#### Example
+
+A `user` can have one `address`. And this address is only related to this `user`.
+
+**Path —** `./api/user/models/User.settings.json`.
+
+```json
+{
+  "attributes": {
+    "address": {
+      "model": "address",
+      "via": "user"
+    }
+  }
+}
+```
+
+**Path —** `./api/address/models/Address.settings.json`.
+
+```json
+{
+  "attributes": {
+    "user": {
+      "model": "user"
+    }
+  }
+}
+```
+
+**Example**
+
+```js
+// Create an address
+const xhr = new XMLHttpRequest();
+xhr.open('POST', '/addresses', true);
+xhr.setRequestHeader('Content-Type', 'application/json');
+xhr.send(
+  JSON.stringify({
+    user: '5c151d9d5b1d55194d3209be', // The id of the user you want to link
+  })
+);
+```
+
+:::
+
+::: tab One-to-Many
+
+One-to-Many relationships are useful when an entry can be linked to multiple entries of another Content Type. And an entry of the other Content Type can be linked to only one entry.
+
+#### Example
+
+A `user` can have many `articles`, and an `article` can be related to only one `user` (author).
+
+**Path —** `./api/user/models/User.settings.json`.
+
+```json
+{
+  "attributes": {
+    "articles": {
+      "collection": "article",
+      "via": "author"
+    }
+  }
+}
+```
+
+**Path —** `./api/article/models/Article.settings.json`.
+
+```json
+{
+  "attributes": {
+    "author": {
+      "model": "user"
+    }
+  }
+}
+```
+
+**Examples**
+
+```js
+// Create an article
+const xhr = new XMLHttpRequest();
+xhr.open('POST', '/articles', true);
+xhr.setRequestHeader('Content-Type', 'application/json');
+xhr.send(
+  JSON.stringify({
+    author: '5c151d9d5b1d55194d3209be', // The id of the user you want to link
+  })
+);
+
+// Update an article
+const xhr = new XMLHttpRequest();
+xhr.open('PUT', '/users/5c151d9d5b1d55194d3209be', true);
+xhr.setRequestHeader('Content-Type', 'application/json');
+xhr.send(
+  JSON.stringify({
+    articles: ['5c151d51eb28fd19457189f6', '5c151d51eb28fd19457189f8'], // Set of ALL articles linked to the user (existing articles + new article or - removed article)
+  })
+);
+```
+
+:::
+
+::: tab Many-to-Many
+
+Many-to-Many relationships are useful when an entry can be linked to multiple entries of another Content Type. And an entry of the other Content Type can be linked to many entries.
+
+#### Example
+
+A `product` can be related to many `categories` and a `category` can have many `products`.
+
+**Path —** `./api/product/models/Product.settings.json`.
+
+```json
+{
+  "attributes": {
+    "categories": {
+      "collection": "category",
+      "via": "products",
+      "dominant": true,
+      "collectionName": "products_categories__categories_products" // optional
+    }
+  }
+}
+```
+
+**NOTE**:
+(NoSQL databases only) The `dominant` key defines which table/collection should store the array that defines the relationship. Because there are no join tables in NoSQL, this key is required for NoSQL databases (e.g. MongoDB).
+
+**NOTE**:
+(NoSQL databases only) The `collectionName` key defines the name of the join table. It has to be specified once, in the `dominant` attribute of the relation. If it is not specified, Strapi will use a generated default one. It is useful to define the name of the join table when the name generated by Strapi is too long for the database you use.
+
+**Path —** `./api/category/models/Category.settings.json`.
+
+```json
+{
+  "attributes": {
+    "products": {
+      "collection": "product",
+      "via": "categories"
+    }
+  }
+}
+```
+
+**Example**
+
+```js
+// Update a product
+const xhr = new XMLHttpRequest();
+xhr.open('PUT', '/products/5c151d9d5b1d55194d3209be', true);
+xhr.setRequestHeader('Content-Type', 'application/json');
+xhr.send(
+  JSON.stringify({
+    categories: ['5c151d51eb28fd19457189f6', '5c151d51eb28fd19457189f8'], // Set of ALL categories linked to the product (existing categories + new category or - removed category).
+  })
+);
+```
+
+:::
+
+::: tab Polymorphic
+
+Polymorphic relationships are the solution when you don't know which kind of model will be associated to your entry, or when you want to connect different types of models to a model.
+A common use case is an `Image` model that can be associated to different types of models (Article, Product, User, etc.).
+
+#### Single vs Many
+
+Let's stay with our `Image` model which might belong to **a single `Article` or `Product` entry**.
+
+**NOTE**:
+In other words, it means that an `Image` entry can be associated to one entry. This entry can be a `Article` or `Product` entry.
+
+Also our `Image` model might belong to **many `Article` or `Product` entries**.
+
+**NOTE**:
+In other words, it means that an `Article` entry can relate to the same image as a `Product` entry.
+
+**Path —** `./api/image/models/Image.settings.json`.
+
+```json
+{
+  "attributes": {
+    "related": {
+      "collection": "*",
+      "filter": "field"
+    }
+  }
+}
+```
+
+#### Filter
+
+The `filter` attribute is optional (but we highly recommend to use it every time). If it's provided it adds a new match level to retrieve the related data.
+
+For example, the `Product` model might have two attributes which are associated to the `Image` model. To distinguish which image is attached to the `cover` field and which images are attached to the `pictures` field, we need to save and provide this to the database.
+
+**Path —** `./api/article/models/Product.settings.json`.
+
+```json
+{
+  "attributes": {
+    "cover": {
+      "model": "image",
+      "via": "related"
+    },
+    "pictures": {
+      "collection": "image",
+      "via": "related"
+    }
+  }
+}
+```
+
+The value of the `filter` attribute is the name of the column where the information is stored.
+
+#### Example
+
+An `Image` model might belong to many `Article` models or `Product` models.
+
+**Path —** `./api/image/models/Image.settings.json`.
+
+```json
+{
+  "attributes": {
+    "related": {
+      "collection": "*",
+      "filter": "field"
+    }
+  }
+}
+```
+
+**Path —** `./api/article/models/Article.settings.json`.
+
+```json
+{
+  "attributes": {
+    "avatar": {
+      "model": "image",
+      "via": "related"
+    }
+  }
+}
+```
+
+**Path —** `./api/article/models/Product.settings.json`.
+
+```json
+{
+  "attributes": {
+    "pictures": {
+      "collection": "image",
+      "via": "related"
+    }
+  }
+}
+```
+
+:::
+
+::::
+
+## Components
+
+Component fields let your create a relation between your Content Type and a Component structure.
+
+#### Example
+
+Lets say we created an `openinghours` component in `restaurant` category.
+
+**Path —** `./api/restaurant/models/Restaurant.settings.json`.
+
+```json
+{
+  "attributes": {
+    "openinghours": {
+      "type": "component",
+      "repeatable": true,
+      "component": "restaurant.openinghours"
+    }
+  }
+}
+```
+
+- `repeatable` (boolean): Could be `true` or `false` that let you create a list of data.
+- `component` (string): It follows this format `<category>.<componentName>`.
+
+:::: tabs
+
+::: tab Create
+
+Create a restaurant with non-repeatable component
+
+```js
+const xhr = new XMLHttpRequest();
+xhr.open('POST', '/restaurants', true);
+xhr.setRequestHeader('Content-Type', 'application/json');
+xhr.send(
+  JSON.stringify({
+    openinghour: {
+      opening_at: '10am',
+      closing_at: '6pm',
+      day: 'monday',
+    },
+  })
+);
+```
+
+Create a restaurant with repeatable component
+
+```js
+const xhr = new XMLHttpRequest();
+xhr.open('POST', '/restaurants', true);
+xhr.setRequestHeader('Content-Type', 'application/json');
+xhr.send(
+  JSON.stringify({
+    openinghours: [
+      {
+        opening_at: '10am',
+        closing_at: '6pm',
+        day: 'monday',
+      },
+      {
+        opening_at: '10am',
+        closing_at: '6pm',
+        day: 'tuesday',
+      },
+    ],
+  })
+);
+```
+
+:::
+
+::: tab Update
+
+Update a restaurant with non-repeatable component
+
+```js
+const xhr = new XMLHttpRequest();
+xhr.open('PUT', '/restaurants/1', true);
+xhr.setRequestHeader('Content-Type', 'application/json');
+xhr.send(
+  JSON.stringify({
+    openinghour: {
+      id: 1, // the ID of the entry
+      opening_at: '11am',
+      closing_at: '7pm',
+      day: 'wednesday',
+    },
+  })
+);
+```
+
+Update a restaurant with repeatable component
+
+```js
+const xhr = new XMLHttpRequest();
+xhr.open('PUT', '/restaurants/2', true);
+xhr.setRequestHeader('Content-Type', 'application/json');
+xhr.send(
+  JSON.stringify({
+    openinghours: [
+      {
+        "id": 1 // the ID of the entry you want to update
+        "opening_at": "10am",
+        "closing_at": "6pm",
+        "day": "monday"
+      },
+      {
+        "id": 2, // you also have to put the ID of entries you don't want to update
+        "opening_at": "10am",
+        "closing_at": "6pm",
+        "day": "tuesday"
+      }
+    ]
+  })
+);
+```
+
+**NOTE** if you don't specify the `ID` it will delete and re-create the entry and you will see the `ID` value change.
+
+:::
+
+::: tab Delete
+
+Delete a restaurant with non-repeatable component
+
+```js
+const xhr = new XMLHttpRequest();
+xhr.open('PUT', '/restaurants/1', true);
+xhr.setRequestHeader('Content-Type', 'application/json');
+xhr.send(
+  JSON.stringify({
+    openinghour: null,
+  })
+);
+```
+
+Delete a restaurant with repeatable component
+
+```js
+const xhr = new XMLHttpRequest();
+xhr.open('PUT', '/restaurants/2', true);
+xhr.setRequestHeader('Content-Type', 'application/json');
+xhr.send(
+  JSON.stringify({
+    openinghours: [
+      {
+        "id": 1 // the ID of the entry you want to keep
+        "opening_at": "10am",
+        "closing_at": "6pm",
+        "day": "monday"
+      }
+    ]
+  })
+);
+```
+
+:::
+
+::::
+
+## Dynamic Zone
+
+Dynamic Zone fields let you create a flexible space in which to compose content, based on a mixed list of components.
+
+#### Example
+
+Lets say we created an `slider` and `content` component in `article` category.
+
+**Path —** `./api/article/models/Article.settings.json`.
+
+```json
+{
+  "attributes": {
+    "body": {
+      "type": "dynamiczone",
+      "components": ["article.slider", "article.content"]
+    }
+  }
+}
+```
+
+- `components` (array): Array of components that follows this format `<category>.<componentName>`.
+
+:::: tabs
+
+::: tab Create
+
+```js
+const xhr = new XMLHttpRequest();
+xhr.open('POST', '/articles', true);
+xhr.setRequestHeader('Content-Type', 'application/json');
+xhr.send(
+  JSON.stringify({
+    body: [
+      {
+        __component: 'article.content',
+        content: 'This is a content',
+      },
+      {
+        __component: 'article.slider',
+        name: 'Slider name',
+      },
+    ],
+  })
+);
+```
+
+:::
+
+::: tab Update
+
+```js
+const xhr = new XMLHttpRequest();
+xhr.open('PUT', '/restaurant/2', true);
+xhr.setRequestHeader('Content-Type', 'application/json');
+xhr.send(
+  JSON.stringify({
+    body: [
+      {
+        "id": 1 // the ID of the entry you want to update
+        "__component": "article.content",
+        "content": "This is an updated content",
+      },
+      {
+        "id": 2, // you also have to put the ID of entries you don't want to update
+        "__component": "article.slider",
+        "name": "Slider name",
+      }
+    ]
+  })
+);
+```
+
+**NOTE** if you don't specify the `ID` it will delete and re-create the entry and you will see the `ID` value change.
+
+:::
+
+::: tab Delete
+
+```js
+const xhr = new XMLHttpRequest();
+xhr.open('PUT', '/restaurant/2', true);
+xhr.setRequestHeader('Content-Type', 'application/json');
+xhr.send(
+  JSON.stringify({
+    body: [
+      {
+        "id": 1 // the ID of the entry you want to keep
+        "__component": "article.content",
+        "content": "This is an updated content",
+      }
+    ]
+  })
+);
+```
+
+:::
+
+::::
+
+## Lifecycle hooks
+
+The lifecycle hooks are functions that get triggered when the Strapi [`queries`](../concepts/queries.md) are called. They will get triggered automatically when you manage your content in the Admin Panel or when you develop custom code using `queries`·
+
+To configure a `ContentType` lifecycle hook you can set a `lifecycles` key in the `{modelName}.js` file located in the `./api/{apiName}/models` folder.
+
+### Available Lifecycle hooks
+
+:::: tabs
+
+::: tab find
+
+**`beforeFind(params, populate)`**
+
+_Parameters:_
+
+| Name   | Type   | Description                         |
+| ------ | ------ | ----------------------------------- |
+| params | Object | Find params _(e.g: limit, filters)_ |
+
+---
+
+**`afterFind(results, params, populate)`**
+
+_Parameters:_
+
+| Name     | Type          | Description                            |
+| -------- | ------------- | -------------------------------------- |
+| results  | Array{Object} | The results found for the `find` query |
+| params   | Object        | Find params _(e.g: limit, filters)_    |
+| populate | Array{string} | Populate specific relations            |
+
+:::
+
+::: tab findOne
+
+**`beforeFindOne(params, populate)`**
+
+_Parameters:_
+
+| Name   | Type   | Description                  |
+| ------ | ------ | ---------------------------- |
+| params | Object | Find params _(e.g: filters)_ |
+
+---
+
+**`afterFindOne(result, params, populate)`**
+
+_Parameters:_
+
+| Name     | Type          | Description                               |
+| -------- | ------------- | ----------------------------------------- |
+| result   | Object        | The results found for the `findOne` query |
+| params   | Object        | Find params _(e.g: filters)_              |
+| populate | Array{string} | Populate specific relations               |
+
+:::
+
+::: tab create
+
+**`beforeCreate(data)`**
+
+_Parameters:_
+
+| Name | Type   | Description                              |
+| ---- | ------ | ---------------------------------------- |
+| data | Object | Input data to the entry was created with |
+
+---
+
+**`afterCreate(result, data)`**
+
+_Parameters:_
+
+| Name   | Type   | Description                              |
+| ------ | ------ | ---------------------------------------- |
+| result | Object | Created entry                            |
+| data   | Object | Input data to the entry was created with |
+
+:::
+
+::: tab update
+
+**`beforeUpdate(params, data)`**
+
+_Parameters:_
+
+| Name   | Type   | Description                              |
+| ------ | ------ | ---------------------------------------- |
+| params | Object | Find params _(e.g: filters)_             |
+| data   | Object | Input data to the entry was created with |
+
+---
+
+**`afterUpdate(result, params, data)`**
+
+_Parameters:_
+
+| Name   | Type   | Description                              |
+| ------ | ------ | ---------------------------------------- |
+| result | Object | Updated entry                            |
+| params | Object | Find params _(e.g: filters)_             |
+| data   | Object | Input data to the entry was created with |
+
+:::
+
+::: tab delete
+
+**`beforeDelete(params)`**
+
+_Parameters:_
+
+| Name   | Type   | Description                  |
+| ------ | ------ | ---------------------------- |
+| params | Object | Find params _(e.g: filters)_ |
+
+---
+
+**`afterDelete(result, params)`**
+
+_Parameters:_
+
+| Name   | Type   | Description                  |
+| ------ | ------ | ---------------------------- |
+| result | Object | Deleted entry                |
+| params | Object | Find params _(e.g: filters)_ |
+
+:::
+
+::: tab count
+
+**`beforeCount(params)`**
+
+_Parameters:_
+
+| Name   | Type   | Description                  |
+| ------ | ------ | ---------------------------- |
+| params | Object | Find params _(e.g: filters)_ |
+
+---
+
+**`afterCount(result, params)`**
+
+_Parameters:_
+
+| Name   | Type    | Description                  |
+| ------ | ------- | ---------------------------- |
+| result | Integer | The count matching entries   |
+| params | Object  | Find params _(e.g: filters)_ |
+
+:::
+
+::: tab search
+
+**`beforeSearch(params, populate)`**
+
+_Parameters:_
+
+| Name     | Type          | Description                  |
+| -------- | ------------- | ---------------------------- |
+| params   | Object        | Find params _(e.g: filters)_ |
+| populate | Array{string} | Populate specific relations  |
+
+---
+
+**`afterSearch(result, params)`**
+
+_Parameters:_
+
+| Name     | Type          | Description                  |
+| -------- | ------------- | ---------------------------- |
+| results  | Array{Object} | The entries found            |
+| params   | Object        | Find params _(e.g: filters)_ |
+| populate | Array{string} | Populate specific relations  |
+
+:::
+
+::: tab countSearch
+
+**`beforeCountSearch(params)`**
+
+_Parameters:_
+
+| Name   | Type   | Description                  |
+| ------ | ------ | ---------------------------- |
+| params | Object | Find params _(e.g: filters)_ |
+
+---
+
+**`afterCountSearch(result, params)`**
+
+_Parameters:_
+
+| Name   | Type    | Description                  |
+| ------ | ------- | ---------------------------- |
+| result | Integer | The count matching entries   |
+| params | Object  | Find params _(e.g: filters)_ |
+
+:::
+
+::::
+
+### Example
+
+**Path —** `./api/user/models/User.js`.
+
+```js
+module.exports = {
+  /**
+   * Triggered before user creation.
+   */
+  lifecycles: {
+    async beforeCreate(data) {
+      const passwordHashed = await strapi.api.user.services.user.hashPassword(data.password);
+      data.password = passwordHashed;
+    },
+  },
+};
+```
+
+::: tip
+You can mutate one of the parameters to change its properties. Make sure not to reassign the parameter as it will have no effect:
+
+**This will Work**
+
+```js
+module.exports = {
+  lifecycles: {
+    beforeCreate(data) {
+      data.name = 'Some fixed name';
+    },
+  },
+};
+```
+
+**This will NOT Work**
+
+```js
+module.exports = {
+  lifecycles: {
+    beforeCreate(data) {
+      data = {
+        ...data,
+        name: 'Some fixed name',
+      };
+    },
+  },
+};
+```
+
+:::
+
+### Custom use
+
+When you are building custom ORM specific queries the lifecycles will not be triggered. You can however call a lifecycle function directly if you wish.
+
+**Bookshelf example**
+
+**Path -** `./api/{apiName}/services/{serviceName}.js`
+
+```js
+module.exports = {
+  async createCustomEntry() {
+    const ORMModel = strapi.query(modelName).model;
+
+    const newCustomEntry = await ORMModel.forge().save();
+
+    // trigger manually
+    ORMModel.lifecycles.afterCreate(newCustomEntry.toJSON());
+  },
+};
+```
+
+::: tip
+When calling a lifecycle function directly, you will need to make sure you call it with the expected parameters.
+:::
diff --git a/developer-docs/latest/concepts/queries.md b/developer-docs/latest/concepts/queries.md
new file mode 100644
index 0000000000..d268ecb503
--- /dev/null
+++ b/developer-docs/latest/concepts/queries.md
@@ -0,0 +1,417 @@
+# Queries
+
+Strapi provides a utility function `strapi.query` to make database queries.
+
+You can just call `strapi.query('modelName', 'pluginName')` to access the query API for any model.
+
+These queries handle for you specific Strapi features like `components`, `dynamic zones`, `filters` and `search`.
+
+## API Reference
+
+:::: tabs
+
+::: tab find
+
+### `find`
+
+This method returns a list of entries matching Strapi filters.
+You can also pass a populate option to specify which relations you want to be populated.
+
+#### Examples
+
+**Find by id**:
+
+```js
+strapi.query('restaurant').find({ id: 1 });
+```
+
+**Find by in IN, with a limit**:
+
+```js
+strapi.query('restaurant').find({ _limit: 10, id_in: [1, 2] });
+```
+
+**Find by date orderBy name**:
+
+```js
+strapi.query('restaurant').find({ date_gt: '2019-01-01T00:00:00Z', _sort: 'name:desc' });
+```
+
+**Find by id not in and populate a relation. Skip the first ten results**
+
+```js
+strapi.query('restaurant').find({ id_nin: [1], _start: 10 }, ['category', 'category.name']);
+```
+
+:::
+
+::: tab findOne
+
+### `findOne`
+
+This method returns the first entry matching some basic params.
+You can also pass a populate option to specify which relations you want to be populated.
+
+#### Examples
+
+**Find one by id**:
+
+```js
+strapi.query('restaurant').findOne({ id: 1 });
+```
+
+**Find one by name**:
+
+```js
+strapi.query('restaurant').findOne({ name: 'restaurant name' });
+```
+
+**Find one by name and creation_date**:
+
+```js
+strapi.query('restaurant').findOne({ name: 'restaurant name', date: '2019-01-01T00:00:00Z' });
+```
+
+**Find one by id and populate a relation**
+
+```js
+strapi.query('restaurant').findOne({ id: 1 }, ['category', 'category.name']);
+```
+
+:::
+
+::: tab create
+
+### `create`
+
+Creates an entry in the database and returns the entry.
+
+#### Example
+
+```js
+strapi.query('restaurant').create({
+  name: 'restaurant name',
+  // this is a dynamiczone field. the order is persisted in db.
+  content: [
+    {
+      __component: 'blog.rich-text',
+      title: 'Some title',
+      subTitle: 'Some sub title',
+    },
+    {
+      __component: 'blog.quote',
+      quote: 'Some interesting quote',
+      author: 1,
+    },
+  ],
+  // this is a component field. the order is persisted in db.
+  opening_hours: [
+    {
+      day_interval: 'Mon',
+      opening_hour: '7:00 PM',
+      closing_hour: '11:00 PM',
+    },
+    {
+      day_interval: 'Tue',
+      opening_hour: '7:00 PM',
+      closing_hour: '11:00 PM',
+    },
+  ],
+  // pass the id of a media to link it to the entry
+  cover: 1,
+  // automatically creates the relations when passing the ids in the field
+  reviews: [1, 2, 3],
+});
+```
+
+:::
+
+::: tab update
+
+### `update`
+
+Updates an entry in the database and returns the entry.
+
+#### Examples
+
+**Update by id**
+
+```js
+strapi.query('restaurant').update(
+  { id: 1 },
+  {
+    name: 'restaurant name',
+    content: [
+      {
+        __component: 'blog.rich-text',
+        title: 'Some title',
+        subTitle: 'Some sub title',
+      },
+      {
+        __component: 'blog.quote',
+        quote: 'Some interesting quote',
+        author: 1,
+      },
+    ],
+    opening_hours: [
+      {
+        day_interval: 'Mon',
+        opening_hour: '7:00 PM',
+        closing_hour: '11:00 PM',
+      },
+      {
+        day_interval: 'Tue',
+        opening_hour: '7:00 PM',
+        closing_hour: '11:00 PM',
+      },
+    ],
+    // pass the id of a media to link it to the entry
+    cover: 1,
+    // automatically creates the relations when passing the ids in the field
+    reviews: [1, 2, 3],
+  }
+);
+```
+
+When updating an entry with its components or dynamic zones beware that if you send the components without any `id` the previous components will be deleted and replaced. You can update the components by sending their `id` with the rest of the fields:
+
+**Update by id and update previous components**
+
+```js
+strapi.query('restaurant').update(
+  { id: 1 },
+  {
+    name: 'Mytitle',
+    content: [
+      {
+        __component: 'blog.rich-text',
+        id: 1,
+        title: 'Some title',
+        subTitle: 'Some sub title',
+      },
+      {
+        __component: 'blog.quote',
+        id: 1,
+        quote: 'Some interesting quote',
+        author: 1,
+      },
+    ],
+    opening_hours: [
+      {
+        id: 2,
+        day_interval: 'Mon',
+        opening_hour: '7:00 PM',
+        closing_hour: '11:00 PM',
+      },
+      {
+        id: 1,
+        day_interval: 'Tue',
+        opening_hour: '7:00 PM',
+        closing_hour: '11:00 PM',
+      },
+    ],
+    // pass the id of a media to link it to the entry
+    cover: 1,
+    // automatically creates the relations when passing the ids in the field
+    reviews: [1, 2, 3],
+  }
+);
+```
+
+**Partial update by name**
+
+```js
+strapi.query('restaurant').update(
+  { title: 'specific name' },
+  {
+    title: 'restaurant name',
+  }
+);
+```
+
+:::
+
+::: tab delete
+
+### `delete`
+
+Deletes an entry and returns its value before deletion.
+You can delete multiple entries at once with the passed params.
+
+#### Examples
+
+**Delete one by id**
+
+```js
+strapi.query('restaurant').delete({ id: 1 });
+```
+
+**Delete multiple by field**
+
+```js
+strapi.query('restaurant').delete({ district: '_18th' });
+```
+
+:::
+
+::: tab count
+
+### `count`
+
+Returns the count of entries matching Strapi filters.
+
+#### Examples
+
+**Count by district**
+
+```js
+strapi.query('restaurant').count({ district: '_1st' });
+```
+
+**Count by name contains**
+
+```js
+strapi.query('restaurant').count({ name_contains: 'food' });
+```
+
+**Count by date less than**
+
+```js
+strapi.query('restaurant').count({ date_lt: '2019-08-01T00:00:00Z' });
+```
+
+:::
+
+::: tab search
+
+### `search`
+
+Returns entries based on a search on all fields allowing it. (this feature will return all entries on sqlite).
+
+#### Examples
+
+**Search first ten starting at 20**
+
+```js
+strapi.query('restaurant').search({ _q: 'my search query', _limit: 10, _start: 20 });
+```
+
+**Search and sort**
+
+```js
+strapi.query('restaurant').search({ _q: 'my search query', _limit: 100, _sort: 'date:desc' });
+```
+
+:::
+
+::: tab countSearch
+
+### `countSearch`
+
+Returns the total count of entries based on a search. (this feature will return all entries on sqlite).
+
+#### Example
+
+```js
+strapi.query('restaurant').countSearch({ _q: 'my search query' });
+```
+
+:::
+
+::::
+
+## Custom Queries
+
+When you want to customize your services or create new ones you will have to build your queries with the underlying ORM models.
+
+To access the underlying model:
+
+```js
+strapi.query(modelName, plugin).model;
+```
+
+Then you can run any queries available on the model. You should refer to the specific ORM documentation for more details:
+
+:::: tabs
+
+::: tab SQL
+
+### Bookshelf
+
+Documentation: [https://bookshelfjs.org/](https://bookshelfjs.org/)
+
+**Example**
+
+```js
+const result = await strapi
+  .query('restaurant')
+  .model.query(qb => {
+    qb.where('id', 1);
+  })
+  .fetch();
+
+const fields = result.toJSON();
+```
+
+### Knex
+
+Knex.js can be used to build and make custom queries directly to the database.
+
+Documentation: [http://knexjs.org/#Builder](http://knexjs.org/#Builder)
+
+You can access the Knex instance with:
+
+```js
+const knex = strapi.connections.default;
+```
+
+You can then use Knex to build your own custom queries. You will lose all the functionalities of the model, 
+but this could come handy if you are building a more custom schema.
+Please note that if you are using the [draft system](draft-and-publish.md), Strapi nullyfies all the Draft columns util they are published.
+
+**Example**
+
+```js
+const _ = require('lodash');
+
+const knex = strapi.connections.default;
+const result = await knex('restaurants')
+  .where('cities', 'berlin')
+  .whereNot('cities.published_at', null)
+  .join('chefs', 'restaurants.id', 'chefs.restaurant_id')
+  .select('restaurants.name as restaurant')
+  .select('chef.name as chef')
+
+// Lodash's groupBy method can be used to 
+// return a grouped key-value object generated from 
+// the response
+
+return (_.groupBy(result, 'chef');
+```
+
+**We strongly suggest to sanitize any strings before making queries to the DB**
+Never attempt to make a raw query with data coming straight from the front-end; if you
+were looking for raw queries, please refer to [this section](http://knexjs.org/#Raw-Bindings)
+of the documentation.
+
+:::
+
+::: tab MongoDB
+
+### Mongoose
+
+Documentation: [https://mongoosejs.com/](https://mongoosejs.com/)
+
+**Example**
+
+```js
+const result = strapi.query('restaurant').model.find({
+  date: { $gte: '2019-01-01T00.00.00Z' },
+});
+
+const fields = result.map(entry => entry.toObject());
+```
+
+:::
+
+::::
diff --git a/developer-docs/latest/concepts/services.md b/developer-docs/latest/concepts/services.md
new file mode 100644
index 0000000000..6eabbeb7e0
--- /dev/null
+++ b/developer-docs/latest/concepts/services.md
@@ -0,0 +1,478 @@
+# Services
+
+## Concept
+
+Services are a set of reusable functions. They are particularly useful to respect the DRY (don’t repeat yourself) programming concept and to simplify [controllers](./controllers.md) logic.
+
+## Core services
+
+When you create a new `Content Type` or a new model, you will see a new empty service has been created. It is because Strapi builds a generic service for your models by default and allows you to override and extend it in the generated files.
+
+### Extending a Model Service
+
+Here are the core methods (and their current implementation).
+You can simply copy and paste this code to your own service file to customize the methods.
+
+You can read about `strapi.query` calls [here](./queries.md).
+
+::: tip
+In the following example your controller, service and model are named `restaurant`.
+:::
+
+#### Utils
+
+If you're extending the `create` or `update` service, first require the following utility function:
+
+```js
+const { isDraft } = require('strapi-utils').contentTypes;
+```
+
+- `isDraft`: This function checks if the entry is a draft.
+
+
+#### Collection Type
+
+:::: tabs
+
+::: tab find
+
+#### `find`
+
+```js
+module.exports = {
+  /**
+   * Promise to fetch all records
+   *
+   * @return {Promise}
+   */
+  find(params, populate) {
+    return strapi.query('restaurant').find(params, populate);
+  },
+};
+```
+
+- `params` (object): this represent filters for your find request.<br>
+  The object follow the URL query format, [refer to this documentation.](../content-api/parameters.md).
+
+```json
+{
+  "name": "Tokyo Sushi"
+}
+// or
+{
+  "_limit": 20,
+  "name_contains": "sushi"
+}
+```
+
+- `populate` (array): you have to mention data you want populate `["author", "author.name", "comment", "comment.content"]`
+
+:::
+
+::: tab findOne
+
+#### `findOne`
+
+```js
+module.exports = {
+  /**
+   * Promise to fetch record
+   *
+   * @return {Promise}
+   */
+
+  findOne(params, populate) {
+    return strapi.query('restaurant').findOne(params, populate);
+  },
+};
+```
+
+- `params` (object): this represent filters for your find request.<br>
+  The object follow the URL query format, [refer to this documentation.](../content-api/parameters.md).
+
+```json
+{
+  "name": "Tokyo Sushi"
+}
+// or
+{
+  "name_contains": "sushi"
+}
+```
+
+- `populate` (array): you have to mention data you want populate `["author", "author.name", "comment", "comment.content"]`
+
+:::
+
+::: tab count
+
+#### `count`
+
+```js
+module.exports = {
+  /**
+   * Promise to count record
+   *
+   * @return {Promise}
+   */
+
+  count(params) {
+    return strapi.query('restaurant').count(params);
+  },
+};
+```
+
+- `params` (object): this represent filters for your find request.<br>
+  The object follow the URL query format, [refer to this documentation.](../content-api/parameters.md).
+
+```json
+{
+  "name": "Tokyo Sushi"
+}
+// or
+{
+  "name_contains": "sushi"
+}
+```
+
+:::
+
+::: tab create
+
+#### `create`
+
+```js
+const { isDraft } = require('strapi-utils').contentTypes;
+
+module.exports = {
+  /**
+   * Promise to add record
+   *
+   * @return {Promise}
+   */
+
+  async create(data, { files } = {}) {
+    const isDraft = isDraft(data, strapi.models.restaurant);
+    const validData = await strapi.entityValidator.validateEntityCreation(
+      strapi.models.restaurant, 
+      data, 
+      { isDraft }
+    );
+    
+    const entry = await strapi.query('restaurant').create(validData);
+
+    if (files) {
+      // automatically uploads the files based on the entry and the model
+      await strapi.entityService.uploadFiles(entry, files, {
+        model: 'restaurant',
+        // if you are using a plugin's model you will have to add the `source` key (source: 'users-permissions')
+      });
+      return this.findOne({ id: entry.id });
+    }
+
+    return entry;
+  },
+};
+```
+
+:::
+
+::: tab update
+
+#### `update`
+
+```js
+const { isDraft } = require('strapi-utils').contentTypes;
+
+module.exports = {
+  /**
+   * Promise to edit record
+   *
+   * @return {Promise}
+   */
+
+  async update(params, data, { files } = {}) {
+    const existingEntry = await db.query('restaurant').findOne(params);
+    
+    const isDraft = isDraft(existingEntry, strapi.models.restaurant);
+    const validData = await strapi.entityValidator.validateEntityUpdate(
+      strapi.models.restaurant, 
+      data, 
+      { isDraft }
+    );
+    
+    const entry = await strapi.query('restaurant').update(params, validData);
+
+    if (files) {
+      // automatically uploads the files based on the entry and the model
+      await strapi.entityService.uploadFiles(entry, files, {
+        model: 'restaurant',
+        // if you are using a plugin's model you will have to add the `source` key (source: 'users-permissions')
+      });
+      return this.findOne({ id: entry.id });
+    }
+
+    return entry;
+  },
+};
+```
+
+- `params` (object): it should look like this `{id: 1}`
+
+:::
+
+::: tab delete
+
+#### `delete`
+
+```js
+module.exports = {
+  /**
+   * Promise to delete a record
+   *
+   * @return {Promise}
+   */
+
+  delete(params) {
+    return strapi.query('restaurant').delete(params);
+  },
+};
+```
+
+- `params` (object): it should look like this `{id: 1}`
+
+:::
+
+::: tab search
+
+#### `search`
+
+```js
+module.exports = {
+  /**
+   * Promise to search records
+   *
+   * @return {Promise}
+   */
+
+  search(params) {
+    return strapi.query('restaurant').search(params);
+  },
+};
+```
+
+- `params` (object): this represent filters for your find request.<br>
+  The object follow the URL query format, [refer to this documentation.](../content-api/parameters.md).
+
+```json
+{
+  "name": "Tokyo Sushi"
+}
+// or
+{
+  "name_contains": "sushi"
+}
+```
+
+:::
+
+::: tab countSearch
+
+#### `countSearch`
+
+```js
+module.exports = {
+  /**
+   * Promise to count searched records
+   *
+   * @return {Promise}
+   */
+  countSearch(params) {
+    return strapi.query('restaurant').countSearch(params);
+  },
+};
+```
+
+- `params` (object): this represent filters for your find request.<br>
+  The object follow the URL query format, [refer to this documentation.](../content-api/parameters.md).
+
+```json
+{
+  "name": "Tokyo Sushi"
+}
+// or
+{
+  "name_contains": "sushi"
+}
+```
+
+:::
+
+::::
+
+#### Single Type
+
+:::: tabs
+
+::: tab find
+
+#### `find`
+
+```js
+const _ = require('lodash');
+
+module.exports = {
+  /**
+   * Promise to fetch the record
+   *
+   * @return {Promise}
+   */
+  async find(populate) {
+    const results = await strapi.query('restaurant').find({ _limit: 1 }, populate);
+    return _.first(results) || null;
+  },
+};
+```
+
+- `populate` (array): you have to mention data you want populate `["author", "author.name", "comment", "comment.content"]`
+
+:::
+
+::: tab createOrUpdate
+
+#### `createOrUpdate`
+
+```js
+const _ = require('lodash');
+
+module.exports = {
+  /**
+   * Promise to add/update the record
+   *
+   * @return {Promise}
+   */
+
+  async createOrUpdate(data, { files } = {}) {
+    const results = await strapi.query('restaurant').find({ _limit: 1 });
+    const entity = _.first(results) || null;
+
+    let entry;
+    if (!entity) {
+      entry = await strapi.query('restaurant').create(data);
+    } else {
+      entry = await strapi.query('restaurant').update({ id: entity.id }, data);
+    }
+
+    if (files) {
+      // automatically uploads the files based on the entry and the model
+      await strapi.entityService.uploadFiles(entry, files, {
+        model: 'restaurant',
+        // if you are using a plugin's model you will have to add the `plugin` key (plugin: 'users-permissions')
+      });
+      return this.findOne({ id: entry.id });
+    }
+
+    return entry;
+  },
+};
+```
+
+:::
+
+::: tab delete
+
+#### `delete`
+
+```js
+module.exports = {
+  /**
+   * Promise to delete a record
+   *
+   * @return {Promise}
+   */
+
+  delete() {
+    const results = await strapi.query('restaurant').find({ _limit: 1 });
+    const entity = _.first(results) || null;
+
+    if (!entity) return;
+
+    return strapi.query('restaurant').delete({id: entity.id});
+  },
+};
+```
+
+:::
+
+::::
+
+## Custom services
+
+You can also create custom services to build your own business logic.
+
+### How to create a custom service
+
+There are two ways to create a service.
+
+- Using the CLI `strapi generate:service restaurant`.<br>Read the [CLI documentation](../cli/CLI.md) for more information.
+- Manually create a JavaScript file named in `./api/**/services/`.
+
+#### Example
+
+The goal of a service is to store reusable functions. An `email` service could be useful to send emails from different functions in our codebase:
+
+**Path —** `./api/email/services/Email.js`.
+
+```js
+const nodemailer = require('nodemailer');
+
+// Create reusable transporter object using SMTP transport.
+const transporter = nodemailer.createTransport({
+  service: 'Gmail',
+  auth: {
+    user: 'user@gmail.com',
+    pass: 'password',
+  },
+});
+
+module.exports = {
+  send: (from, to, subject, text) => {
+    // Setup e-mail data.
+    const options = {
+      from,
+      to,
+      subject,
+      text,
+    };
+
+    // Return a promise of the function that sends the email.
+    return transporter.sendMail(options);
+  },
+};
+```
+
+::: tip
+please make sure you installed `nodemailer` (`npm install nodemailer`) for this example.
+:::
+
+The service is now available through the `strapi.services` global variable. We can use it in another part of our codebase. For example a controller like below:
+
+**Path —** `./api/user/controllers/User.js`.
+
+```js
+module.exports = {
+  // GET /hello
+  signup: async ctx => {
+    // Store the new user in database.
+    const user = await User.create(ctx.query);
+
+    // Send an email to validate his subscriptions.
+    strapi.services.email.send('welcome@mysite.com', user.email, 'Welcome', '...');
+
+    // Send response to the server.
+    ctx.send({
+      ok: true,
+    });
+  },
+};
+```
diff --git a/developer-docs/latest/concepts/sso.md b/developer-docs/latest/concepts/sso.md
new file mode 100644
index 0000000000..3b387732f8
--- /dev/null
+++ b/developer-docs/latest/concepts/sso.md
@@ -0,0 +1,443 @@
+# Single Sign On [<Badge text="Gold" type="warning" vertical="middle"/>](https://strapi.io/pricing)
+
+Single-Sign-On on Strapi allows you to configure additional sign-in and sign-up methods for your administration panel.
+
+::: warning CAUTION
+It is currently not possible to associate a unique SSO provider to an email address used for a Strapi account, meaning that the access to a Strapi account cannot be restricted to only one SSO provider. For more information and workarounds to solve this issue, [please refer to the dedicated GitHub issue](https://github.com/strapi/strapi/issues/9466#issuecomment-783587648).
+:::
+
+## Prerequisites
+
+- A Strapi application running on version 3.5.0 or higher is required.
+- To configure SSO on your application, you will need an EE license with a Gold plan.
+- Make sure Strapi is part of the applications you can access with your provider. For example, with Microsoft (Azure) Active Directory, you must first ask someone with the right permissions to add Strapi to the list of allowed applications. Please refer to your provider(s) documentation to learn more about that.
+
+## Usage
+
+SSO configuration lives in the server configuration of your application found within `/config/server.js`.
+
+### Accessing the configuration
+
+The providers' configuration should be written within the `admin.auth.providers` path of the server configuration.
+
+`admin.auth.providers` is an array of [provider configuration](#provider-configuration).
+
+```javascript
+module.exports = ({ env }) => ({
+  // ...
+  admin: {
+    // ...
+    auth: {
+      providers: [], // The providers' configuration lives there
+    },
+  },
+});
+```
+
+### Provider Configuration
+
+A provider's configuration is a Javascript object built with the following properties:
+
+| Name             | Required | Type     | Description                                                                    |
+|----------------- |----------|----------|--------------------------------------------------------------------------------|
+| `uid`            | true     | string   | The UID of the strategy. It must match the strategy's name                     |
+| `displayName`    | true     | string   | The name that will be used on the login page to reference the provider        |
+| `icon`           | false    | string   | An image URL. If specified, it will replace the displayName on the login page  |
+| `createStrategy` | true     | function | A factory that will build and return a new passport strategy for your provider. Takes the strapi instance as parameter |
+
+::: tip
+The `uid` property is the unique identifier of each strategy and is generally found in the strategy's package. If you are not sure of what it refers to, please contact the maintainer of the strategy.
+:::
+
+#### The `createStrategy` Factory
+
+A passport strategy is usually built by instantiating it using 2 parameters: the configuration object, and the verify function.
+
+##### Configuration Object
+
+The configuration object depends on the strategy needs, but often asks for a callback URL to be redirected to once the connection has been made on the provider side.
+
+You can generate a specific callback URL for your provider using the `getStrategyCallbackURL` method. This URL also needs to be written on the provider side in order to allow redirection from it.
+
+The format of the callback URL is the following: `/admin/connect/<provider_uid>`.
+
+::: tip
+`strapi.admin.services.passport.getStrategyCallbackURL` is a Strapi helper you can use to get a callback URL for a specific provider. It takes a provider name as a parameter and returns a URL.
+:::
+
+If needed, this is also where you will put your client ID and secret key for your OAuth2 application.
+
+##### Verify Function
+
+The verify function is used here as a middleware allowing the user to transform and make extra processing on the data returned from the provider API.
+
+This function always takes a `done` method as last parameter which is used to transfer needed data to the Strapi layer of SSO.
+
+Its signature is the following: `void done(error: any, data: object);` and it follows the following rules:
+
+- If `error` is not set to `null`, then the data sent is ignored, and the controller will throw an error.
+- If the SSO's auto-registration feature is disabled, then the `data` object only need to be composed of an `email` property.
+- If the SSO's auto-registration feature is enabled, then you will need to define (in addition to the `email`) either a `username` property or both `firstname` and `lastname` within the `data` oject.
+
+### Adding a provider
+
+Adding a new provider means adding a new way for your administrators to log-in.
+
+To achieve a great flexibility and a large choice of provider, Strapi uses [Passport.js](http://www.passportjs.org/). Any valid passport strategy that doesn't need additional custom data should therefore work with Strapi.
+
+::: warning
+Strategies such as [ldapauth](https://github.com/vesse/passport-ldapauth) don't work out of the box since they require extra data to be sent from the admin panel.
+If you want to add an LDAP provider to your application, you will need to write a [custom strategy](http://www.passportjs.org/packages/passport-custom/).
+You can also use services such as Okta and Auth0 as bridge services.
+:::
+
+### Configuring the provider
+
+To configure a provider, follow the procedure below:
+
+1. Make sure to import your strategy in your server configuration file, either from an installed package or a local file.
+2. You'll need to add a new item to the `admin.auth.providers` array in your server configuration that will match the [format given above](#provider-configuration)
+3. Restart your application, the provider should appear on your admin login page.
+
+## Examples
+
+:::::: tabs
+
+::::: tab Google
+
+Using: [passport-google-oauth2](https://github.com/mstade/passport-google-oauth2)
+
+:::: tabs
+
+::: tab yarn
+
+```bash
+yarn add passport-google-oauth2
+```
+
+:::
+
+::: tab npm
+
+```bash
+npm install --save passport-google-oauth2
+```
+
+::::
+
+`/config/server.js`
+
+```jsx
+'use strict';
+
+const GoogleStrategy = require('passport-google-oauth2');
+
+module.exports = ({ env }) => ({
+  // ...
+  admin: {
+    // ...
+    auth: {
+      /// ...
+      providers: [
+        {
+          uid: 'google',
+          displayName: 'Google',
+          icon: 'https://cdn2.iconfinder.com/data/icons/social-icons-33/128/Google-512.png' ,
+          createStrategy: strapi => new GoogleStrategy({
+              clientID: env('GOOGLE_CLIENT_ID'),
+              clientSecret: env('GOOGLE_CLIENT_SECRET'),
+              scope: [
+                'https://www.googleapis.com/auth/userinfo.email',
+                'https://www.googleapis.com/auth/userinfo.profile'
+              ],
+              callbackURL: strapi.admin.services.passport.getStrategyCallbackURL('google')
+            }, (request, accessToken, refreshToken, profile, done) => {
+              done(null, {
+                email: profile.email,
+                firstname: profile.given_name,
+                lastname: profile.family_name,
+              });
+            }
+          ),
+        },
+      ],
+    },
+  },
+});
+```
+
+:::::
+
+::::: tab Github
+
+Using: [passport-github](https://github.com/cfsghost/passport-github)
+
+:::: tabs
+
+::: tab yarn
+
+```bash
+yarn add passport-github2
+```
+
+:::
+
+::: tab npm
+
+```bash
+npm install --save passport-github2
+```
+
+:::
+
+::::
+
+`/config/server.js`
+
+```jsx
+'use strict';
+
+const GithubStrategy = require('passport-github2');
+
+module.exports = ({ env }) => ({
+  // ...
+  admin: {
+    // ...
+    auth: {
+      // ...
+      providers: [
+        {
+          uid: 'github',
+          displayName: 'Github',
+          icon: 'https://cdn1.iconfinder.com/data/icons/logotypes/32/github-512.png',
+          createStrategy: strapi => new GithubStrategy({
+            clientID: env('GITHUB_CLIENT_ID'),
+            clientSecret: env('GITHUB_CLIENT_SECRET'),
+            scope: ['user:email'],
+            callbackURL: strapi.admin.services.passport.getStrategyCallbackURL('github'),
+          }, (accessToken, refreshToken, profile, done) => {
+            done(null, {
+              email: profile.emails[0].value,
+              username: profile.username,
+            });
+          }),
+        },
+      ],
+    },
+  },
+});
+```
+:::::
+
+::::: tab Discord
+
+Using: [passport-discord](https://github.com/nicholastay/passport-discord#readme)
+
+:::: tabs
+
+::: tab yarn
+
+```bash
+yarn add passport-discord
+```
+
+:::
+
+::: tab npm
+
+```bash
+npm install --save passport-discord
+```
+
+:::
+
+::::
+
+`/config/server.js`
+
+```jsx
+"use strict";
+
+const DiscordStrategy = require("passport-discord");
+
+module.exports = ({ env }) => ({
+  // ...
+  admin: {
+    // ...
+    auth: {
+      // ...
+      providers: [
+        {
+          uid: 'discord',
+          displayName: 'Discord',
+          icon: 'https://cdn0.iconfinder.com/data/icons/free-social-media-set/24/discord-512.png',
+          createStrategy: strapi =>
+            new DiscordStrategy(
+              {
+                clientID: env('DISCORD_CLIENT_ID'),
+                clientSecret: env('DISCORD_SECRET'),
+                callbackURL: strapi.admin.services.passport.getStrategyCallbackURL(
+                  'discord'
+                ),
+                scope: ['identify', 'email'],
+              },
+              (accessToken, refreshToken, profile, done) => {
+                done(null, {
+                  email: profile.email,
+                  username: `${profile.username}#${profile.discriminator}`,
+                });
+              }
+            ),
+        },
+      ],
+    },
+  },
+});
+```
+:::::
+::::: tab Microsoft
+
+Using: [passport-azure-ad-oauth2](https://github.com/auth0/passport-azure-ad-oauth2#readme)
+
+:::: tabs
+
+::: tab yarn
+
+```bash
+yarn add passport-azure-ad-oauth2 jsonwebtoken
+```
+
+:::
+
+::: tab npm
+
+```bash
+npm install --save passport-azure-ad-oauth2 jsonwebtoken
+```
+
+:::
+
+::::
+
+`/config/server.js`
+
+```jsx
+"use strict";
+
+const AzureAdOAuth2Strategy = require('passport-azure-ad-oauth2');
+const jwt = require('jsonwebtoken');
+
+module.exports = ({ env }) => ({
+  // ...
+  admin: {
+    // ...
+    auth: {
+      // ...
+      providers: [
+        {
+          uid: 'azure_ad_oauth2',
+          displayName: 'Microsoft',
+          icon: 'https://upload.wikimedia.org/wikipedia/commons/thumb/9/96/Microsoft_logo_%282012%29.svg/320px-Microsoft_logo_%282012%29.svg.png',
+          createStrategy: strapi => new AzureAdOAuth2Strategy({
+            clientID: env('MICROSOFT_CLIENT_ID', ''),
+            clientSecret: env('MICROSOFT_CLIENT_SECRET', ''),
+            scope: ['user:email'],
+            tenant: env('MICROSOFT_TENANT_ID', ''),
+            callbackURL: strapi.admin.services.passport.getStrategyCallbackURL('azure_ad_oauth2'),
+          }, (accessToken, refreshToken, params, profile, done) => {
+            var waadProfile = jwt.decode(params.id_token, '', true);
+            done(null, {
+              email: waadProfile.upn,
+              username: waadProfile.upn
+            });
+          }),
+        },
+      ],
+    },
+  },
+});
+```
+:::::
+::::::
+
+## Advanced Customization
+
+### Admin Panel URL
+
+If your administration panel lives on a different host/port than your Strapi server, you will need to modify the admin URL.
+To do so, head to your `/config/server.js` configuration file and tweak the `admin.url` field.
+
+For example, if your admin application has been started on `https://api.example.com`, your configuration will look like the following:
+
+`/config/server.js`
+
+```javascript
+module.exports = () => ({
+  // ...
+  admin: {
+    // ...
+    url: 'https://api.example.com/admin',
+  },
+});
+```
+
+### Custom Logic
+
+In some scenarios, you will want to write additional logic for your connection workflow such as:
+- Restricting connection and registration for a specific domain
+- Triggering actions on connection attempt
+- Analytics
+
+The easiest way to do so is to plug into the verify function of your strategy and write some code.
+
+For example, if you want to allow only people with an official strapi.io email address, you can instantiate your strategy like this:
+
+```javascript
+const strategyInstance = new Strategy(
+  configuration,
+  ({ email, username }, done) => {
+    // If the email ends with @strapi.io
+    if (email.endsWith('@strapi.io')) {
+      // Then we continue with the data given by the provider
+      return done(null, { email, username });
+    }
+    
+    // Otherwise, we continue by sending an error to the done function
+    done(new Error('Forbidden email address'));
+  },
+);
+```
+
+### Authentication Events
+
+The SSO feature adds a new [authentication event](configurations.html#available-options): `onSSOAutoRegistration`.
+
+This event is triggered whenever a user is created using the auto-register feature added by SSO.
+It contains the created user (`event.user`), and the provider used to make the registration (`event.provider`).
+
+Example:
+
+`/config/server.js`
+```javascript
+module.exports = () => ({
+  // ...
+  admin: {
+    // ...
+    auth: {
+      // ...
+      events: {
+        onConnectionSuccess(e) {},
+        onConnectionError(e) {},
+        // ...
+        onSSOAutoRegistration(e) {
+          const { user, provider } = e;
+
+          console.log(
+            `A new user (${user.id}) has been automatically registered using ${provider}`
+          );
+        },
+      },
+    },
+  },
+});
+```
diff --git a/developer-docs/latest/migration-guide/README.md b/developer-docs/latest/migration-guide/README.md
new file mode 100644
index 0000000000..7d131ebe6b
--- /dev/null
+++ b/developer-docs/latest/migration-guide/README.md
@@ -0,0 +1,87 @@
+# Migrations guides
+
+Please also refer to the following [update guide](../guides/update-version.md) for a better understanding of how to update your project.
+
+**Pay special attention to the [note](../guides/update-version.md#extensions) about upgrading if you are using the extensions system.**
+
+## Instructions
+
+When upgrading you will need to follow every migration guide between your current version and the one you are upgrading to.
+
+**Example**
+
+If you were upgrading from the `3.0.0-beta.19.5` to `3.2.0`, here are the following guides you would have to follow:
+
+- Migration guide from beta.19.4+ to beta.20.
+- Migration guide from beta.20+ to stable.
+- Migration guide from 3.0.x to 3.1.x.
+- Migration guide from 3.1.x to 3.2.3.
+
+## V3 guides
+
+- [Migration guide from 3.4.x to 3.4.4](migration-guide-3.4.x-to-3.4.4.md)
+- [Migration guide from 3.3.x to 3.4.0](migration-guide-3.3.x-to-3.4.0.md)
+- [Migration guide from 3.2.5 to 3.3.0](migration-guide-3.2.5-to-3.3.0.md)
+- [Migration guide from 3.2.3 to 3.2.4](migration-guide-3.2.3-to-3.2.4.md)
+- [Migration guide from 3.1.x to 3.2.3](migration-guide-3.1.x-to-3.2.x.md)
+- [Migration guide from 3.0.x to 3.1.x](migration-guide-3.0.x-to-3.1.x.md)
+
+
+## Beta guides
+
+::: warning
+
+The Strapi Beta version is no longer supported, you should upgrade to the V3 Stable.
+
+:::
+
+- [Migration guide from beta.20+ to stable](migration-guide-beta.20-to-3.0.0.md)
+- [Migration guide from beta.19.4+ to beta.20](migration-guide-beta.19-to-beta.20.md)
+- [Migration guide from beta.19+ to beta.19.4](migration-guide-beta.19-to-beta.19.4.md)
+- [Migration guide from beta.18 to beta.19](migration-guide-beta.18-to-beta.19.md)
+- [Migration guide from beta.17+ to beta.18](migration-guide-beta.17-to-beta.18.md)
+- [Migration guide from beta.16+ to beta.17.4](migration-guide-beta.16-to-beta.17.4.md)
+- [Migration guide from beta.15 to beta.16](migration-guide-beta.15-to-beta.16.md)
+
+## Alpha guides
+
+::: warning
+
+The Strapi Alpha version is no longer supported, you should upgrade to the V3 Stable.
+If you have issues upgrading, it's our general recommendation to create a new project.
+
+:::
+
+- [Migrating from v1 to v3](migration-guide-1-to-3.md)
+- [Migration guide from alpha.7.4 to alpha.8](migration-guide-alpha.7.4-to-alpha.8.md)
+- [Migration guide from alpha.8 to alpha.9](migration-guide-alpha.8-to-alpha.9.md)
+- [Migration guide from alpha.9 to alpha.10](migration-guide-alpha.9-to-alpha.10.md)
+- [Migration guide from alpha.10 to alpha.11](migration-guide-alpha.10-to-alpha.11.md)
+- [Migration guide from alpha.11 to alpha.12](migration-guide-alpha.11-to-alpha.12.md)
+- [Migration guide from alpha.12.1 to alpha.12.2](migration-guide-alpha.12.1-to-alpha.12.2.md)
+- [Migration guide from alpha.12.2 to alpha.12.3](migration-guide-alpha.12.2-to-alpha.12.3.md)
+- [Migration guide from alpha.12.3 to alpha.12.4](migration-guide-alpha.12.3-to-alpha.12.4.md)
+- [Migration guide from alpha.12.4 to alpha.12.5](migration-guide-alpha.12.4-to-alpha.12.5.md)
+- [Migration guide from alpha.12.5 to alpha.12.6](migration-guide-alpha.12.5-to-alpha.12.6.md)
+- [Migration guide from alpha.12.6 to alpha.12.7](migration-guide-alpha.12.6-to-alpha.12.7.md)
+- [Migration guide from alpha.12.7 to alpha.13](migration-guide-alpha.12.7-to-alpha.13.md)
+- [Migration guide from alpha.13 to alpha.13.1](migration-guide-alpha.13-to-alpha.13.1.md)
+- [Migration guide from alpha.13.1 to alpha.14](migration-guide-alpha.13.1-to-alpha.14.md)
+- [Migration guide from alpha.14 to alpha.14.1](migration-guide-alpha.14-to-alpha.14.1.md)
+- [Migration guide from alpha.14.1 to alpha.14.2](migration-guide-alpha.14.1-to-alpha.14.2.md)
+- [Migration guide from alpha.14.2 to alpha.14.3](migration-guide-alpha.14.2-to-alpha.14.3.md)
+- [Migration guide from alpha.14.3 to alpha.14.4](migration-guide-alpha.14.3-to-alpha.14.4.md)
+- [Migration guide from alpha.14.4 to alpha.14.5](migration-guide-alpha.14.4-to-alpha.14.5.md)
+- [Migration guide from alpha.14.5 to alpha.15](migration-guide-alpha.14.5-to-alpha.15.md)
+- [Migration guide from alpha.15 to alpha.16](migration-guide-alpha.15-to-alpha.16.md)
+- [Migration guide from alpha.16 to alpha.17](migration-guide-alpha.16-to-alpha.17.md)
+- [Migration guide from alpha.17 to alpha.18](migration-guide-alpha.17-to-alpha.18.md)
+- [Migration guide from alpha.18 to alpha.19](migration-guide-alpha.18-to-alpha.19.md)
+- [Migration guide from alpha.19 to alpha.20](migration-guide-alpha.19-to-alpha.20.md)
+- [Migration guide from alpha.20 to alpha.21](migration-guide-alpha.20-to-alpha.21.md)
+- [Migration guide from alpha.21 to alpha.22](migration-guide-alpha.21-to-alpha.22.md)
+- [Migration guide from alpha.22 to alpha.23](migration-guide-alpha.22-to-alpha.23.md)
+- [Migration guide from alpha.23 to alpha.24](migration-guide-alpha.23-to-alpha.24.md)
+- [Migration guide from alpha.24 to alpha.25](migration-guide-alpha.24-to-alpha.25.md)
+- [Migration guide from alpha.25 to alpha.26](migration-guide-alpha.25-to-alpha.26.md)
+- [Migration guide from alpha.26 to beta](migration-guide-alpha.26-to-beta.md)
diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js
index d4deb84780..3c53573bcc 100644
--- a/docs/.vuepress/config.js
+++ b/docs/.vuepress/config.js
@@ -135,6 +135,11 @@ const sidebar = {
       title: 'Plugins',
       children: [['/user-docs/latest/plugins/introduction-to-plugins', 'Introduction to plugins']],
     },
+    {
+      collapsable: false,
+      title: 'General settings',
+      children: [['/latest/settings/managing-global-settings', 'Managing global settings']],
+    },
   ],
 };
 
@@ -155,7 +160,7 @@ const checklinksIgnoredFiles = [
   './developer-docs/latest/setup-deployment-guides/configurations.md', // line 940
   './developer-docs/latest/developer-resources/content-api/content-api.md', // line 810
   './developer-docs/latest/update-migration-guides/migration-guides/migration-guide-beta.20-to-3.0.0.md', // line 93
-]
+];
 
 module.exports = {
   title: '',
@@ -169,11 +174,11 @@ module.exports = {
       ga: 'UA-54313258-1',
     },
     'check-md': {
-      ignore: checklinksIgnoredFiles
+      ignore: checklinksIgnoredFiles,
     },
     seo: {
       siteTitle: (_, $site) => $site.title,
-      title: ($page) => $page.title,
+      title: $page => $page.title,
     },
   },
   head: [
diff --git a/docs/developer-docs/latest/concepts/sso.md b/docs/developer-docs/latest/concepts/sso.md
new file mode 100644
index 0000000000..53274695da
--- /dev/null
+++ b/docs/developer-docs/latest/concepts/sso.md
@@ -0,0 +1,443 @@
+# Single Sign On [<Badge text="Gold" type="warning" vertical="middle"/>](https://strapi.io/pricing)
+
+Single-Sign-On on Strapi allows you to configure additional sign-in and sign-up methods for your administration panel.
+
+::: warning CAUTION
+It is currently not possible to associate a unique SSO provider to an email address used for a Strapi account, meaning that the access to a Strapi account cannot be restricted to only one SSO provider. For more information and workarounds to solve this issue, [please refer to the dedicated GitHub issue](https://github.com/strapi/strapi/issues/9466#issuecomment-783587648).
+:::
+
+## Prerequisites
+
+- A Strapi application running on version 3.5.0 or higher is required.
+- To configure SSO on your application, you will need an EE license with a Gold plan.
+- Make sure Strapi is part of the applications you can access with your provider. For example, with Microsoft (Azure) Active Directory, you must first ask someone with the right permissions to add Strapi to the list of allowed applications. Please refer to your provider(s) documentation to learn more about that.
+
+## Usage
+
+SSO configuration lives in the server configuration of your application found within `/config/server.js`.
+
+### Accessing the configuration
+
+The providers' configuration should be written within the `admin.auth.providers` path of the server configuration.
+
+`admin.auth.providers` is an array of [provider configuration](#provider-configuration).
+
+```javascript
+module.exports = ({ env }) => ({
+  // ...
+  admin: {
+    // ...
+    auth: {
+      providers: [], // The providers' configuration lives there
+    },
+  },
+});
+```
+
+### Provider Configuration
+
+A provider's configuration is a Javascript object built with the following properties:
+
+| Name             | Required | Type     | Description                                                                    |
+|----------------- |----------|----------|--------------------------------------------------------------------------------|
+| `uid`            | true     | string   | The UID of the strategy. It must match the strategy's name                     |
+| `displayName`    | true     | string   | The name that will be used on the login page to reference the provider        |
+| `icon`           | false    | string   | An image URL. If specified, it will replace the displayName on the login page  |
+| `createStrategy` | true     | function | A factory that will build and return a new passport strategy for your provider. Takes the strapi instance as parameter |
+
+::: tip
+The `uid` property is the unique identifier of each strategy and is generally found in the strategy's package. If you are not sure of what it refers to, please contact the maintainer of the strategy.
+:::
+
+#### The `createStrategy` Factory
+
+A passport strategy is usually built by instantiating it using 2 parameters: the configuration object, and the verify function.
+
+##### Configuration Object
+
+The configuration object depends on the strategy needs, but often asks for a callback URL to be redirected to once the connection has been made on the provider side.
+
+You can generate a specific callback URL for your provider using the `getStrategyCallbackURL` method. This URL also needs to be written on the provider side in order to allow redirection from it.
+
+The format of the callback URL is the following: `/admin/connect/<provider_uid>`.
+
+::: tip
+`strapi.admin.services.passport.getStrategyCallbackURL` is a Strapi helper you can use to get a callback URL for a specific provider. It takes a provider name as a parameter and returns a URL.
+:::
+
+If needed, this is also where you will put your client ID and secret key for your OAuth2 application.
+
+##### Verify Function
+
+The verify function is used here as a middleware allowing the user to transform and make extra processing on the data returned from the provider API.
+
+This function always takes a `done` method as last parameter which is used to transfer needed data to the Strapi layer of SSO.
+
+Its signature is the following: `void done(error: any, data: object);` and it follows the following rules:
+
+- If `error` is not set to `null`, then the data sent is ignored, and the controller will throw an error.
+- If the SSO's auto-registration feature is disabled, then the `data` object only need to be composed of an `email` property.
+- If the SSO's auto-registration feature is enabled, then you will need to define (in addition to the `email`) either a `username` property or both `firstname` and `lastname` within the `data` oject.
+
+### Adding a provider
+
+Adding a new provider means adding a new way for your administrators to log-in.
+
+To achieve a great flexibility and a large choice of provider, Strapi uses [Passport.js](http://www.passportjs.org/). Any valid passport strategy that doesn't need additional custom data should therefore work with Strapi.
+
+::: warning
+Strategies such as [ldapauth](https://github.com/vesse/passport-ldapauth) don't work out of the box since they require extra data to be sent from the admin panel.
+If you want to add an LDAP provider to your application, you will need to write a [custom strategy](http://www.passportjs.org/packages/passport-custom/).
+You can also use services such as Okta and Auth0 as bridge services.
+:::
+
+### Configuring the provider
+
+To configure a provider, follow the procedure below:
+
+1. Make sure to import your strategy in your server configuration file, either from an installed package or a local file.
+2. You'll need to add a new item to the `admin.auth.providers` array in your server configuration that will match the [format given above](#provider-configuration)
+3. Restart your application, the provider should appear on your admin login page.
+
+## Examples
+
+:::::: tabs
+
+::::: tab Google
+
+Using: [passport-google-oauth2](https://github.com/mstade/passport-google-oauth2)
+
+:::: tabs
+
+::: tab yarn
+
+```bash
+yarn add passport-google-oauth2
+```
+
+:::
+
+::: tab npm
+
+```bash
+npm install --save passport-google-oauth2
+```
+
+::::
+
+`/config/server.js`
+
+```jsx
+'use strict';
+
+const GoogleStrategy = require('passport-google-oauth2');
+
+module.exports = ({ env }) => ({
+  // ...
+  admin: {
+    // ...
+    auth: {
+      /// ...
+      providers: [
+        {
+          uid: 'google',
+          displayName: 'Google',
+          icon: 'https://cdn2.iconfinder.com/data/icons/social-icons-33/128/Google-512.png' ,
+          createStrategy: strapi => new GoogleStrategy({
+              clientID: env('GOOGLE_CLIENT_ID'),
+              clientSecret: env('GOOGLE_CLIENT_SECRET'),
+              scope: [
+                'https://www.googleapis.com/auth/userinfo.email',
+                'https://www.googleapis.com/auth/userinfo.profile'
+              ],
+              callbackURL: strapi.admin.services.passport.getStrategyCallbackURL('google')
+            }, (request, accessToken, refreshToken, profile, done) => {
+              done(null, {
+                email: profile.email,
+                firstname: profile.given_name,
+                lastname: profile.family_name,
+              });
+            }
+          ),
+        },
+      ],
+    },
+  },
+});
+```
+
+:::::
+
+::::: tab Github
+
+Using: [passport-github](https://github.com/cfsghost/passport-github)
+
+:::: tabs
+
+::: tab yarn
+
+```bash
+yarn add passport-github2
+```
+
+:::
+
+::: tab npm
+
+```bash
+npm install --save passport-github2
+```
+
+:::
+
+::::
+
+`/config/server.js`
+
+```jsx
+'use strict';
+
+const GithubStrategy = require('passport-github2');
+
+module.exports = ({ env }) => ({
+  // ...
+  admin: {
+    // ...
+    auth: {
+      // ...
+      providers: [
+        {
+          uid: 'github',
+          displayName: 'Github',
+          icon: 'https://cdn1.iconfinder.com/data/icons/logotypes/32/github-512.png',
+          createStrategy: strapi => new GithubStrategy({
+            clientID: env('GITHUB_CLIENT_ID'),
+            clientSecret: env('GITHUB_CLIENT_SECRET'),
+            scope: ['user:email'],
+            callbackURL: strapi.admin.services.passport.getStrategyCallbackURL('github'),
+          }, (accessToken, refreshToken, profile, done) => {
+            done(null, {
+              email: profile.emails[0].value,
+              username: profile.username,
+            });
+          }),
+        },
+      ],
+    },
+  },
+});
+```
+:::::
+
+::::: tab Discord
+
+Using: [passport-discord](https://github.com/nicholastay/passport-discord#readme)
+
+:::: tabs
+
+::: tab yarn
+
+```bash
+yarn add passport-discord
+```
+
+:::
+
+::: tab npm
+
+```bash
+npm install --save passport-discord
+```
+
+:::
+
+::::
+
+`/config/server.js`
+
+```jsx
+"use strict";
+
+const DiscordStrategy = require("passport-discord");
+
+module.exports = ({ env }) => ({
+  // ...
+  admin: {
+    // ...
+    auth: {
+      // ...
+      providers: [
+        {
+          uid: 'discord',
+          displayName: 'Discord',
+          icon: 'https://cdn0.iconfinder.com/data/icons/free-social-media-set/24/discord-512.png',
+          createStrategy: strapi =>
+            new DiscordStrategy(
+              {
+                clientID: env('DISCORD_CLIENT_ID'),
+                clientSecret: env('DISCORD_SECRET'),
+                callbackURL: strapi.admin.services.passport.getStrategyCallbackURL(
+                  'discord'
+                ),
+                scope: ['identify', 'email'],
+              },
+              (accessToken, refreshToken, profile, done) => {
+                done(null, {
+                  email: profile.email,
+                  username: `${profile.username}#${profile.discriminator}`,
+                });
+              }
+            ),
+        },
+      ],
+    },
+  },
+});
+```
+:::::
+::::: tab Microsoft
+
+Using: [passport-azure-ad-oauth2](https://github.com/auth0/passport-azure-ad-oauth2#readme)
+
+:::: tabs
+
+::: tab yarn
+
+```bash
+yarn add passport-azure-ad-oauth2 jsonwebtoken
+```
+
+:::
+
+::: tab npm
+
+```bash
+npm install --save passport-azure-ad-oauth2 jsonwebtoken
+```
+
+:::
+
+::::
+
+`/config/server.js`
+
+```jsx
+"use strict";
+
+const AzureAdOAuth2Strategy = require('passport-azure-ad-oauth2');
+const jwt = require('jsonwebtoken');
+
+module.exports = ({ env }) => ({
+  // ...
+  admin: {
+    // ...
+    auth: {
+      // ...
+      providers: [
+        {
+          uid: 'azure_ad_oauth2',
+          displayName: 'Microsoft',
+          icon: 'https://upload.wikimedia.org/wikipedia/commons/thumb/9/96/Microsoft_logo_%282012%29.svg/320px-Microsoft_logo_%282012%29.svg.png',
+          createStrategy: strapi => new AzureAdOAuth2Strategy({
+            clientID: env('MICROSOFT_CLIENT_ID', ''),
+            clientSecret: env('MICROSOFT_CLIENT_SECRET', ''),
+            scope: ['user:email'],
+            tenant: env('MICROSOFT_TENANT_ID', ''),
+            callbackURL: strapi.admin.services.passport.getStrategyCallbackURL('azure_ad_oauth2'),
+          }, (accessToken, refreshToken, params, profile, done) => {
+            var waadProfile = jwt.decode(params.id_token, '', true);
+            done(null, {
+              email: waadProfile.upn,
+              username: waadProfile.upn
+            });
+          }),
+        },
+      ],
+    },
+  },
+});
+```
+:::::
+::::::
+
+## Advanced Customization
+
+### Admin Panel URL
+
+If your administration panel lives on a different host/port than your Strapi server, you will need to modify the admin URL.
+To do so, head to your `/config/server.js` configuration file and tweak the `admin.url` field.
+
+For example, if your admin application has been started on `https://api.example.com`, your configuration will look like the following:
+
+`/config/server.js`
+
+```javascript
+module.exports = () => ({
+  // ...
+  admin: {
+    // ...
+    url: 'https://api.example.com/admin',
+  },
+});
+```
+
+### Custom Logic
+
+In some scenarios, you will want to write additional logic for your connection workflow such as:
+- Restricting connection and registration for a specific domain
+- Triggering actions on connection attempt
+- Analytics
+
+The easiest way to do so is to plug into the verify function of your strategy and write some code.
+
+For example, if you want to allow only people with an official strapi.io email address, you can instantiate your strategy like this:
+
+```javascript
+const strategyInstance = new Strategy(
+  configuration,
+  ({ email, username }, done) => {
+    // If the email ends with @strapi.io
+    if (email.endsWith('@strapi.io')) {
+      // Then we continue with the data given by the provider
+      return done(null, { email, username });
+    }
+    
+    // Otherwise, we continue by sending an error to the done function
+    done(new Error('Forbidden email address'));
+  },
+);
+```
+
+### Authentication Events
+
+The SSO feature adds a new [authentication event](/developer-docs/latest/setup-deployment-guides/configurations.md#available-options): `onSSOAutoRegistration`.
+
+This event is triggered whenever a user is created using the auto-register feature added by SSO.
+It contains the created user (`event.user`), and the provider used to make the registration (`event.provider`).
+
+Example:
+
+`/config/server.js`
+```javascript
+module.exports = () => ({
+  // ...
+  admin: {
+    // ...
+    auth: {
+      // ...
+      events: {
+        onConnectionSuccess(e) {},
+        onConnectionError(e) {},
+        // ...
+        onSSOAutoRegistration(e) {
+          const { user, provider } = e;
+
+          console.log(
+            `A new user (${user.id}) has been automatically registered using ${provider}`
+          );
+        },
+      },
+    },
+  },
+});
+```
diff --git a/docs/developer-docs/latest/developer-resources/cli/CLI.md b/docs/developer-docs/latest/developer-resources/cli/CLI.md
index e0d4b2e820..821bec4aa5 100644
--- a/docs/developer-docs/latest/developer-resources/cli/CLI.md
+++ b/docs/developer-docs/latest/developer-resources/cli/CLI.md
@@ -104,6 +104,7 @@ strapi configuration:dump
 
 Options:
   -f, --file <file>  Output file, default output is stdout
+  -p, --pretty       Format the output JSON with indentation and line breaks (default: false)
 ```
 
 **Examples**
@@ -191,7 +192,7 @@ options: [--plugin <name>]
 - **strapi generate:api &#60;name&#62;**<br/>
   Generates an API called **&#60;name&#62;** in the `./api` folder at the root of your project.
 
-- **strapi generate:api --draft-and-publish=true**<br/>
+- **strapi generate:api &#60;name&#62; --draft-and-publish=true**<br/>
   Generates an API called **&#60;name&#62;** in the `./api` folder at the root of your project and enabled the draft/publish feature.
 
 - **strapi generate:api &#60;name&#62; &#60;attribute:type&#62;**<br/>
diff --git a/docs/developer-docs/latest/developer-resources/content-api/content-api.md b/docs/developer-docs/latest/developer-resources/content-api/content-api.md
index fd0daab732..6b17d869d7 100644
--- a/docs/developer-docs/latest/developer-resources/content-api/content-api.md
+++ b/docs/developer-docs/latest/developer-resources/content-api/content-api.md
@@ -140,7 +140,7 @@ Here is the list of endpoints generated for each of your **Content Types**.
 
 | Method | Path              | Description                       |
 | :----- | :---------------- | :-------------------------------- |
-| GET    | `/{content-type}` | Get a the {content-type} content  |
+| GET    | `/{content-type}` | Get the {content-type} content  |
 | PUT    | `/{content-type}` | Update the {content-type} content |
 | DELETE | `/{content-type}` | Delete the {content-type} content |
 
diff --git a/docs/developer-docs/latest/developer-resources/content-api/integrations/vue-js.md b/docs/developer-docs/latest/developer-resources/content-api/integrations/vue-js.md
index 286895141f..3b14430ec6 100644
--- a/docs/developer-docs/latest/developer-resources/content-api/integrations/vue-js.md
+++ b/docs/developer-docs/latest/developer-resources/content-api/integrations/vue-js.md
@@ -207,7 +207,7 @@ export default {
         headers: this.headers,
       }).then(this.checkStatus)
         .then(this.parseJSON);
-        this.restaurants = response
+      this.restaurants = response
     } catch (error) {
       this.error = error
     }
diff --git a/docs/developer-docs/latest/development/backend-customization.md b/docs/developer-docs/latest/development/backend-customization.md
index b790f94d6a..070bfb59a2 100644
--- a/docs/developer-docs/latest/development/backend-customization.md
+++ b/docs/developer-docs/latest/development/backend-customization.md
@@ -647,7 +647,6 @@ The context object (`ctx`) contains a list of values and functions useful to man
 
 For more information, please refer to the [Koa response documentation](http://koajs.com/#response).
 
-
 <!--- BEGINNING OF SERVICES --->
 
 ## Services
@@ -781,6 +780,8 @@ module.exports = {
 ##### `create`
 
 ```js
+const { isDraft } = require('strapi-utils').contentTypes;
+
 module.exports = {
   /**
    * Promise to add record
@@ -789,7 +790,13 @@ module.exports = {
    */
 
   async create(data, { files } = {}) {
-    const validData = await strapi.entityValidator.validateEntity(strapi.models.restaurant, data);
+    const isDraft = isDraft(data, strapi.models.restaurant);
+    const validData = await strapi.entityValidator.validateEntityCreation(
+      strapi.models.restaurant,
+      data,
+      { isDraft }
+    );
+
     const entry = await strapi.query('restaurant').create(validData);
 
     if (files) {
@@ -813,6 +820,8 @@ module.exports = {
 ##### `update`
 
 ```js
+const { isDraft } = require('strapi-utils').contentTypes;
+
 module.exports = {
   /**
    * Promise to edit record
@@ -821,10 +830,15 @@ module.exports = {
    */
 
   async update(params, data, { files } = {}) {
+    const existingEntry = await db.query('restaurant').findOne(params);
+
+    const isDraft = isDraft(existingEntry, strapi.models.restaurant);
     const validData = await strapi.entityValidator.validateEntityUpdate(
       strapi.models.restaurant,
-      data
+      data,
+      { isDraft }
     );
+
     const entry = await strapi.query('restaurant').update(params, validData);
 
     if (files) {
@@ -1468,7 +1482,7 @@ You can access the Knex instance with:
 const knex = strapi.connections.default;
 ```
 
-You can then use Knex to build your own custom queries. You will lose all the functionalities of the model, 
+You can then use Knex to build your own custom queries. You will lose all the functionalities of the model,
 but this could come handy if you are building a more custom schema.
 Please note that if you are using the [draft system](/developer-docs/latest/concepts/draft-and-publish.md), Strapi nullyfies all the Draft columns util they are published.
 
@@ -1485,8 +1499,8 @@ const result = await knex('restaurants')
   .select('restaurants.name as restaurant')
   .select('chef.name as chef')
 
-// Loadsh's groupBy method can be used to 
-// return a grouped key-value object generated from 
+// Loadsh's groupBy method can be used to
+// return a grouped key-value object generated from
 // the response
 
 return (_.groupBy(result, 'chef');
@@ -1691,6 +1705,8 @@ The options key on the model-json states.
 
 - `populateCreatorFields`: Configure whether the API response should include `created_by` and `updated_by` fields or not. Accepts a `boolean`. The default value is `false`.
 
+- `draftAndPublish`: Enable the draft and publish feature. Accepts a `boolean`. The default value is `false`.
+
 **Path —** `User.settings.json`.
 
 ```json
@@ -1698,7 +1714,8 @@ The options key on the model-json states.
   "options": {
     "timestamps": true,
     "privateAttributes": ["id", "created_at"],
-    "populateCreatorFields": true
+    "populateCreatorFields": true,
+    "draftAndPublish": false
   }
 }
 ```
@@ -2662,7 +2679,6 @@ module.exports = {
 When calling a lifecycle function directly, you will need to make sure you call it with the expected parameters.
 :::
 
-
 <!--- BEGINNING OF WEBHOOKS --->
 
 ## Webhooks
@@ -3021,4 +3037,3 @@ This event is triggered only when you delete a media through the media interface
   }
 }
 ```
-
diff --git a/docs/developer-docs/latest/development/local-plugins-customization.md b/docs/developer-docs/latest/development/local-plugins-customization.md
index 06aa806cff..4b5d16504d 100644
--- a/docs/developer-docs/latest/development/local-plugins-customization.md
+++ b/docs/developer-docs/latest/development/local-plugins-customization.md
@@ -17,6 +17,9 @@ In a new terminal window:
 
 Generate a new plugin: `cd /path/to/myDevelopmentProject && strapi generate:plugin my-plugin`
 
+::: tip NOTE
+After you have successfully generated a plugin, you need to run `strapi build` which adds the new plugin to the admin panel. 
+:::
 
 ## Plugin Folders and Files Architecture
 
@@ -66,9 +69,7 @@ Please refer to [router documentation](/developer-docs/latest/development/backen
 
 **Route prefix**
 
-Each route of a plugin is prefixed by the name of the plugin (eg: `/my-plugin/my-plugin-route`).
-
-To disable the prefix, add the `prefix` attribute to each concerned route, like below:
+Each route of a plugin is prefixed by the name of the plugin (eg: `/my-plugin/my-plugin-route`). Using the `prefix` key you can change this option to something custom. You can disable the prefix, by setting the `config.prefix` key to an empty string.
 
 ```json
 {
@@ -77,7 +78,7 @@ To disable the prefix, add the `prefix` attribute to each concerned route, like
   "handler": "MyPlugin.action",
   "config": {
     "policies": [],
-    "prefix": false
+    "prefix": "my-custom-prefix"
   }
 }
 ```
diff --git a/docs/developer-docs/latest/development/plugins/documentation.md b/docs/developer-docs/latest/development/plugins/documentation.md
index 226aea6614..181e055a0c 100644
--- a/docs/developer-docs/latest/development/plugins/documentation.md
+++ b/docs/developer-docs/latest/development/plugins/documentation.md
@@ -42,7 +42,7 @@ When your plugin is installed, you just have to start your application and it wi
 
 The administration panel lets you configure the basic settings of this plugin.
 
-![Accessing the documentation](../../assets/plugins/documentation/open-doc.gif 'Accessing the documentation')
+![Accessing the documentation](../../assets/plugins/documentation/open-doc.gif)
 
 ## Administration panel
 
diff --git a/docs/developer-docs/latest/development/plugins/graphql.md b/docs/developer-docs/latest/development/plugins/graphql.md
index f6b3bf5bb0..84ed651460 100644
--- a/docs/developer-docs/latest/development/plugins/graphql.md
+++ b/docs/developer-docs/latest/development/plugins/graphql.md
@@ -48,7 +48,7 @@ mutation {
 }
 ```
 
-Then on each request, send along an `Authorization` header in the form of `{ Authorization: "Bearer YOUR_JWT_GOES_HERE" }`. This can be set in the HTTP Headers section of your GraphQL Playground.
+Then on each request, send along an `Authorization` header in the form of `{ "Authorization": "Bearer YOUR_JWT_GOES_HERE" }`. This can be set in the HTTP Headers section of your GraphQL Playground.
 
 ## Configurations
 
diff --git a/docs/developer-docs/latest/development/plugins/upload.md b/docs/developer-docs/latest/development/plugins/upload.md
index 424d7ab94c..cbf177b70e 100644
--- a/docs/developer-docs/latest/development/plugins/upload.md
+++ b/docs/developer-docs/latest/development/plugins/upload.md
@@ -26,6 +26,33 @@ module.exports = {
 };
 ```
 
+#### Responsive Images
+
+When the `Enable responsive friendly upload` setting is enabled in the settings panel the plugin will generate the following responsive image sizes:
+| Name    | Largest Dimension |
+| :------ | :--------- |
+| large   | 1000px     |
+| medium  | 750px      |
+| small   | 500px      |
+
+These sizes can be overridden in `config/plugins.js`:
+```javascript
+module.exports = {
+  upload: {
+    breakpoints: {
+      xlarge: 1920,
+      large: 1000,
+      medium: 750,
+      small: 500,
+      xsmall: 64
+    }
+  }
+}
+```
+::: warning
+  Breakpoint changes will only apply to new images, existing images will not be resized or have new sizes generated.
+:::
+
 ## Endpoints
 
 <style lang="stylus">
@@ -324,6 +351,24 @@ npm install strapi-provider-upload-aws-s3 --save
 
 ::::
 
+### Local server
+
+By default Strapi accepts `localServer` configurations for locally uploaded files. They will be passed as the options for [koa-static](https://github.com/koajs/static).
+
+You can provide them by create or edit the file at `./config/plugins.js`. The example below set `max-age` header.
+
+```js
+module.exports = ({ env })=>({
+  upload: {
+    providerOptions: {
+      localServer: {
+        maxage: 300000
+      }
+    }
+  }
+});
+```
+
 ### Using scoped packages as providers
 
 If your package name is [scoped](https://docs.npmjs.com/about-scopes) (for example `@username/strapi-provider-upload-aws2`) you need to take an extra step by aliasing it in `package.json`. Go to the `dependencies` section and change the provider line to look like this:
diff --git a/docs/developer-docs/latest/development/plugins/users-permissions.md b/docs/developer-docs/latest/development/plugins/users-permissions.md
index 05d147ff3f..50ca755489 100644
--- a/docs/developer-docs/latest/development/plugins/users-permissions.md
+++ b/docs/developer-docs/latest/development/plugins/users-permissions.md
@@ -563,6 +563,69 @@ The use of `ngrok` is not needed.
 
 :::
 
+::: tab Reddit
+
+#### Using ngrok
+
+Reddit accepts the `localhost` urls. <br>
+The use of `ngrok` is not needed.
+
+#### Reddit configuration
+
+- Visit the Reddit authorized applications preferences page <br> [https://www.reddit.com/prefs/apps](https://www.reddit.com/prefs/apps)
+- Click on the **create another app...** button near the bottom
+- Select **web app** for the type
+- Fill the **name** and **redirect uri** input in
+- Click the **create app** button
+- Note that the **Client ID** is located under the app type (web app)
+
+#### Strapi configuration
+
+- Visit the User Permissions provider settings page <br> [http://localhost:1337/admin/plugins/users-permissions/providers](http://localhost:1337/admin/plugins/users-permissions/providers)
+- Click on the **Reddit** provider
+- Fill the information (replace with your own client ID and secret):
+  - **Enable**: `ON`
+  - **Client ID**: hmxSBOit0SCjSQ
+  - **Client Secret**: gwR9hCjK_PMYVYNGeDLS4WLB8g7xqg
+  - **The redirect URL to your front-end app**: `http://localhost:3000/connect/reddit/redirect`
+
+:::
+
+::: tab Auth0
+
+#### Using ngrok
+
+Auth0 accepts the `localhost` urls. <br>
+The use of `ngrok` is not needed.
+
+#### Auth0 configuration
+
+- Visit your Auth0 tenant dashboard
+- In API section, create a new API
+- In application, create a `machine-to-machine` application and select the API that you have just created
+- In settings of this app set these values:
+  - **Allowed Callback URLs**: `http://localhost:1337/connect/auth0/callback`
+  - **Allowed Logout URLs**: `http://localhost:3000`
+  - **Allowed Web Origins**: `http://localhost:3000`
+- At the bottom of settings, show "Advanced Settings" and go to the "Grant Types". Ensure that these grants are checked/enabled:
+  - Implicit
+  - Authorization Code
+  - Refresh Token
+  - Client Credentials
+
+#### Strapi configuration
+
+- Visit the User Permissions provider settings page <br> [http://localhost:1337/admin/settings/users-permissions/providers](http://localhost:1337/admin/settings/users-permissions/providers)
+- Click on the **Auth0** provider
+- Fill the information:
+  - Enable: `ON`
+  - Client ID: `<Your Auth0 Client ID>`
+  - Client ID: `<Your Auth0 Client Secret>`
+  - Subdomain: `<Your Auth0 tenant url>`, example it is the part in bold in the following url: https://**my-tenant.eu**.auth0.com/
+  - The redirect URL to your front-end app: `http://localhost:3000/connect/auth0`
+
+:::
+
 ::::
 
 Your configuration is done.
@@ -581,7 +644,7 @@ Now you can make authenticated requests 🎉 More info here: [token usage](#toke
 :::warning Troubleshooting
 
 - **Error 429**: It's most likely because your login flow fell into a loop. To make new requests to the backend, you need to wait a few minutes or restart the backend.
-- **Grant: missing session or misconfigured provider**: It may be du to many things.
+- **Grant: missing session or misconfigured provider**: It may be due to many things.
   - **The redirect url can't be built**: Make sure you have set the backend url in `config/server.js`: [Setting up the server url](#setting-up-the-server-url)
   - **A session/cookie/cache problem**: You can try again in a private tab.
   - **The incorrect use of a domain with ngrok**: Check your urls and make sure that you use the ngrok url instead of `http://localhost:1337`. Don't forget to check the backend url set in the example app at `src/config.js`.
diff --git a/docs/developer-docs/latest/getting-started/quick-start.md b/docs/developer-docs/latest/getting-started/quick-start.md
index 1aa8fb35d2..a42ea05c0a 100644
--- a/docs/developer-docs/latest/getting-started/quick-start.md
+++ b/docs/developer-docs/latest/getting-started/quick-start.md
@@ -47,8 +47,7 @@ Complete the form to create the first **Administrator** user.
 Navigate to [**PLUGINS** - **Content Type Builder**](http://localhost:1337/admin/plugins/content-type-builder), in the left-hand menu.
 
 - Click the **"+ Create new collection type"** link
-- Enter `restaurant`, and click `Continue`
-- Click the **"+ Add another Field"** button
+- Type `restaurant`, and click `Continue`
 - Click the **Text** field
 - Type `name` in the **Name** field
 - Click over to the **ADVANCED SETTINGS** tab, and check the `Required field` and the `Unique field`
@@ -63,8 +62,7 @@ Navigate to [**PLUGINS** - **Content Type Builder**](http://localhost:1337/admin
 Navigate back to [**PLUGINS** - **Content Type Builder**](http://localhost:1337/admin/plugins/content-type-builder), in the left-hand menu.
 
 - Click the **"+ Create new collection type"** link
-- Enter `category`, and click `Continue`
-- Click the **"+ Add another Field"** button
+- Type `category`, and click `Continue`
 - Click the **Text** field
 - Type `name` under the **BASE SETTINGS** tab, in the **Name** field
 - Click over to the **ADVANCED SETTINGS** tab, and check the `Required field` and the `Unique field`
@@ -79,21 +77,21 @@ Navigate back to [**PLUGINS** - **Content Type Builder**](http://localhost:1337/
 
 Navigate to [**COLLECTION TYPES** - **Restaurants**](http://localhost:1337/admin/plugins/content-manager/restaurant?source=content-manager), in the left-hand menu.
 
-- Click on **+ Add New Restaurant** button. Type `Biscotte Restaurant` in the **Restaurant** field. Type `Welcome to Biscotte restaurant! Restaurant Biscotte offers a cuisine based on fresh, quality products, often local, organic when possible, and always produced by passionate producers.` into the **Description** field.
+- Click on **+ Add New Restaurants** button. Type `Biscotte Restaurant` in the **Name** field. Type `Welcome to Biscotte restaurant! Restaurant Biscotte offers a cuisine based on fresh, quality products, often local, organic when possible, and always produced by passionate producers.` into the **Description** field.
 - Click **Save**.
 
-You will see your restaurant listed in the entries.
+If you navigate back [**COLLECTION TYPES** - **Restaurants**](http://localhost:1337/admin/plugins/content-manager/restaurant?source=content-manager), you will see your restaurant listed in the entries.
 
 ## 6. Add categories to the "Category" Content Type
 
 Navigate to [**COLLECTION TYPES** - **Categories**](http://localhost:1337/admin/plugins/content-manager/category?source=content-manager).
 
-- Click on **+ Add New Category** button. Type `French Food` in the **Category** field. Select `Biscotte Restaurant`, on the right from **Restaurant (0)**.
+- Click on **+ Add New Categories** button. Type `French Food` in the **Name** field. Select `Biscotte Restaurant`, on the right in the **Restaurant (0)** dropdown.
 - Click **Save**.
 
-You will see the **French Food** category listed in the entries.
+Navigate back to [**COLLECTION TYPES** - **Categories**](http://localhost:1337/admin/plugins/content-manager/category?source=content-manager). You will see the **French Food** category listed in the entries.
 
-- Click on **+ Add New Category** button. Type `Brunch` in the **Category** field. **DO NOT ADD IT HERE** to `Biscotte Restaurant`.
+- Click on **+ Add New Categories** button. Type `Brunch` in the **Category** field. **DO NOT ADD** `Biscotte Restaurant` to the `Restaurants` dropdown on the right.
 - Click **Save**.
 
 You will see the **Brunch** category listed in the entries.
@@ -107,7 +105,7 @@ You have now seen **two different ways** to use the **relation** field type to a
 
 ## 7. Set Roles and Permissions
 
-Navigate to [**SETTINGS** - **User's roles**](http://localhost:1337/admin/settings/users-permissions/roles).
+Navigate to [**GENERAL** > **Settings** > **USERS & PERMISSIONS PLUGIN** > **Roles**](http://localhost:1337/admin/settings/users-permissions/roles).
 
 - Click the **Public** Role.
 - Scroll down under **Permissions**, open the **Application** tab and find **Restaurant**. Click the checkbox next to **find** and **findone**.
diff --git a/docs/developer-docs/latest/guides/draft.md b/docs/developer-docs/latest/guides/draft.md
index 79016640d5..f1d0c45541 100644
--- a/docs/developer-docs/latest/guides/draft.md
+++ b/docs/developer-docs/latest/guides/draft.md
@@ -37,6 +37,25 @@ To follow the example you will have to create a content type `articles` and add
 - `text` attribute named `content`
 - `enumeration` attribute named `status` with `draft`, `published`, `archive`
 
+```js
+"attributes": {
+    "title": {
+      "type": "string"
+    },
+    "content": {
+      "type": "text"
+    },
+    "status": {
+      "type": "enumeration",
+      "enum": [
+        "archive",
+        "draft",
+        "published"
+      ]
+    }
+  }
+```
+
 Then add some data with different `status`.
 
 ## Override controller action
diff --git a/docs/developer-docs/latest/setup-deployment-guides/configurations.md b/docs/developer-docs/latest/setup-deployment-guides/configurations.md
index c519bc72d9..b8822e877f 100644
--- a/docs/developer-docs/latest/setup-deployment-guides/configurations.md
+++ b/docs/developer-docs/latest/setup-deployment-guides/configurations.md
@@ -93,7 +93,6 @@ You can find [supported database and versions](/developer-docs/latest/setup-depl
 
 ::::
 
-
 :::: tabs
 
 ::: tab PostgreSQL
@@ -286,7 +285,6 @@ Deploying **Strapi** itself is covered in the [Deployment Guide](/developer-docs
 <DatabasesLinks>
 </DatabasesLinks>
 
-
 ### Server
 
 :::: tabs
@@ -321,7 +319,7 @@ This is an example of a full configuration, typically certain keys do not need t
 
 **Path —** `./config/server.js`.
 
-```js
+```javascript
 module.exports = ({ env }) => ({
   host: env('HOST', '0.0.0.0'),
   port: env.int('PORT', 1337),
@@ -334,13 +332,21 @@ module.exports = ({ env }) => ({
   },
   admin: {
     auth: {
+      events: {
+        onConnectionSuccess(e) {
+          console.log(e.user, e.provider);
+        },
+        onConnectionError(e) {
+          console.error(e.error, e.provider);
+        },
+      },
       secret: env('ADMIN_JWT_SECRET', 'someSecretKey'),
     },
     url: env('PUBLIC_ADMIN_URL', '/dashboard'),
     autoOpen: false,
     watchIgnoreFiles: [
       './my-custom-folder', // Folder
-      './scripts/someScript.sh' // File
+      './scripts/someScript.sh', // File
     ],
     host: 'localhost', // Only used for --watch-admin
     port: 8003, // Only used for --watch-admin
@@ -359,30 +365,32 @@ module.exports = ({ env }) => ({
 
 ##### Available options
 
-| Property | Description | Type | Default |
-| -------- | ----------- | ---- | ------- |
-| `host` | Host name | string | `localhost` |
-| `port` | Port on which the server should be running. | integer | `1337` |
-| `socket` | Listens on a socket. Host and port are cosmetic when this option is provided and likewise use `url` to generate proper urls when using this option. This option is useful for running a server without exposing a port and using proxy servers on the same machine (e.g [Heroku nginx buildpack](https://github.com/heroku/heroku-buildpack-nginx#requirements-proxy-mode)) | string \| integer | `/tmp/nginx.socket` |
-| `emitErrors` | Enable errors to be emitted to `koa` when they happen in order to attach custom logic or use error reporting services. | boolean | `false` |
-| `url` | Public url of the server. Required for many different features (ex: reset password, third login providers etc.). Also enables proxy support such as Apache or Nginx, example: `https://mywebsite.com/api`. The url can be relative, if so, it is used with `http://${host}:${port}` as the base url. An absolute url is however **recommended**.| string | `''` |
-|`proxy`| Set the koa variable `app.proxy`. When `true`, proxy header fields will be trusted. |boolean|`false`|
-| `cron` | Cron configuration (powered by [`node-schedule`](https://github.com/node-schedule/node-schedule)) | Object | |
-| `cron.enabled` | Enable or disable CRON tasks to schedule jobs at specific dates. | boolean | `false` |
-| `admin` | Admin panel configuration | Object | |
-| `admin.auth` | Authentication configuration | Object | |
-| `admin.auth.secret`| Secret used to encode JWT tokens | string| `undefined` |
-| `admin.url` | Url of your admin panel. Default value: `/admin`. Note: If the url is relative, it will be concatenated with `url`. | string | `/admin` |
-| `admin.autoOpen` | Enable or disabled administration opening on start. | boolean | `true` |
-| `admin.watchIgnoreFiles` | Add custom files that should not be watched during development. See more [here](https://github.com/paulmillr/chokidar#path-filtering) (property `ignored`). | Array(string) | `[]` |
-| `admin.host` | Use a different host for the admin panel. Only used along with `strapi develop --watch-admin` | string | `localhost` |
-| `admin.port` | Use a different port for the admin panel. Only used along with `strapi develop --watch-admin` | string | `8000` |
-| `admin.serveAdminPanel` | If false, the admin panel won't be served. Note: the `index.html` will still be served, see [defaultIndex option](/developer-docs/latest/setup-deployment-guides/configurations.md#global-middlewares) | boolean | `true` |
-| `admin.forgotPassword` | Settings to customize the forgot password email (see more here: [Forgot Password Email](/developer-docs/latest/development/admin-customization.md#forgot-password-email)) | Object | {} |
-| `admin.forgotPassword.emailTemplate` | Email template as defined in [email plugin](/developer-docs/latest/development/plugins/email.md#programmatic-usage) | Object | [Default template](https://github.com/strapi/strapi/tree/master/packages/strapi-admin/config/email-templates/forgot-password.js) |
-| `admin.forgotPassword.from` | Sender mail address | string | Default value defined in your [provider configuration](/developer-docs/latest/development/plugins/email.md#configure-the-plugin) |
-| `admin.forgotPassword.replyTo` | Default address or addresses the receiver is asked to reply to | string | Default value defined in your [provider configuration](/developer-docs/latest/development/plugins/email.md#configure-the-plugin) |
-
+| Property                                | Description                                                                                                                                                                                                                                                                                                                                                                 | Type              | Default                                                                                                                          |
+| --------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------- | -------------------------------------------------------------------------------------------------------------------------------- |
+| `host`                                  | Host name                                                                                                                                                                                                                                                                                                                                                                   | string            | `localhost`                                                                                                                      |
+| `port`                                  | Port on which the server should be running.                                                                                                                                                                                                                                                                                                                                 | integer           | `1337`                                                                                                                           |
+| `socket`                                | Listens on a socket. Host and port are cosmetic when this option is provided and likewise use `url` to generate proper urls when using this option. This option is useful for running a server without exposing a port and using proxy servers on the same machine (e.g [Heroku nginx buildpack](https://github.com/heroku/heroku-buildpack-nginx#requirements-proxy-mode)) | string \| integer | `/tmp/nginx.socket`                                                                                                              |
+| `emitErrors`                            | Enable errors to be emitted to `koa` when they happen in order to attach custom logic or use error reporting services.                                                                                                                                                                                                                                                      | boolean           | `false`                                                                                                                          |
+| `url`                                   | Public url of the server. Required for many different features (ex: reset password, third login providers etc.). Also enables proxy support such as Apache or Nginx, example: `https://mywebsite.com/api`. The url can be relative, if so, it is used with `http://${host}:${port}` as the base url. An absolute url is however **recommended**.                            | string            | `''`                                                                                                                             |
+| `proxy`                                 | Set the koa variable `app.proxy`. When `true`, proxy header fields will be trusted.                                                                                                                                                                                                                                                                                         | boolean           | `false`                                                                                                                          |
+| `cron`                                  | Cron configuration (powered by [`node-schedule`](https://github.com/node-schedule/node-schedule))                                                                                                                                                                                                                                                                           | Object            |                                                                                                                                  |
+| `cron.enabled`                          | Enable or disable CRON tasks to schedule jobs at specific dates.                                                                                                                                                                                                                                                                                                            | boolean           | `false`                                                                                                                          |
+| `admin`                                 | Admin panel configuration                                                                                                                                                                                                                                                                                                                                                   | Object            |                                                                                                                                  |
+| `admin.auth`                            | Authentication configuration                                                                                                                                                                                                                                                                                                                                                | Object            |                                                                                                                                  |
+| `admin.auth.secret`                     | Secret used to encode JWT tokens                                                                                                                                                                                                                                                                                                                                            | string            | `undefined`                                                                                                                      |
+| `admin.auth.events`                     | Record of all the events subscribers registered for the authentication                                                                                                                                                                                                                                                                                                      | object            | `{}`                                                                                                                             |
+| `admin.auth.events.onConnectionSuccess` | Function called when an admin user log in successfully to the administration panel                                                                                                                                                                                                                                                                                          | function          | `undefined`                                                                                                                      |
+| `admin.auth.events.onConnectionError`   | Function called when an admin user fails to log in to the administration panel                                                                                                                                                                                                                                                                                              | function          | `undefined`                                                                                                                      |
+| `admin.url`                             | Url of your admin panel. Default value: `/admin`. Note: If the url is relative, it will be concatenated with `url`.                                                                                                                                                                                                                                                         | string            | `/admin`                                                                                                                         |
+| `admin.autoOpen`                        | Enable or disabled administration opening on start.                                                                                                                                                                                                                                                                                                                         | boolean           | `true`                                                                                                                           |
+| `admin.watchIgnoreFiles`                | Add custom files that should not be watched during development. See more [here](https://github.com/paulmillr/chokidar#path-filtering) (property `ignored`).                                                                                                                                                                                                                 | Array(string)     | `[]`                                                                                                                             |
+| `admin.host`                            | Use a different host for the admin panel. Only used along with `strapi develop --watch-admin`                                                                                                                                                                                                                                                                               | string            | `localhost`                                                                                                                      |
+| `admin.port`                            | Use a different port for the admin panel. Only used along with `strapi develop --watch-admin`                                                                                                                                                                                                                                                                               | string            | `8000`                                                                                                                           |
+| `admin.serveAdminPanel`                 | If false, the admin panel won't be served. Note: the `index.html` will still be served, see [defaultIndex option](/developer-docs/latest/setup-deployment-guides/configurations.md#global-middlewares)                                                                                                                                                                      | boolean           | `true`                                                                                                                           |
+| `admin.forgotPassword`                  | Settings to customize the forgot password email (see more here: [Forgot Password Email](/developer-docs/latest/development/admin-customization.md#forgot-password-email))                                                                                                                                                                                                   | Object            | {}                                                                                                                               |
+| `admin.forgotPassword.emailTemplate`    | Email template as defined in [email plugin](/developer-docs/latest/development/plugins/email.md#programmatic-usage)                                                                                                                                                                                                                                                         | Object            | [Default template](https://github.com/strapi/strapi/tree/master/packages/strapi-admin/config/email-templates/forgot-password.js) |
+| `admin.forgotPassword.from`             | Sender mail address                                                                                                                                                                                                                                                                                                                                                         | string            | Default value defined in your [provider configuration](/developer-docs/latest/development/plugins/email.md#configure-the-plugin) |
+| `admin.forgotPassword.replyTo`          | Default address or addresses the receiver is asked to reply to                                                                                                                                                                                                                                                                                                              | string            | Default value defined in your [provider configuration](/developer-docs/latest/development/plugins/email.md#configure-the-plugin) |
 
 ### Formats
 
@@ -406,7 +414,6 @@ module.exports = ({ env }) => {
 };
 ```
 
-
 ## Optional configurations
 
 ### Environment
@@ -556,7 +563,9 @@ module.exports = ({ env }) => ({
 | ----------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------ | ------- |
 | `responses`                   | Global API response configuration                                                                                                                                 | Object       |         |
 | `responses.privateAttributes` | Set of globally defined attributes to be treated as private. E.g. `_v` when using MongoDb or timestamps like `created_at`, `updated_at` can be treated as private | String array | `[]`    |
-
+| `rest`                        | REST API configuration                                                                                                                                            | Object       |         |
+| `rest.defaultLimit`           | Specifies default `_limit` parameter used in API calls                                                                                                            | Integer      | `100`   |
+| `rest.maxLimit`               | Specifies max allowed number that can be requested as `_limit`. Default to `null` which fetches all results                                                       | Integer      | `null`  |
 
 ### Plugins
 
@@ -931,12 +940,12 @@ module.exports = {
 };
 ```
 
-
 ### Functions
 
 The `./config/functions/` folder contains a set of JavaScript files in order to add dynamic and logic based configurations.
 
 All functions that are exposed in this folder are accessible via `strapi.config.functions['fileName']();`
+
 <!-- The text above will be identified as a broken link by the check-links VuePress plugin, because its syntax looks like an empty link. You can safely ignore the error. -->
 
 #### Bootstrap
@@ -1083,7 +1092,6 @@ module.exports = (bookshelf, connection) => {
 
 ::::
 
-
 ### Public assets
 
 Public assets are static files such as images, video, css, etc. that you want to make accessible to the outside world.
diff --git a/docs/developer-docs/latest/setup-deployment-guides/deployment.md b/docs/developer-docs/latest/setup-deployment-guides/deployment.md
index cce8dc7c5d..baf54a6d99 100644
--- a/docs/developer-docs/latest/setup-deployment-guides/deployment.md
+++ b/docs/developer-docs/latest/setup-deployment-guides/deployment.md
@@ -1,6 +1,6 @@
 # Deployment
 
-Strapi gives you many possible deployment options for your project or application. Strapi can be deployed on traditional hosting servers or services such as Render, Heroku, AWS, Azure and others. The following documentation covers how to develop locally with Strapi and deploy Strapi with various hosting options.
+Strapi gives you many possible deployment options for your project or application. Strapi can be deployed on traditional hosting servers or services such as 21YunBox, Render, Heroku, AWS, Azure and others. The following documentation covers how to develop locally with Strapi and deploy Strapi with various hosting options.
 
 ::: tip
 Deploying **databases** along with Strapi is covered in the [Databases Guide](/developer-docs/latest/setup-deployment-guides/configurations.md#databases-installation-guides).
@@ -10,6 +10,38 @@ Deploying **databases** along with Strapi is covered in the [Databases Guide](/d
 
 Manual guides for deployment on various platforms, for One-click and docker please see the [installation](/developer-docs/latest/setup-deployment-guides/installation.md) guides.
 
+<div>
+    <InstallLink link="deployment/hosting-guides/21yunbox.html">
+    <template #icon>
+    <svg width="64px" height="55px" viewBox="0 0 64 55" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+        <title>Group</title>
+        <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+            <g id="Artboard" transform="translate(0.000000, -5.000000)" fill="#FFFFFF" fill-rule="nonzero">
+                <g id="Group" transform="translate(0.000000, 5.211429)">
+                    <rect id="Rectangle" x="45.8057143" y="0" width="7.86285714" height="53.4857143"></rect>
+                    <rect id="Rectangle" x="0" y="0" width="7.86285714" height="7.86285714"></rect>
+                    <rect id="Rectangle" x="10.3314286" y="0" width="7.86285714" height="7.86285714"></rect>
+                    <rect id="Rectangle" x="20.9371429" y="0" width="7.86285714" height="18.1942857"></rect>
+                    <rect id="Rectangle" x="0" y="22.1257143" width="28.8" height="7.86285714"></rect>
+                    <rect id="Rectangle" x="0" y="33.92" width="7.86285714" height="19.5657143"></rect>
+                    <rect id="Rectangle" x="10.3314286" y="45.6228571" width="7.86285714" height="7.86285714"></rect>
+                    <rect id="Rectangle" x="20.9371429" y="45.6228571" width="7.86285714" height="7.86285714"></rect>
+                    <rect id="Rectangle" x="35.2" y="0" width="7.86285714" height="7.86285714"></rect>
+                    <rect id="Rectangle" x="45.8057143" y="45.6228571" width="7.86285714" height="7.86285714"></rect>
+                    <rect id="Rectangle" x="56.1371429" y="45.7142857" width="7.86285714" height="7.86285714"></rect>
+                    <rect id="Rectangle" x="35.2" y="45.6228571" width="7.86285714" height="7.86285714"></rect>
+                </g>
+            </g>
+        </g>
+    </svg>
+    </template>
+        <template #title>21YunBox</template>
+        <template #description>
+            Step by step guide for deploying on 21YunBox
+        </template>
+    </InstallLink>
+</div>
+
 <div>
 	<InstallLink link="deployment/hosting-guides/amazon-aws.html">
     <template #icon>
diff --git a/docs/developer-docs/latest/setup-deployment-guides/deployment/hosting-guides/21yunbox.md b/docs/developer-docs/latest/setup-deployment-guides/deployment/hosting-guides/21yunbox.md
new file mode 100644
index 0000000000..c98da98737
--- /dev/null
+++ b/docs/developer-docs/latest/setup-deployment-guides/deployment/hosting-guides/21yunbox.md
@@ -0,0 +1,66 @@
+# 21YunBox
+
+This guide explains how to update an existing Strapi project so it can be deployed on [21YunBox](https://www.21yunbox.com).
+
+21YunBox provides a Chinese CDN, continuous deployment, one-click HTTPS and [other services such as managed databases and backend web services](https://www.21yunbox.com/docs/#/), allowing to launch web projects in China.
+
+With persistent disks and managed PostgreSQL databases, 21YunBox gives you multiple different ways to store your content. 21YunBox services come with fully managed SSL, so it's no longer necessary to set up a proxy server to secure your Strapi app. Since 21YunBox services are automatically restarted if they become unresponsive, you don't need to use a process manager like `pm2` either.
+
+::: tip
+For more information consult [21YunBox's Deploy Strapi guide](https://www.21yunbox.com/docs/#/deploy-strapi)
+:::
+
+
+## Prerequisites
+
+This guide assumes you already have a Strapi project to deploy. If you need a project, use the [Quick Start](/developer-docs/latest/getting-started/quick-start.md) to get started or fork 21YunBox's Strapi Examples:
+- [Strapi with SQLite Starter](https://gitee.com/eryiyunbox-examples/hello-strapi-sqlite)
+- [Strapi with Postgres Starter](https://gitee.com/eryiyunbox-examples/hello-strapi-postgres)
+
+## Setup
+
+Follow the procedure below to set up a Strapi CMS on 21YunBox:
+
+1. Create a 21YunBox account. If you don't already have one, visit [21YunBox dashboard](https://https://www.21yunbox.com/u/signup/).
+2. Create a new web service on 21YunBox, and give 21YunBox permission to access your GitHub or Gitee repo.
+3. Use the following values during creation:
+
+   | Setting               | Value                                                 |
+   | --------------------- | ------------------------------------------------ |
+   | **Environment**       | `Node 12.19`                                    |
+   | **Build Command**     | `yarn && yarn build` (or your own build command) |
+   | **Publish Directory** | `rsync -a public/ /data/public/ && yarn start` (or your own output directory)        |
+
+4. Add the following environment variables:
+
+   | Setting               | Value                                                 |
+   | --------------------- | ------------------------------------------------ |
+   | **NODE_ENV**       | `production`                                    |
+   | **DATABASE_FILENAME**     | If you use SQLite database, use `/data/strapi.db`|
+   | **DATABASE_URL**     | If you use Postgres database, paste the database URL here (we have demo video below if you are unsure)|
+
+5. Click the "Deploy" button.
+
+That's it! Your site will be live on your 21YunBox URL (e.g. `yoursite.21yunbox.com`) as soon as the build is done.
+
+
+::: tip TIP
+If you are unsure the steps above, 21YunBox has created a webcast for each of them:
+
+- Part 1: [Demo how to deploy Strapi with SQLite in production](https://www.bilibili.com/video/BV1fK4y1j7U8?zw)
+- Part 2: [Demo how to get in the development mode and create content on Strapi](https://www.bilibili.com/video/BV1Ta4y1W7bD?zw)
+- Part 3: [Demo how to deploy Strapi with database in production](https://www.bilibili.com/video/BV1Nf4y1k7ZP/)
+
+:::
+
+## Continuous deploys
+
+Now that 21YunBox is connected to your repo, it will automatically build and publish your site any time you push to Gitee or GitHub.
+
+## Custom domains
+
+Add your own domains to your site easily using 21YunBox's [custom domains](https://www.21yunbox.com/docs/#/custom-domains) guide.
+
+::: tip NOTE
+If you need customized deployment with Strapi, please contact [21YunBox](https://www.21yunbox.com/docs/#/contact).
+:::
diff --git a/docs/developer-docs/latest/setup-deployment-guides/deployment/hosting-guides/heroku.md b/docs/developer-docs/latest/setup-deployment-guides/deployment/hosting-guides/heroku.md
index 0ce29a8108..b1562ccefe 100644
--- a/docs/developer-docs/latest/setup-deployment-guides/deployment/hosting-guides/heroku.md
+++ b/docs/developer-docs/latest/setup-deployment-guides/deployment/hosting-guides/heroku.md
@@ -334,7 +334,7 @@ module.exports = ({ env }) => ({
 });
 ```
 
-Then set the development and the production configurations separatly:
+Then set the development and the production configurations separately:
 
 `Path: ./config/env/development/database.js`.
 
@@ -396,7 +396,7 @@ git commit -m "Update database config"
 `Path: ./my-project/`
 
 ```bash
-git push heroku master
+git push heroku main
 ```
 
 The deployment may take a few minutes. At the end, logs will display the url of your project (e.g. `https://mighty-taiga-80884.herokuapp.com`). You can also open your project using the command line:
@@ -421,14 +421,14 @@ When Strapi is deployed to Heroku, Heroku sets the environment variable to `NODE
 
 Therefore, modifications that require writing to model creation or other json files, e.g. creating or changing content-types, require that you make those changes on your dev environment and then push the changes to Heroku.
 
-As you continue developing your application with Strapi, you may want to use [version control](https://devcenter.heroku.com/articles/github-integration), or you can continue to use `Git push heroku master` to commit and push changes to Heroku directly.
+As you continue developing your application with Strapi, you may want to use [version control](https://devcenter.heroku.com/articles/github-integration), or you can continue to use `git push heroku main` to commit and push changes to Heroku directly.
 
 `Path: ./my-project/`
 
 ```bash
 git add .
 git commit -am "Changes to my-project noted"
-git push heroku master
+git push heroku main
 heroku open
 ```
 
diff --git a/docs/developer-docs/latest/setup-deployment-guides/file-structure.md b/docs/developer-docs/latest/setup-deployment-guides/file-structure.md
index 9b983c4b95..24f6470b30 100644
--- a/docs/developer-docs/latest/setup-deployment-guides/file-structure.md
+++ b/docs/developer-docs/latest/setup-deployment-guides/file-structure.md
@@ -3,7 +3,7 @@
 By default, the structure of your Strapi project looks as shown below:
 
 - `/.cache`: contains files used to build your admin panel.
-- [`/admin`](/developer-docs/latest/development/admin-customization.md): contains your admin customization files.
+- [`/admin`](/developer-docs/latest/development/admin-customization.md): _(optional)_ contains your admin customization files.
 - `/api`: contains the business logic of your project split into sub-folders per API.
   - `**`
     - `/config`: contains the API's configurations ([`routes`](/developer-docs/latest/development/backend-customization.md#routing), [`policies`](/developer-docs/latest/development/backend-customization.md#policies), etc.).
diff --git a/docs/developer-docs/latest/setup-deployment-guides/installation/cli.md b/docs/developer-docs/latest/setup-deployment-guides/installation/cli.md
index 3431467e92..3c63b43942 100644
--- a/docs/developer-docs/latest/setup-deployment-guides/installation/cli.md
+++ b/docs/developer-docs/latest/setup-deployment-guides/installation/cli.md
@@ -8,7 +8,7 @@ Fast-track local install for getting Strapi running on your computer.
 
 #### Node.js
 
-Strapi only requires [Node.js](https://nodejs.org). The current recommended version to run Strapi is **Node v14**.
+Strapi only requires [Node.js](https://nodejs.org). Strapi only supports **LTS versions** of Node.js, the current recommended version to run Strapi is **Node LTS v14**. Other versions of of Node.js may not be compatible with the latest release of Strapi.
 
 This is everything you need to run Strapi on your local environment.
 
@@ -56,7 +56,7 @@ npx create-strapi-app my-project --quickstart
 ::::
 
 ::: tip
-If you want to use specific database, you don't have to use the `--quickstart` flag. The CLI will let you choose the database of your choice.
+If you want to use specific database, you don't have to use the `--quickstart` flag. The CLI will let you choose the database of your choice. The `--quickstart` flag sets the database to SQLite.
 :::
 
 :::tip
@@ -64,7 +64,7 @@ By default, `create-strapi-app` will generate an empty Strapi project. If you wa
 :::
 
 ::: warning
-If you use a custom database, this one has to be up and running before creating your Strapi project
+If you use a custom database, it has to be up and running before creating your Strapi project
 :::
 
 ## Step 3: Start the project
diff --git a/docs/developer-docs/latest/setup-deployment-guides/installation/templates.md b/docs/developer-docs/latest/setup-deployment-guides/installation/templates.md
index 81d5193f2a..d8555740e9 100644
--- a/docs/developer-docs/latest/setup-deployment-guides/installation/templates.md
+++ b/docs/developer-docs/latest/setup-deployment-guides/installation/templates.md
@@ -25,7 +25,7 @@ You can use a template when creating a project with `create-strapi-app`.
 ::: tab yarn
 
 ```bash
-yarn create strapi-app my-project --template <template-github-url>
+yarn create strapi-app my-project --template <template-github-name>
 ```
 
 :::
@@ -33,13 +33,36 @@ yarn create strapi-app my-project --template <template-github-url>
 ::: tab npx
 
 ```bash
-npx create-strapi-app my-project --template <template-github-url>
+npx create-strapi-app my-project --template <template-github-name>
 ```
 
 :::
 
 ::::
 
+In these examples, the `template-github-name` argument can have different forms:
+
+- A shorthand. If a Github user named `paul` has a repository called `strapi-template-restaurant`, then the shorthand would be `paul/restaurant`. It only works if the repository's name starts with `strapi-template-`.
+- A URL. Just paste the URL of your GitHub repository. It works even if the repository is not prefixed by `strapi-template-`.
+
+::: tip
+When using a shorthand, if the username is omitted, the CLI assumes it's `strapi`.
+
+So the following commands are equivalent:
+
+```bash
+# Shorthand
+yarn create strapi-app my-project --template strapi/blog
+
+# Shorthand with username omitted since it defaults to strapi
+yarn create strapi-app my-project --template blog
+
+# Full GitHub URL
+yarn create strapi-app my-project --template https://github.com/strapi/strapi-template-blog
+```
+
+:::
+
 You can use the `--template` option in combination with all other `create-strapi-app` options, like `--quickstart` or `--no-run`.
 
 ## Creating a template
@@ -52,7 +75,7 @@ Second, a template must follow the following file structure.
 
 ### File structure
 
-You can add as many files as you want to the root of your template repository. But it must at least have a `template.json` file and a `template` directory.
+You can add as many files as you want to the root of your template repository. But it must at least have `template` directory, and either a `template.json` or a `template.js` file.
 
 The `template.json` is used to extend the Strapi app's default `package.json`. You can put all the properties that should overwrite the default `package.json` in a root `package` property. For example, a `template.json` might look like this:
 
@@ -69,6 +92,20 @@ The `template.json` is used to extend the Strapi app's default `package.json`. Y
 }
 ```
 
+You can also use a `template.js` file instead of the `template.json` file. It should export a function that returns an object with the same properties. It's useful when our properties need to have dynamic values. For example, we can use it to make sure that a template requires the latest version of a Strapi plugin:
+
+```js
+module.exports = function(scope) {
+  return {
+    package: {
+      dependencies: {
+        'strapi-plugin-graphql': scope.strapiVersion,
+      },
+    },
+  };
+};
+```
+
 The `template` directory is where you can extend the file contents of a Strapi project. All the children are optional, you should only include the files that will overwrite the default Strapi app.
 
 Only the following contents are allowed inside the `template` directory:
@@ -91,9 +128,9 @@ After reading the above rules, follow these steps to create your template:
 
 1. Create a standard Strapi app with `create-strapi-app`, using the `--quickstart` option.
 2. Customize your app to match the needs of your use case.
-3. Outside of your Strapi app's directory, create a new directory for your template.
-4. Create a `template.json` file in your template's directory.
-5. If you have modified your app's `package.json`, include these changes (and _only_ these changes) in `template.json`, in a `package` property. Otherwise, have the template file contain an empty object, i.e. `{}`.
-6. Create a `template/` subdirectory.
-7. Think of all the files you have modified in your app, and copy them to the `template` directory
+3. Outside of Strapi, create a new directory for your template.
+4. Create a `template.json` file in your template directory.
+5. If you have modified your app's `package.json`, include these changes (and _only_ these changes) in `template.json` in a `package` property. Otherwise, leave it as an empty object.
+6. Create a `/template` subdirectory.
+7. Think of all the files you have modified in your app, and copy them to the `/template` directory
 8. Publish the root template project on GitHub. Make sure that the repository is public, and that the code is on the `master` branch.
diff --git a/docs/developer-docs/latest/update-migration-guides/migration-guides.md b/docs/developer-docs/latest/update-migration-guides/migration-guides.md
index dac847a7ba..415bb161f3 100644
--- a/docs/developer-docs/latest/update-migration-guides/migration-guides.md
+++ b/docs/developer-docs/latest/update-migration-guides/migration-guides.md
@@ -19,6 +19,7 @@ If you were upgrading from the `3.0.0-beta.19.5` to `3.2.0`, here are the follow
 
 ## V3 guides
 
+- [Migration guide from 3.4.x to 3.4.4](migration-guides/migration-guide-3.4.x-to-3.4.4.md)
 - [Migration guide from 3.3.x to 3.4.0](migration-guides/migration-guide-3.3.x-to-3.4.0.md)
 - [Migration guide from 3.2.5 to 3.3.0](migration-guides/migration-guide-3.2.5-to-3.3.0.md)
 - [Migration guide from 3.2.3 to 3.2.4](migration-guides/migration-guide-3.2.3-to-3.2.4.md)
diff --git a/docs/developer-docs/latest/update-migration-guides/migration-guides/migration-guide-3.1.x-to-3.2.x.md b/docs/developer-docs/latest/update-migration-guides/migration-guides/migration-guide-3.1.x-to-3.2.x.md
index f00bdccded..5f4bfa4b39 100644
--- a/docs/developer-docs/latest/update-migration-guides/migration-guides/migration-guide-3.1.x-to-3.2.x.md
+++ b/docs/developer-docs/latest/update-migration-guides/migration-guides/migration-guide-3.1.x-to-3.2.x.md
@@ -14,10 +14,50 @@ This version requires some migration in the following cases:
 
 - You are using a `published_at` field in some of your models.
 - You followed the [Scheduled publication guide](/developer-docs/latest/guides/scheduled-publication.md) and used a `published_at` field.
+- You have extended the **Strapi-admin** **admin/src/translations/index.js**, so you have a `./admin/src/translations/index.js`
 
 Otherwise you can follow the basic [version update guide](/developer-docs/latest/update-migration-guides/update-version.md).
 
 ## Migration
 
+**Draft & Publish**
+
 The new **Draft & Publish** feature will add a `published_at` field to your **content types** if you enable the feature.
 If you have been using this field name on your **content types** you will need to first rename or delete it before being able to use the feature on those **content types**.
+
+**Strapi-admin Translations**
+
+If you have customized the admin's translation system, you will need to add the `languageNativeNames` object in `/admin/src/translations/index.js`.
+
+_Before_:
+
+```js
+import en from './en.json';
+import fr from './fr.json';
+
+const trads = {
+  en,
+  fr,
+};
+
+export default trads;
+```
+
+_After_:
+
+```js
+import en from './en.json';
+import fr from './fr.json';
+
+const trads = {
+  en,
+  fr,
+};
+
+export const languageNativeNames = {
+  en: 'English',
+  fr: 'Français',
+};
+
+export default trads;
+```
diff --git a/docs/developer-docs/latest/update-migration-guides/migration-guides/migration-guide-3.2.5-to-3.3.0.md b/docs/developer-docs/latest/update-migration-guides/migration-guides/migration-guide-3.2.5-to-3.3.0.md
index 13bcd0a6ca..95493bcdb9 100644
--- a/docs/developer-docs/latest/update-migration-guides/migration-guides/migration-guide-3.2.5-to-3.3.0.md
+++ b/docs/developer-docs/latest/update-migration-guides/migration-guides/migration-guide-3.2.5-to-3.3.0.md
@@ -18,6 +18,8 @@ Otherwise you can follow the basic [version update guide](/developer-docs/latest
 
 ## Migration
 
+Add `.strapi-updater.json` to your .gitignore file.
+
 **Config file**
 
 To invite users upgrading their application, we have introduced an application details page.
diff --git a/docs/developer-docs/latest/update-migration-guides/migration-guides/migration-guide-3.4.x-to-3.4.4.md b/docs/developer-docs/latest/update-migration-guides/migration-guides/migration-guide-3.4.x-to-3.4.4.md
new file mode 100644
index 0000000000..4804ffd9e2
--- /dev/null
+++ b/docs/developer-docs/latest/update-migration-guides/migration-guides/migration-guide-3.4.x-to-3.4.4.md
@@ -0,0 +1,70 @@
+# Migration guide from 3.4.x to 3.4.4
+
+**Make sure your server is not running until the end of the migration**
+
+:::warning
+If you are using **extensions** to create custom code or modifying existing code, you will need to update your code and compare your version to the new changes on the repository.
+<br>
+Not updating your **extensions** can break your app in unexpected ways that we cannot predict.
+:::
+
+## Migration
+
+### 1. Update the application dependencies
+
+First, update the application dependencies as usual by following the basic [version update guide](../update-version.md).
+
+### 2. Migrate Instagram Login Config
+
+If you use or plan to use the **Instagram login**, this migration is **required**. Otherwise it is just recommended to do it (in case you use it one day).
+
+
+Recently Instagram shutdown their API in favor of a new one (see [https://www.instagram.com/developer/](https://www.instagram.com/developer/)). As a result, the scope Strapi uses for the instagram API has to be updated.
+
+#### For SQL databases:
+
+- In your database, find the table `core_store`
+- In that table, find the row with the key `plugin_users-permissions_grant`
+- In that row, find the `value` column (it's JSON)
+- In this JSON, find the `instagram` attribute and edit it to add `"scope": ["user_profile"]` (⚠️ becareful to respect the JSON format)
+```diff
+...
+  "instagram": {
+    "enabled": true,
+    "icon": "instagram",
+    "key": "1234",
+    "secret": "abcd",
+    "callback": "https://myfrontend.com/connect/instagram/redirect",
+-   "redirectUri": "http://mybackend.com/connect/instagram/callback"
++   "redirectUri": "http://mybackend.com/connect/instagram/callback",
++   "scope": ["user_profile"]
+  },
+...
+```
+- Save it
+
+#### For mongoDB:
+
+- In your database, find the collection `core_store`
+- In that collection, find the document with the key `plugin_users-permissions_grant`
+- In that document, find the `value` field (it's JSON)
+- In this JSON, find the `instagram` attribute and edit it to add `"scope": ["user_profile"]` (⚠️ becareful to respect the JSON format)
+```diff
+...
+  "instagram": {
+    "enabled": true,
+    "icon": "instagram",
+    "key": "1234",
+    "secret": "abcd",
+    "callback": "https://myfrontend.com/connect/instagram/redirect",
+-   "redirectUri": "http://mybackend.com/connect/instagram/callback"
++   "redirectUri": "http://mybackend.com/connect/instagram/callback",
++   "scope": ["user_profile"]
+  },
+...
+```
+- Save it
+
+
+
+🎉 Congrats, your application has been migrated!
diff --git a/docs/user-docs/latest/assets/content-manager/edit-view-config.png b/docs/user-docs/latest/assets/content-manager/edit-view-config.png
new file mode 100644
index 0000000000..ddc1da3ce5
Binary files /dev/null and b/docs/user-docs/latest/assets/content-manager/edit-view-config.png differ
diff --git a/docs/user-docs/latest/assets/getting-started/icon_more.png b/docs/user-docs/latest/assets/getting-started/icon_more.png
new file mode 100644
index 0000000000..94c217932d
Binary files /dev/null and b/docs/user-docs/latest/assets/getting-started/icon_more.png differ
diff --git a/docs/user-docs/latest/assets/getting-started/login-page-sso.png b/docs/user-docs/latest/assets/getting-started/login-page-sso.png
new file mode 100644
index 0000000000..8958e4026b
Binary files /dev/null and b/docs/user-docs/latest/assets/getting-started/login-page-sso.png differ
diff --git a/docs/user-docs/latest/assets/settings/settings-sso.png b/docs/user-docs/latest/assets/settings/settings-sso.png
new file mode 100644
index 0000000000..c12eb9c816
Binary files /dev/null and b/docs/user-docs/latest/assets/settings/settings-sso.png differ
diff --git a/docs/user-docs/latest/content-manager/configuring-view-of-content-type.md b/docs/user-docs/latest/content-manager/configuring-view-of-content-type.md
index bcdebe3e19..9c535fc4d3 100644
--- a/docs/user-docs/latest/content-manager/configuring-view-of-content-type.md
+++ b/docs/user-docs/latest/content-manager/configuring-view-of-content-type.md
@@ -1,6 +1,10 @@
-# Configuring the view of a content type
+# Configuring the views of a content type
 
-Right above the list view table, on the right side of the interface, a settings button <Fa-Cog /> is displayed. It allows to access the configurations that can be set for the list view of your collection type, and to choose which fields to display in the table.
+Depending on their type, content types can be divided into 2 interfaces: the list view and the edit view. Both interfaces can be configured.
+
+## Configuring the list view
+
+On the right side of the list view interface, right above the table, a settings button <Fa-Cog /> is displayed. It allows to access the configurations that can be set for the list view of your collection type, and to choose which fields to display in the table.
 
 ::: tip NOTE
 The configurations only apply to the list view of the collection type from which the settings are accessed (i.e. disabling the filters or search options for a collection type will not automatically also disable these same options for all other collection types).
@@ -10,11 +14,11 @@ Note also that the explanations below explain how to permanently configure which
 
 ![Settings of a list view in the Content Manager](../assets/content-manager/content-manager_settings-list-view.png)
 
-To configure the list view settings:
+### List view settings
 
-1. In the list view, click on the settings button <Fa-Cog />.
+1. In the list view of your collection type, click on the settings button <Fa-Cog />.
 2. Click on the **Configure the view** button.
-3. Define your chosen new settings:
+3. In the Settings area, define your chosen new settings:
 
 | Setting name           | Instructions                                                                                       |
 | ---------------------- | -------------------------------------------------------------------------------------------------- |
@@ -24,11 +28,23 @@ To configure the list view settings:
 | Entries per page       | Choose among the drop-down list the number of entries per page.                                    |
 | Default sort attribute | Choose the sorting field and type that will be applied by default.                                 |
 
-4. Define what fields to display in the list view table, and in what order:
+4. Click on the **Save** button.
+
+### List view display
+
+1. In the list view of your collection type, click on the settings button <Fa-Cog />.
+2. Click on the **Configure the view** button.
+3. In the View area, define what fields to display in the list view table, and in what order:
    - Click the add button ![icon add new](../assets/content-manager/icon_add.png) to add a new field.
    - Click the delete button ![icon delete](../assets/content-manager/icon_delete.png) to remove a field.
-   - Click the reorder button ![icon drag & drop](../assets/content-manager/icon_dragdrop.png) and drag and drop it to the place you want it to be displayed amond the other fields.
-   - Click the name of the field to edit the label and/or enable or disable sort on that field.
+   - Click the reorder button ![icon drag & drop](../assets/content-manager/icon_dragdrop.png) and drag and drop it to the place you want it to be displayed among the other fields.
+4. Click the name of the field to access its available own settings:
+
+| Setting name              | Instructions                                                              |
+| ------------------------- | ------------------------------------------------------------------------- |
+| Label                     | Write the label to should be used for the field in the list view table.   |
+| Enable sort on this field | Click on **ON** or **OFF** to able or disable the sort on the field.      |
+
 5. Click on the **Save** button.
 
 ::: tip NOTE
@@ -43,3 +59,56 @@ Note also that relational fields have a couple limitations when it comes to sort
 - Sorting cannot be enabled for relational fields which display several fields.
 - Relational fields cannot be set as default sort.
 :::
+
+## Configuring the edit view
+
+In the edit view of a content type, in the right side of the interface, a **Configure the view** button is displayed. It allows to access the configurations that can be set for the edit view of the content type, such as the entry title, and the display of the fields of the content type, including the relational ones.
+
+![Configuring the edit view of the Content Manager](../assets/content-manager/edit-view-config.png)
+
+### Edit view settings
+
+1. In the edit view of your content type, click on the **Configure the view** button.
+2. In the Settings area, define your chosen new settings:
+
+| Setting name    | Instructions                                                                          |
+| --------------- | ------------------------------------------------------------------------------------- |
+| Entry title     | Choose among the drop-down list the field that should be used as title for the entry. |
+
+3. Click on the **Save** button.
+
+### Edit view display
+
+1. In the edit view of your content type, click on the **Configure the view** button.
+2. In the View area, define what fields to display in the list view table, and in what order:
+   - Click the add button ![icon add new](../assets/content-manager/icon_add.png) to add a new field.
+   - Click the delete button ![icon delete](../assets/content-manager/icon_delete.png) to remove a field.
+   - Click the reorder button ![icon drag & drop](../assets/content-manager/icon_dragdrop.png) and drag and drop it to the place you want it to be displayed amond the other fields.
+3. Click the name of a field to access its available own settings:
+
+| Setting name    | Instructions                                                                              |
+| --------------- | ----------------------------------------------------------------------------------------- |
+| Label           | Write the label to should be used for the field.                                          |
+| Description     | Write a description for the field, to help other administrators fill it properly.         |
+| Placeholder     | Write the placeholder that should be displayed by default in the field.                   |
+| Editable field  | Click on **ON** or **OFF** to able or disable the edition of the field by administrators. |
+
+4. Click on the **Save** button.
+
+::: warning IMPORTANT
+The settings and display of a component's fields cannot be managed and reordered through the entry's edit view configuration page. Click on the **Set the component's layout** button of a component to access the component's own configuration page. You will find the exact same settings and display options as for the entry, but that will specifically apply to your component.
+
+Note also that the settings are defined for the component itself, which means that the settings will automatically be applied for every other content type where the component is used. 
+:::
+
+#### Relational fields
+
+On the right side of the View area is displayed a Relational fields part. As in the edit view, regular fields and relational fields are managed separately (see [Managing relational fields](managing-relational-fields.md)). Although most configuration options are similar to regular fields', relational fields configurations have some specificities.
+
+To define what relational fields of an entry should be available in the edit view, the following options are available:
+
+- the **Insert another relational field** button, to add another relational field to your entry. If the button remains unclickable, it means that no other relational field can be added.
+- the delete button ![icon delete](../assets/content-manager/icon_delete.png), to remove a relational field.
+- the reorder button ![icon drag & drop](../assets/content-manager/icon_dragdrop.png), to drag and drop to the place you want your relational field to be displayed among the others.
+
+As for regular fields, it is possible to access the available settings of the relational fields by clicking on their name. Most settings are the same as for regular fields (see [Edit view display](./configuring-view-of-content-type.md#edit-view-display)) except for "Entry title" which is only available for relational fields. It is recommended to choose well the entry title of relational fields as the more comprehensive it is, the easier it will be for administrators to manage the content of relational fields from the edit view.
diff --git a/docs/user-docs/latest/content-manager/introduction-to-content-manager.md b/docs/user-docs/latest/content-manager/introduction-to-content-manager.md
index 6a4147d31d..e76202088a 100644
--- a/docs/user-docs/latest/content-manager/introduction-to-content-manager.md
+++ b/docs/user-docs/latest/content-manager/introduction-to-content-manager.md
@@ -25,7 +25,7 @@ From the list view, it is possible to:
 - configure the fields displayed in the table of the list view (4).
 
 ::: tip 💡 TIP
-Sorting can be enabled for any field displayed in the list view table (see [Configuring view of content type](../content-manager/configuring-view-of-content-type.md)). Click on a field name, in the header of the table, to sort on that field.
+Sorting can be enabled for any field displayed in the list view table (see [Configuring the views of a content type](../content-manager/configuring-view-of-content-type.md)). Click on a field name, in the header of the table, to sort on that field.
 :::
 
 ### Filtering entries
@@ -59,10 +59,10 @@ New entries are only considered created once some of their content has been writ
 
 ### Configuring the table fields
 
-Right above the list view table, on the right side of the interface, a settings button <Fa-Cog /> is displayed. It allows to access the configurations that can be set for the list view of your collection type (see [Configuring view of content type](../content-manager/configuring-view-of-content-type.md)), and to choose which fields to display in the table.
+Right above the list view table, on the right side of the interface, a settings button <Fa-Cog /> is displayed. It allows to access the configurations that can be set for the list view of your collection type (see [Configuring the views of a content type](../content-manager/configuring-view-of-content-type.md)), and to choose which fields to display in the table.
 
 ::: tip NOTE
-Configuring the displayed field of the table in the way detailed below is only temporary: the configurations will be reset as soon as the page is refreshed or when navigating the admin panel outside the Content Manager. For permanent configurations, please refer to [Configuring view of content type](../content-manager/configuring-view-of-content-type.md).
+Configuring the displayed field of the table in the way detailed below is only temporary: the configurations will be reset as soon as the page is refreshed or when navigating the admin panel outside the Content Manager. For permanent configurations, please refer to [Configuring the views of a content type](../content-manager/configuring-view-of-content-type.md).
 :::
 
 ![Displayed fields in the settings of a list view in the Content Manager](../assets/content-manager/content-manager_displayed-fields.png)
@@ -74,7 +74,7 @@ To temporarily configure the fields displayed in the table:
 3. Untick the boxes associated with the fields you do not want to be displayed in the table.
 
 ::: tip NOTE
-Relational fields can also be displayed in the list view. Please refer to [Configuring view of content type](../content-manager/configuring-view-of-content-type.md) for more information on their specificities.
+Relational fields can also be displayed in the list view. Please refer to [Configuring the views of a content type](../content-manager/configuring-view-of-content-type.md) for more information on their specificities.
 
 :::
 
diff --git a/docs/user-docs/latest/getting-started/introduction.md b/docs/user-docs/latest/getting-started/introduction.md
index f8c2ac5a67..6e138ef367 100644
--- a/docs/user-docs/latest/getting-started/introduction.md
+++ b/docs/user-docs/latest/getting-started/introduction.md
@@ -10,6 +10,8 @@ Before going any further into this user guide, we recommend you to acknowledge t
 
 - **Versions** <br> Strapi is constantly evolving and growing. This implies that new releases are quite frequent, to improve what is already available but also to add new features to Strapi. For every new Strapi version, we communicate through our main channels and by sending notifications both on your terminal (when launching your Strapi application), and on your application's admin panel. We always recommend to use the latest version, especially since our documentation including this user guide, are only aligned with the latest version<!-- (see Update Strapi version or refer to our migration guides to update your Strapi application) -->. If you are on an older version of Strapi, some information in this documentation may not apply to your application.
 
+- **License and Pricing Plans** <br> As a Strapi user you have the choice between using the Community Edition, which is entirely free, or one of the 3 paying plans of the Enterprise Edition: Bronze, Silver, and Gold (see [Pricing and Plans](https://strapi.io/pricing)). In this user guide if a feature is only available for a specific plan of the Enterprise Edition, a badge is displayed beside the section's title to indicate the name of the plan.
+
 - **Roles and Permissions** <br> Some features of the admin panel, as well as the content managed with Strapi itself, are ruled by a system of permissions. From your Strapi admin panel, you have the possibility to define, at a detailed level, the roles and permissions of all administrators and end-users. In this user guide, all features and possible options are documented. It is however possible, depending on your role and permissions, that you may not be able to access all these features and options. In that case, please refer to the main Super Admin of your Strapi application.
 
 With all this in mind, you should be ready to start your Strapi experience!
@@ -22,7 +24,7 @@ The admin panel is the back office of your Strapi application. From the admin pa
 In order to access the admin panel, your Strapi application must be launched<!-- (see Installing Strapi) -->, and you must be aware of the URL to its admin panel (e.g. `api.example.com/admin`).
 :::
 
-![User profile](../assets/getting-started/login-page.png)
+![Login page with SSO activated](../assets/getting-started/login-page-sso.png)
 
 To access the admin panel:
 
@@ -30,6 +32,12 @@ To access the admin panel:
 2. Enter your credentials to log in.
 3. Click on the **Log in** button. You should be redirected to the homepage of the admin panel.
 
+### Using SSO for authentication [<Badge text="Gold" type="warning" vertical="middle"/>](https://strapi.io/pricing)
+
+If your Strapi application was configured to allow authentication through SSO (see [Configuring Single Sign-On](../settings/managing-global-settings.md)), you can access the admin panel using a specific provider instead of logging in with a regular Strapi administrator account.
+
+To do so, in the login page of your Strapi application, click on a chosen provider. If you cannot see your provider, click the ![icon more](../assets/getting-started/icon_more.png) button to access the full list of all available providers. You will be redirected to your provider's own login page where you will be able to authenticate.
+
 ## Setting up your administrator profile
 
 If you are a new administrator, we recommend making sure your profile is all set, before diving into your Strapi application. From your administrator profile, you are able to modify your user information, such as name, username, email or password.
diff --git a/docs/user-docs/latest/settings/managing-global-settings.md b/docs/user-docs/latest/settings/managing-global-settings.md
new file mode 100644
index 0000000000..e8ccb74607
--- /dev/null
+++ b/docs/user-docs/latest/settings/managing-global-settings.md
@@ -0,0 +1,19 @@
+# Managing global settings
+
+Global settings for plugins and features are managed from *General > Settings* in the main navigation of the admin panel.
+
+## Configuring Single Sign-On [<Badge text="Gold" type="warning" vertical="middle"/>](https://strapi.io/pricing)
+
+Single Sign-On (SSO) can be made available on a Strapi application to allow administrators to authenticate through an identity provider (e.g. Microsoft Azure Active Directory).
+
+![SSO settings](../assets/settings/settings-sso.png)
+
+To configure the SSO feature settings:
+
+1. Go to the *Global settings > Single Sign-On* area of the settings interface.
+2. Define your chosen new settings:
+
+| Setting name      | Instructions                                                                                                                                                                                                                                                        |
+| ----------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Auto-registration | Click on **ON** to allow the automatic creation of a new Strapi administrator when an SSO login does not match an existing Strapi administrator account. If this setting is set on **OFF**, new Strapi administrators accounts must be created manually beforehand. |
+| Default role      | Choose among the drop-down list the role to attribute by default to auto-registrated Strapi administrators through SSO login.                                                                                                                                       |
\ No newline at end of file
diff --git a/user-docs/latest/content-manager/configuring-view-of-content-type.md b/user-docs/latest/content-manager/configuring-view-of-content-type.md
new file mode 100644
index 0000000000..34eff4d369
--- /dev/null
+++ b/user-docs/latest/content-manager/configuring-view-of-content-type.md
@@ -0,0 +1,114 @@
+# Configuring the views of a content type
+
+Depending on their type, content types can be divided into 2 interfaces: the list view and the edit view. Both interfaces can be configured.
+
+## Configuring the list view
+
+On the right side of the list view interface, right above the table, a settings button <Fa-Cog /> is displayed. It allows to access the configurations that can be set for the list view of your collection type, and to choose which fields to display in the table.
+
+::: tip NOTE
+The configurations only apply to the list view of the collection type from which the settings are accessed (i.e. disabling the filters or search options for a collection type will not automatically also disable these same options for all other collection types).
+<br>
+Note also that the explanations below explain how to permanently configure which fields are displayed in the table of the list view of your collection type. It is also possible to configure the displayed fields temporarily (see [Introduction to content manager](../content-manager/introduction-to-content-manager.md)).
+:::
+
+![Settings of a list view in the Content Manager](../assets/content-manager/content-manager_settings-list-view.png)
+
+### List view settings
+
+1. In the list view of your collection type, click on the settings button <Fa-Cog />.
+2. Click on the **Configure the view** button.
+3. In the Settings area, define your chosen new settings:
+
+| Setting name           | Instructions                                                                                       |
+| ---------------------- | -------------------------------------------------------------------------------------------------- |
+| Enable search          | Click on **ON** or **OFF** to able or disable the search.                                          |
+| Enable filters         | Click on **ON** or **OFF** to able or disable filters.                                             |
+| Enable bulk actions    | Click on **ON** or **OFF** to able or disable the multiple selection boxes in the list view table. |
+| Entries per page       | Choose among the drop-down list the number of entries per page.                                    |
+| Default sort attribute | Choose the sorting field and type that will be applied by default.                                 |
+
+4. Click on the **Save** button.
+
+### List view display
+
+1. In the list view of your collection type, click on the settings button <Fa-Cog />.
+2. Click on the **Configure the view** button.
+3. In the View area, define what fields to display in the list view table, and in what order:
+   - Click the add button ![icon add new](../assets/content-manager/icon_add.png) to add a new field.
+   - Click the delete button ![icon delete](../assets/content-manager/icon_delete.png) to remove a field.
+   - Click the reorder button ![icon drag & drop](../assets/content-manager/icon_dragdrop.png) and drag and drop it to the place you want it to be displayed among the other fields.
+4. Click the name of the field to access its available own settings:
+
+| Setting name              | Instructions                                                              |
+| ------------------------- | ------------------------------------------------------------------------- |
+| Label                     | Write the label to should be used for the field in the list view table.   |
+| Enable sort on this field | Click on **ON** or **OFF** to able or disable the sort on the field.      |
+
+5. Click on the **Save** button.
+
+::: tip NOTE
+Relational fields can also be displayed in the list view. There are however some specificities to keep in mind:
+
+- Only one field can be displayed per relational field.
+- Only first-level fields can be displayed (i.e. fields from the relation of a relation can't be displayed).
+- If the displayed field contains more than one value, not all its values will be displayed, but a counter indicating the number of values. You can hover this counter to see a tooltip indicating the first 10 values of the relational field.
+
+Note also that relational fields have a couple limitations when it comes to sorting options:
+
+- Sorting cannot be enabled for relational fields which display several fields.
+- Relational fields cannot be set as default sort.
+:::
+
+## Configuring the edit view
+
+In the edit view of a content type, in the right side of the interface, a **Configure the view** button is displayed. It allows to access the configurations that can be set for the edit view of the content type, such as the entry title, and the display of the fields of the content type, including the relational ones.
+
+![Configuring the edit view of the Content Manager](../assets/content-manager/edit-view-config.png)
+
+### Edit view settings
+
+1. In the edit view of your content type, click on the **Configure the view** button.
+2. In the Settings area, define your chosen new settings:
+
+| Setting name    | Instructions                                                                          |
+| --------------- | ------------------------------------------------------------------------------------- |
+| Entry title     | Choose among the drop-down list the field that should be used as title for the entry. |
+
+3. Click on the **Save** button.
+
+### Edit view display
+
+1. In the edit view of your content type, click on the **Configure the view** button.
+2. In the View area, define what fields to display in the list view table, and in what order:
+   - Click the add button ![icon add new](../assets/content-manager/icon_add.png) to add a new field.
+   - Click the delete button ![icon delete](../assets/content-manager/icon_delete.png) to remove a field.
+   - Click the reorder button ![icon drag & drop](../assets/content-manager/icon_dragdrop.png) and drag and drop it to the place you want it to be displayed amond the other fields.
+3. Click the name of a field to access its available own settings:
+
+| Setting name    | Instructions                                                                              |
+| --------------- | ----------------------------------------------------------------------------------------- |
+| Label           | Write the label to should be used for the field.                                          |
+| Description     | Write a description for the field, to help other administrators fill it properly.         |
+| Placeholder     | Write the placeholder that should be displayed by default in the field.                   |
+| Editable field  | Click on **ON** or **OFF** to able or disable the edition of the field by administrators. |
+
+4. Click on the **Save** button.
+
+::: warning IMPORTANT
+The settings and display of a component's fields cannot be managed and reordered through the entry's edit view configuration page. Click on the **Set the component's layout** button of a component to access the component's own configuration page. You will find the exact same settings and display options as for the entry, but that will specifically apply to your component.
+
+Note also that the settings are defined for the component itself, which means that the settings will automatically be applied for every other content type where the component is used. 
+:::
+
+#### Relational fields
+
+On the right side of the View area is displayed a Relational fields part. As in the edit view, regular fields and relational fields are managed separately (see [Managing relational fields](managing-relational-fields.md)). Although most configuration options are similar to regular fields', relational fields configurations have some specificities.
+
+To define what relational fields of an entry should be available in the edit view, the following options are available:
+
+- the **Insert another relational field** button, to add another relational field to your entry. If the button remains unclickable, it means that no other relational field can be added.
+- the delete button ![icon delete](../assets/content-manager/icon_delete.png), to remove a relational field.
+- the reorder button ![icon drag & drop](../assets/content-manager/icon_dragdrop.png), to drag and drop to the place you want your relational field to be displayed among the others.
+
+As for regular fields, it is possible to access the available settings of the relational fields by clicking on their name. Most settings are the same as for regular fields (see [Edit view display](./configuring-view-of-content-type.md#edit-view-display)) except for "Entry title" which is only available for relational fields. It is recommended to choose well the entry title of relational fields as the more comprehensive it is, the easier it will be for administrators to manage the content of relational fields from the edit view.
\ No newline at end of file