Release 4.2.0 to staging (#933)

pwizla · meganelacheny · derrickmehaffy · web-flow · commit 8eb2088bb108 · 2022-06-15T13:52:34.000+02:00
* Logo customization via admin panel (#855) * Write custom logo documentation in user guide * Add new icons * Fix custom logo explanations + add note in dev docs * Fix typos and improve phrasing * Improve callouts * Add precisions in callout * Add screenshot * Improve documentation after reviews * Update screenshot * minor cleanups and rewriting middleware documentation with examples (#912) * minor cleanups and rewriting middleware documentation Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com> * finish all the middlewares * Update docs/developer-docs/latest/setup-deployment-guides/configurations/required/middlewares.md Co-authored-by: Gabriel <83644514+gpene@users.noreply.github.com> * Update docs/developer-docs/latest/setup-deployment-guides/configurations/required/middlewares.md Co-authored-by: Pierre Wizla <pwizla@users.noreply.github.com> * Update docs/developer-docs/latest/setup-deployment-guides/configurations/required/middlewares.md Co-authored-by: Pierre Wizla <pwizla@users.noreply.github.com> * Update docs/developer-docs/latest/setup-deployment-guides/configurations/required/middlewares.md Co-authored-by: Pierre Wizla <pwizla@users.noreply.github.com> * Slightly reword code comment * Update docs/developer-docs/latest/setup-deployment-guides/configurations/required/middlewares.md * Update docs/developer-docs/latest/setup-deployment-guides/configurations/required/middlewares.md * Update docs/developer-docs/latest/setup-deployment-guides/configurations/required/middlewares.md * Update docs/developer-docs/latest/setup-deployment-guides/configurations/required/middlewares.md * Update docs/developer-docs/latest/setup-deployment-guides/configurations/required/middlewares.md * Update docs/developer-docs/latest/setup-deployment-guides/configurations/required/middlewares.md * Update docs/developer-docs/latest/setup-deployment-guides/configurations/required/middlewares.md * more cleanup * Update wording Co-authored-by: Gabriel <83644514+gpene@users.noreply.github.com> Co-authored-by: Pierre Wizla <pwizla@users.noreply.github.com> * Digital Ocean app platform deployment guide (#857) * Created new Digital Ocean App Platform deployment guide * Rough outline for deploying on DO-AP * fix top matter * Add server.js/ts and database.js/ts min config snippets * Add postgres dependencies commands & rough DO directions * Added DO config steps * fixed text in callout * fix code snippets and delint * Update docs/developer-docs/latest/setup-deployment-guides/deployment/hosting-guides/digital-ocean-app-platform-2022.md Co-authored-by: DMehaffy <derrickmehaffy@gmail.com> * Update docs/developer-docs/latest/setup-deployment-guides/deployment/hosting-guides/digital-ocean-app-platform-2022.md Co-authored-by: DMehaffy <derrickmehaffy@gmail.com> * Update docs/developer-docs/latest/setup-deployment-guides/deployment/hosting-guides/digital-ocean-app-platform-2022.md Co-authored-by: DMehaffy <derrickmehaffy@gmail.com> * added text for server config and GitHub quickstart link * add GitHub quickstart link and server.js config details * Corrected Digital Ocean to DigitalOcean * Fixed spelling and delint + changed file name * rebase * fix database name * Fixed the first section * change environment variable heading title and clean up section * cleanup caps * change heading level * fixed file path and added server config intro * add pg package link * fixed code blocks * add formatting to App access link * delint * fixed spelling and punctuation * fixed misc formatting * revised deployment section * cleaned up code blocks + misc formatting * fix code typo * fixed code block formatting * improve text * revised intro * code cleanup * Update docs/developer-docs/latest/setup-deployment-guides/deployment/hosting-guides/digitalocean-app-platform-2022.md Co-authored-by: Pierre Wizla <pwizla@users.noreply.github.com> * Update docs/developer-docs/latest/setup-deployment-guides/deployment/hosting-guides/digitalocean-app-platform-2022.md Co-authored-by: Pierre Wizla <pwizla@users.noreply.github.com> * Update docs/developer-docs/latest/setup-deployment-guides/deployment/hosting-guides/digitalocean-app-platform-2022.md Co-authored-by: Pierre Wizla <pwizla@users.noreply.github.com> * Update docs/developer-docs/latest/setup-deployment-guides/deployment/hosting-guides/digitalocean-app-platform-2022.md Co-authored-by: Pierre Wizla <pwizla@users.noreply.github.com> * Update docs/developer-docs/latest/setup-deployment-guides/deployment/hosting-guides/digitalocean-app-platform-2022.md Co-authored-by: Pierre Wizla <pwizla@users.noreply.github.com> * Update docs/developer-docs/latest/setup-deployment-guides/deployment/hosting-guides/digitalocean-app-platform-2022.md Co-authored-by: meganelacheny <megane.lacheny@strapi.io> * Change file name and misc fixes * remove alt file name * delete draft file * added space for "// path" * fixed various things * Rewrite the Strapi project section * fixed the managed database deployment directions * fixed typo * remove text * changed table format * cleaned up text * fixed misc small issues * Edited the managed database section * small wording fix * add link to env table * change casing * small fixes * clarify the saving changes step * Update docs/developer-docs/latest/setup-deployment-guides/deployment/hosting-guides/digitalocean-app-platform.md Co-authored-by: DMehaffy <derrickmehaffy@gmail.com> * Update docs/developer-docs/latest/setup-deployment-guides/deployment/hosting-guides/digitalocean-app-platform.md Co-authored-by: DMehaffy <derrickmehaffy@gmail.com> * Update environment variables directions Co-authored-by: DMehaffy <derrickmehaffy@gmail.com> Co-authored-by: Pierre Wizla <pwizla@users.noreply.github.com> Co-authored-by: meganelacheny <megane.lacheny@strapi.io> * Updates plugins user guide for marketplace providers (#923) * update plugins user guide for marketplace providers * Incorporate feedback * Update installing-plugins-via-marketplace.md * update screenshots * fix typo * crop image * Fix broken links * Update marketplace screenshot * Drop v12 support (#928) * Drop v12 support (>=14.19.1 <=16.x.x) * Update node version in FAQ * Keep v14 as most recommended * Moved middleware list into a table with installed vs required (#936) * Moved middleware list into a table with installed vs required * pr feedback * revert to piwi's vs code extension for tables Co-authored-by: Pierre Wizla <pwizla@users.noreply.github.com> * Add callout about templates being reworked (#938) * Update again node version in telemetry docs * Update templates callout title * Bump version number to 4.2.0 * chore: update React docs to function components (#897) Co-authored-by: meganelacheny <megane.lacheny@strapi.io> Co-authored-by: DMehaffy <derrickmehaffy@gmail.com> Co-authored-by: Gabriel <83644514+gpene@users.noreply.github.com> Co-authored-by: Shaun Brown <97027841+StrapiShaun@users.noreply.github.com> Co-authored-by: Michaël De Boey <info@michaeldeboey.be>
diff --git a/docs/developer-docs/latest/developer-resources/content-api/integrations/react.md b/docs/developer-docs/latest/developer-resources/content-api/integrations/react.md
diff --git a/docs/developer-docs/latest/development/admin-customization.md b/docs/developer-docs/latest/development/admin-customization.md
@@ -217,9 +217,13 @@ The Strapi admin panel displays a logo in 2 different locations, represented by
 | On the login page      | `config.auth.logo`          |
 | In the main navigation | `config.menu.logo`          |
 
-To update the logos, put image files in the `./src/admin/extensions` folder and update the corresponding keys.
+To update the logos, put image files in the `./src/admin/extensions` folder and update the corresponding keys. There is no size limit for image files set through the configuration files.
 
-The size of the custom image should be the same as the default one (434px x 120px).
+::: note
+The logo displayed in the main navigation of the admin panel can also be customized directly via the admin panel (see [User Guide](/user-docs/latest/settings/managing-global-settings.md)). However, the logo displayed in the login page can only be customized via the configuration files for now.
+<br>
+Note also that the main navigation logo uploaded via the admin panel supersedes any logo set through the configuration files.
+:::
 
 #### Favicon
 
diff --git a/docs/developer-docs/latest/getting-started/usage-information.md b/docs/developer-docs/latest/getting-started/usage-information.md
@@ -19,7 +19,7 @@ However, these above actions alone are often insufficient to maintain an overall
 - How long does setting up a project take? If the global install time increases, does it mean that users are encountering issues or the process is simply too complicated?
 - What type of errors our users are facing?
 - What are the most used plugins?
-- Should we focus our efforts to being compatible with Node 12? Maybe our community uses version 12, in greater percentages than the global Node.js community?
+- Should we focus our efforts on being compatible with Node 16? Maybe our community uses version 16 in greater percentages than the global Node.js community?
 - And more...
 
 Without these metrics, we wouldn't be able to make the right choices as we continue to move forward with the roadmap and provide what you, the community and users, are asking for.
diff --git a/docs/developer-docs/latest/plugins/upload.md b/docs/developer-docs/latest/plugins/upload.md
@@ -6,7 +6,7 @@ canonicalUrl: https://docs.strapi.io/developer-docs/latest/plugins/upload.html
 
 # Upload
 
-Thanks to the plugin `Upload`, you can upload any kind of file on your server or external providers such as **AWS S3**.
+The `Upload` plugin is used to implement the Media Library available in the admin panel. With it you can upload any kind of file on your server or external providers such as **AWS S3**.
 
 ## Configuration
 
diff --git a/docs/developer-docs/latest/setup-deployment-guides/configurations/optional/environment.md b/docs/developer-docs/latest/setup-deployment-guides/configurations/optional/environment.md
@@ -119,4 +119,3 @@ yarn start                                   # uses host 127.0.0.1
 NODE_ENV=production yarn start               # uses host defined in .env. If not defined, uses 0.0.0.0
 HOST=10.0.0.1 NODE_ENV=production yarn start # uses host 10.0.0.1
 ```
-
diff --git a/docs/developer-docs/latest/setup-deployment-guides/configurations/optional/functions.md b/docs/developer-docs/latest/setup-deployment-guides/configurations/optional/functions.md
@@ -53,7 +53,6 @@ module.exports = () => {
 };
 ```
 
-
 ## Destroy
 
 The `destroy` function found in `./src/index.js` is an asynchronous function that runs before the application gets shut down.
diff --git a/docs/developer-docs/latest/setup-deployment-guides/configurations/required/middlewares.md b/docs/developer-docs/latest/setup-deployment-guides/configurations/required/middlewares.md
diff --git a/docs/developer-docs/latest/setup-deployment-guides/deployment.md b/docs/developer-docs/latest/setup-deployment-guides/deployment.md
@@ -17,7 +17,7 @@ Deploying databases along with Strapi is covered in the [databases guide](/devel
 ::: prerequisites
 To provide the best possible environment for Strapi there are a few requirements, these apply in both a development (local) as well as a staging and production workflow.
 
-- Node LTS (v12 or V14) **Note that odd-number releases of Node will never be supported (e.g. v13, v15).**
+- Node LTS (v14 or v16) **Note that odd-number releases of Node will never be supported (e.g. v13, v15).**
 - NPM v6 or whatever ships with the LTS Node versions
 - Typical standard build tools for your OS (the `build-essentials` package on most Debian-based systems)
 - At least 1 CPU core (Highly recommended at least 2)
diff --git a/docs/developer-docs/latest/setup-deployment-guides/deployment/hosting-guides/digitalocean-app-platform.md b/docs/developer-docs/latest/setup-deployment-guides/deployment/hosting-guides/digitalocean-app-platform.md
diff --git a/docs/developer-docs/latest/setup-deployment-guides/installation/cli.md b/docs/developer-docs/latest/setup-deployment-guides/installation/cli.md
@@ -12,7 +12,7 @@ Strapi CLI (Command Line Interface) installation scripts are the fastest way to
 
 The CLI installation guide requires at least two software prerequisites to be already installed on your computer:
 
-- [Node.js](https://nodejs.org): only LTS versions are supported (v12 and v14). Other versions of Node.js may not be compatible with the latest release of Strapi. The 14.x version is most recommended by Strapi.
+- [Node.js](https://nodejs.org): only LTS versions are supported (v14 and v16). Other versions of Node.js may not be compatible with the latest release of Strapi. The 14.x version is most recommended by Strapi.
 - [npm](https://docs.npmjs.com/cli/v6/commands/npm-install) (v6 only) or [yarn](https://yarnpkg.com/getting-started/install) to run the CLI installation scripts.
 
 A database is also required for any Strapi project. Strapi currently supports the following databases:
diff --git a/docs/developer-docs/latest/setup-deployment-guides/installation/templates.md b/docs/developer-docs/latest/setup-deployment-guides/installation/templates.md
@@ -6,6 +6,10 @@ canonicalUrl: https://docs.strapi.io/developer-docs/latest/setup-deployment-guid
 
 # Templates
 
+::: callout 🚧 
+This documentation is currently being reworked and updated to Strapi v4. You can follow the work-in-progress pull request on [GitHub](https://github.com/strapi/documentation/pull/665).
+:::
+
 A template is a pre-made Strapi configuration designed for a specific use case. It allows you to quickly bootstrap a custom Strapi app.
 
 Here are some things a template may configure for you:
diff --git a/docs/developer-docs/latest/update-migration-guides/migration-guides/v4/code/backend/dependencies.md b/docs/developer-docs/latest/update-migration-guides/migration-guides/v4/code/backend/dependencies.md
@@ -96,7 +96,7 @@ The following examples show a comparison of a Strapi v3 `package.json` and a Str
     "uuid": "b8aa7baf-d6dc-4c50-93d4-7739bc88c3fd"
   },
   "engines": {
-    "node": ">=14.x.x <=16.x.x",
+    "node": ">=14.19.1 <=16.x.x",
     "npm": ">=6.0.0"
   },
   "license": "MIT"
diff --git a/docs/developer-docs/latest/update-migration-guides/migration-guides/v4/data/mongo-sql-cheatsheet.md b/docs/developer-docs/latest/update-migration-guides/migration-guides/v4/data/mongo-sql-cheatsheet.md
@@ -6,7 +6,7 @@ canonicalUrl:  http://docs.strapi.io/developer-docs/latest/update-migration-guid
 
 # MongoDB vs. SQL implementation differences in Strapi v3
 
-This documentation explains the key structural differences to take into account when migrating data from MongoDB to SQL in the context of a Strapi v3 project. It should be used as a reference when migrating data locally (see [MongoDB to SQL migration in Strapi v3](/developer-docs/latest/update-migration-guides/migration-guides/v4/data/mongo.html)).
+This documentation explains the key structural differences to take into account when migrating data from MongoDB to SQL in the context of a Strapi v3 project. It should be used as a reference when migrating data locally (see [MongoDB to SQL migration in Strapi v3](/developer-docs/latest/update-migration-guides/migration-guides/v4/data/mongo.md)).
 
 ## Model settings
 
@@ -764,4 +764,4 @@ The following table highlights some specific uses cases and their possible resol
 | Custom id types         | Custom ID types are only used in SQL. No migration is required since the feature is not supported in MongoDB. |
 | Custom indexing         | Custom indexing is not a supported feature. Equivalent indexes must be created in SQL manually.               |
 | Custom join table names | Custom join table names should be taken into account when migrating the [relations](#relations) to find the right table name               (see [SQL join table names](#sql-join-table-names)). |
-| Custom DB queries       | Migrate to v3 SQL then to Strapi v4, and finally migrate the custom queries with the [Query Engine](0/developer-docs/latest/developer-resources/database-apis-reference/query-engine-api.md) of Strapi v4. |
+| Custom DB queries       | Migrate to v3 SQL then to Strapi v4, and finally migrate the custom queries with the [Query Engine](/developer-docs/latest/developer-resources/database-apis-reference/query-engine-api.md) of Strapi v4. |
diff --git a/docs/developer-docs/latest/update-migration-guides/migration-guides/v4/migration-guide-4.0.6-to-4.1.8.md b/docs/developer-docs/latest/update-migration-guides/migration-guides/v4/migration-guide-4.0.6-to-4.1.8.md
@@ -151,7 +151,7 @@ There are multiple methods to generate secrets, for example running `openssl ran
 
 ::: caution
 
-The [Hosting Provider Guides](/developer-docs/latest/setup-deployment-guides/deployment.html#hosting-provider-guides.md) are being updated to reflect these changes. Community contributions updating the hosting guides are encouraged.
+The [Hosting Provider Guides](/developer-docs/latest/setup-deployment-guides/deployment.md#hosting-provider-guides) are being updated to reflect these changes. Community contributions updating the hosting guides are encouraged.
 
 :::
 
diff --git a/docs/package.json b/docs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-docs",
-  "version": "4.0.0",
+  "version": "4.2.0",
   "main": "index.js",
   "scripts": {
     "dev": "yarn create:config-file && vuepress dev",
diff --git a/docs/user-docs/latest/assets/icons/add.svg b/docs/user-docs/latest/assets/icons/add.svg
@@ -0,0 +1,3 @@
+<svg width="12" height="12" viewBox="0 0 12 12" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 6.65223C12 6.81792 11.8657 6.95223 11.7 6.95223H6.95223V11.7C6.95223 11.8657 6.81792 12 6.65223 12H5.34777C5.18209 12 5.04777 11.8657 5.04777 11.7V6.95223H0.3C0.134314 6.95223 0 6.81792 0 6.65223V5.34777C0 5.18209 0.134315 5.04777 0.3 5.04777H5.04777V0.3C5.04777 0.134314 5.18209 0 5.34777 0H6.65223C6.81792 0 6.95223 0.134315 6.95223 0.3V5.04777H11.7C11.8657 5.04777 12 5.18209 12 5.34777V6.65223Z" fill="#8E8EA9"/>
+</svg>
diff --git a/docs/user-docs/latest/assets/icons/reset_icon.svg b/docs/user-docs/latest/assets/icons/reset_icon.svg
@@ -0,0 +1,3 @@
+<svg width="12" height="12" viewBox="0 0 12 12" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.84071 1.40213C7.23016 1.13603 6.57285 0.999209 5.90875 1C3.19857 1.00019 1 3.23958 1 5.99999C1 8.76051 3.19875 11 5.90908 11H5.90911C6.92437 10.9999 7.91466 10.6794 8.74369 10.0825C9.57273 9.48556 10.1998 8.64163 10.5385 7.66683C10.639 7.37758 10.4903 7.06012 10.2063 6.95775C9.9223 6.85538 9.61061 7.00687 9.5101 7.29611C9.2466 8.05438 8.75886 8.71084 8.11398 9.17516C7.4691 9.63947 6.69881 9.88881 5.90908 9.88887L5.90879 2.11111C5.90889 2.11111 5.90898 2.11111 5.90908 2.11111H5.90942L5.90976 2.11111C6.42598 2.11046 6.93694 2.21679 7.41153 2.42364C7.88202 2.6287 8.30702 2.9283 8.66114 3.30447L8.89367 3.57998L7.40046 5.10084C7.38773 5.11379 7.37906 5.1303 7.37555 5.14827C7.37203 5.16624 7.37383 5.18487 7.38072 5.20179C7.38761 5.21872 7.39927 5.23319 7.41423 5.24336C7.4292 5.25353 7.44679 5.25896 7.46478 5.25894H11V1.65826C11 1.63993 10.9947 1.62202 10.9847 1.60678C10.9747 1.59154 10.9605 1.57966 10.9439 1.57264C10.9273 1.56563 10.909 1.5638 10.8913 1.56738C10.8737 1.57095 10.8575 1.57978 10.8448 1.59275L9.66725 2.79207L9.47003 2.5584L9.46047 2.54817C9.00247 2.05821 8.45137 1.66828 7.84071 1.40213ZM5.90878 2.11111L5.90875 1L5.90879 2.11111C5.90879 2.11111 5.90879 2.11111 5.90878 2.11111ZM5.90878 2.11111L5.90904 9.88887C3.80122 9.88885 2.09091 8.14685 2.09091 5.99999C2.09091 3.85322 3.80108 2.11127 5.90878 2.11111Z" fill="#8E8EA9"/>
+</svg>
diff --git a/docs/user-docs/latest/assets/plugins/Marketplace-v4.png b/docs/user-docs/latest/assets/plugins/Marketplace-v4.png
diff --git a/docs/user-docs/latest/assets/plugins/marketplace-v4.png b/docs/user-docs/latest/assets/plugins/marketplace-v4.png
diff --git a/docs/user-docs/latest/assets/settings/settings_custom-logo.png b/docs/user-docs/latest/assets/settings/settings_custom-logo.png
diff --git a/docs/user-docs/latest/plugins/installing-plugins-via-marketplace.md b/docs/user-docs/latest/plugins/installing-plugins-via-marketplace.md
@@ -4,41 +4,44 @@ description: Instructions to install new plugins in a Strapi application via the
 canonicalUrl: https://docs.strapi.io/user-docs/latest/plugins/installing-plugins-via-marketplace.html
 ---
 
-# Managing Marketplace plugins
+# Using the Marketplace
 
-The Marketplace is where users can find additional plugins to customize Strapi applications. The Marketplace is located in the admin panel, indicated by ![Marketplace icon](../assets/icons/marketplace.svg) _Marketplace_. In the Marketplace, users can browse or search for plugins, link to detailed plugin descriptions and submit new plugins. This documentation describes how to navigate the Marketplace and how to install Marketplace plugins.
+The Marketplace is where users can find additional plugins to customize Strapi applications, and additional [providers](./introduction-to-plugins.md#providers) to extend plugins. The Marketplace is located in the admin panel, indicated by ![Marketplace icon](../assets/icons/marketplace.svg) _Marketplace_. In the Marketplace, users can browse or search for plugins and providers, link to detailed descriptions for each, and submit new plugins and providers.
 
  ::: strapi In-app Marketplace vs. Market website
-The Marketplace in the admin panel only displays v4 plugins, but all plugins for all Strapi versions are discoverable in the [Strapi Market](https://market.strapi.io). Keep in mind that v3 and v4 plugins are not cross-compatible.
+The Marketplace in the admin panel only displays v4 plugins, but all plugins for all Strapi versions are discoverable in the [Strapi Market](https://market.strapi.io). 
+
+Keep in mind that v3 and v4 plugins are not cross-compatible, but that providers are compatible both with v3 and v4 plugins.
 :::
 
 ![The Marketplace interface](../assets/plugins/marketplace-v4.png)
 
-Plugins are displayed on individual cards containing:
+The Plugins and Providers tabs display each plugin/provider on individual cards containing:
 
-- the plugin name, sometimes followed by either of the following badges:
-  - ![made by Strapi icon](../assets/icons/official-market.svg) to indicate the plugin is made by Strapi,
-  - ![verified by Strapi icon](../assets/icons/verified-marketplace.svg) to indicate the plugin was verified by Strapi.
-- the plugin description
+- their name, sometimes followed by either of the following badges:
+  - ![maintained by Strapi icon](../assets/icons/official-market.svg) to indicate it is made by Strapi,
+  - ![verified by Strapi icon](../assets/icons/verified-marketplace.svg) to indicate it was verified by Strapi.
+- the description
 - a **Learn more** button for additional information, including detailed implementation instructions
-- a **Copy install command** button to copy the plugin installation command to the local clipboard
+- a **Copy install command** button to copy the installation command to the local clipboard
 
-In the top right corner of the Marketplace, the **Submit your plugin** button redirects to the Strapi Market where it is possible to submit your own plugin.
+In the top right corner of the Marketplace, the **Submit your plugin** button redirects to the Strapi Market where it is possible to submit your own plugin and provider.
 
 ::: tip
-The search bar displays incremental search results based on the plugin name and description.
+The search bar displays incremental search results based on the plugin/provider name and description.
 :::
 
-## Installing Marketplace plugins
+## Installing Marketplace plugins and providers
+
+::: note
+Marketplace plugins and providers are installed and deleted from the user's terminal ([see Developer Documentation](/developer-docs/latest/developer-resources/cli/CLI.md)).
+:::
 
-To install a new plugin via the Marketplace:
+To install a new plugin or provider via the Marketplace:
 
 1. Go to the ![Marketplace icon](../assets/icons/marketplace.svg) Marketplace.
-2. Choose an available plugin and click on the **Copy install command** button.
+2. Choose the **Plugins** tab to browse available plugins or the **Providers** tab to browse available providers.
+3. Choose an available plugin/provider and click on the **Copy install command** button.
 3. Switch to your terminal and navigate to the Strapi application directory.
 4. Paste and run the copied install command.
-5. Follow any plugin-specific implementation instructions.
-
-::: note
-Marketplace plugins are installed and deleted from the user's terminal ([see Developer Documentation](/developer-docs/latest/developer-resources/cli/CLI.md)).
-:::
+5. Follow any plugin/provider-specific implementation instructions.
diff --git a/docs/user-docs/latest/plugins/introduction-to-plugins.md b/docs/user-docs/latest/plugins/introduction-to-plugins.md
@@ -6,15 +6,31 @@ canonicalUrl: https://docs.strapi.io/user-docs/latest/plugins/introduction-to-pl
 
 # Introduction to plugins
 
-Strapi is built around different types of plugins. Core plugins are essential for your Strapi application to function, and therefore cannot be deactivated. Pre-installed plugins, such as Internationalization, are installed in a default Strapi application. Additional plugins that extend and customize Strapi applications are available in the [Marketplace](../plugins/installing-plugins-via-marketplace.md).
+Strapi is built around different types of plugins. Every default Strapi application comes with the following pre-installed plugins:
 
-::: note
-Core plugins which include the Content Manager and the Content-type Builder are documented in their own sections of the user guide as they are quite specific (see [Introduction to the Content Manager](../content-manager/introduction-to-content-manager.md) and [Introduction to the Content-type Builder](../content-types-builder/introduction-to-content-types-builder.md)). This Plugins section focuses on how to manage plugins in general and provides documentation for the other, non-core plugins.
-:::
+* Content Manager (see [Introduction to the Content Manager](../content-manager/introduction-to-content-manager.md))
+* Content Type Builder (see [Introduction to the Content-type Builder](../content-types-builder/introduction-to-content-types-builder.md))
+* Email
+* Media Library (implemented via the [Upload plugin](../../../developer-docs/latest/plugins/upload.md))
+* Internationalization
+* Roles and Permissions
 
- From the admin panel, administrators are allowed to:
+These plugins are essential for your Strapi application to function and cannot be uninstalled.
 
-- discover additional plugins in the ![Marketplace icon](../assets/icons/marketplace.svg) _Marketplace_ (see [Managing Marketplace plugins](/user-docs/latest/plugins/installing-plugins-via-marketplace.md))
-- review the currently installed plugins in ![Plugins icon](../assets/icons/plugins.svg) _Plugins_
+Additional plugins that you can use to extend and customize your Strapi applications are available in the [Marketplace](../plugins/installing-plugins-via-marketplace.md). This section focuses on how to install and manage these additional plugins.
+
+From the admin panel, administrators are allowed to:
+
+- discover additional plugins and [providers](#providers) in the ![Marketplace icon](../assets/icons/marketplace.svg) _Marketplace_ (see [Managing Marketplace plugins](/user-docs/latest/plugins/installing-plugins-via-marketplace.md))
+- review the currently installed plugins and [providers](#providers) in ![Plugins icon](../assets/icons/plugins.svg) _Plugins_
 
 ![Plugins settings](../assets/plugins/plugins-settings.png)
+
+## Providers
+
+Some plugins can be further extended through the configuration of _providers_, packages designed to be used on top of an existing plugin and add a specific integration to it. For example, you can use the AWS S3 provider to extend the Media Library plugin and store files in your S3 bucket rather than locally on your server.
+
+Currently, the only plugins designed to work with providers are the:
+
+* [Email plugin](../../../developer-docs/latest/plugins/email.md#configure-the-plugin), and
+* [Media Library plugin](../../../developer-docs/latest/plugins/upload.md#using-a-provider) (implemented via the [Upload plugin](../../../developer-docs/latest/plugins/upload.md)).
diff --git a/docs/user-docs/latest/plugins/strapi-plugins.md b/docs/user-docs/latest/plugins/strapi-plugins.md
diff --git a/docs/user-docs/latest/settings/managing-global-settings.md b/docs/user-docs/latest/settings/managing-global-settings.md
