strapi
diff --git a/‎.gitignore‎
Lines changed: 1 addition & 1 deletion b/‎.gitignore‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎README.md‎
Lines changed: 4 additions & 4 deletions b/‎README.md‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎docs/.vuepress/config/theme-config.js‎
Lines changed: 9 additions & 9 deletions b/‎docs/.vuepress/config/theme-config.js‎
Lines changed: 9 additions & 9 deletions
diff --git a/‎docs/.vuepress/theme/global-components/AlphaBadge.vue‎
Lines changed: 23 additions & 0 deletions b/‎docs/.vuepress/theme/global-components/AlphaBadge.vue‎
Lines changed: 23 additions & 0 deletions
diff --git a/‎docs/.vuepress/theme/global-components/BetaBadge.vue‎
Lines changed: 23 additions & 0 deletions b/‎docs/.vuepress/theme/global-components/BetaBadge.vue‎
Lines changed: 23 additions & 0 deletions
diff --git a/‎docs/.vuepress/theme/global-components/CustomBadge.vue‎
Lines changed: 27 additions & 0 deletions b/‎docs/.vuepress/theme/global-components/CustomBadge.vue‎
Lines changed: 27 additions & 0 deletions
diff --git a/‎docs/developer-docs/latest/developer-resources/database-apis-reference/rest/api-parameters.md‎
Lines changed: 1 addition & 1 deletion b/‎docs/developer-docs/latest/developer-resources/database-apis-reference/rest/api-parameters.md‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎docs/developer-docs/latest/developer-resources/database-apis-reference/rest/populating-fields.md‎
Lines changed: 7 additions & 1 deletion b/‎docs/developer-docs/latest/developer-resources/database-apis-reference/rest/populating-fields.md‎
Lines changed: 7 additions & 1 deletion
diff --git a/‎docs/developer-docs/latest/getting-started/introduction.md‎
Lines changed: 1 addition & 1 deletion b/‎docs/developer-docs/latest/getting-started/introduction.md‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎docs/developer-docs/latest/plugins/i18n.md‎
Lines changed: 11 additions & 2 deletions b/‎docs/developer-docs/latest/plugins/i18n.md‎
Lines changed: 11 additions & 2 deletions
@@ -112,4 +112,4 @@ dist
 
 
 # Auto generated files
-docs/.vuepress/config.js
+docs/.vuepress/config.js
@@ -3,7 +3,7 @@
     <img src="./images/logo.png" width="318px" alt="Strapi logo" />
   </a>
 </p>
-<h3 align="center">API creation made simple, secure and fast.</h3>
+<h3 align="center">API creation made simple, secure, and fast.</h3>
 <p align="center">The most advanced open-source headless CMS to build powerful APIs with no effort.</p>
 <br />
 
@@ -13,16 +13,16 @@ If you are looking for the Strapi code, please see the [Strapi Monorepo](https:/
 
 ---
 
-Strapi is a free and open-source headless CMS delivering your content anywhere you need.
+Strapi is a free and open-source headless CMS that delivers your content wherever you need it.
 
 - **Keep control over your data**. With Strapi, you know where your data is stored, and you keep full control at all times.
-- **Self-hosted**. You can host and scale Strapi projects the way you want. You can choose any hosting platform you want: AWS, Netlify, Heroku, a VPS, or a dedicated server. You can scale as you grow, 100% independent.
+- **Self-hosted**. You can host and scale Strapi projects the way you want. You can choose any hosting platform you want: AWS, Netlify, Heroku, a VPS, or a dedicated server. You can scale as you grow, 100% independently.
 - **Database agnostic**. You can choose the database you prefer. Strapi works with SQL databases: PostgreSQL, MySQL, MariaDB, and SQLite.
 - **Customizable**. You can quickly build your logic by fully customizing APIs, routes, or plugins to fit your needs perfectly.
 
 ## Documentation Contribution Requirements
 
-The following are required if you are submitting pull requests to the documentation. For more information on how to contribute please see our [contribution guide](./CONTRIBUTING.md)
+The following are required if you are submitting pull requests to the documentation repository. For more information on how to contribute please see our [contribution guide](./CONTRIBUTING.md)
 
 - NodeJS >=14.19.1 <=18.x.x
 - NPM >= 6.x
 
@@ -87,15 +87,15 @@ const themeConfig = {
             },
           ]
         },
-        {
-          text: 'Pre-release Documentation',
-          items: [
-            {
-              text: 'docs-next',
-              link: 'https://docs-next.strapi.io',
-            },
-          ]
-        },
+        // { // temporarily disabled while we move to Docusaurus
+        //   text: 'Pre-release Documentation',
+        //   items: [
+        //     {
+        //       text: 'docs-next',
+        //       link: 'https://docs-next.strapi.io',
+        //     },
+        //   ]
+        // },
       ],
     },
     {
 
@@ -0,0 +1,23 @@
+<template>
+ <CustomBadge text="Alpha" type="alpha" :withLinkIcon=withLinkIcon :link="link"/>
+</template>
+
+<script>
+export default {
+  name: 'AlphaBadge',
+  props: {
+    text: {
+      type: String,
+      default: 'Alpha',
+      // required: true // to suppress Vue warnings
+    },
+    withLinkIcon: {
+      type: Boolean,
+      default: false
+    },
+    link: {
+      type: String,
+    },
+  }
+}
+</script>
@@ -0,0 +1,23 @@
+<template>
+ <CustomBadge text="Beta" type="beta" :withLinkIcon=withLinkIcon :link="link"/>
+</template>
+
+<script>
+export default {
+  name: 'BetaBadge',
+  props: {
+    text: {
+      type: String,
+      default: 'Beta',
+      // required: true // to suppress Vue warnings
+    },
+    withLinkIcon: {
+      type: Boolean,
+      default: false
+    },
+    link: {
+      type: String,
+    },
+  }
+}
+</script>
@@ -35,5 +35,32 @@ export default {
     background-color #00b6c8
   &.bronze
     background-color #15bb70
+  &.alpha
+  &.beta
+    position relative
+    top -.2em
+    left .6em
+    text-transform uppercase
+    font-size 14px
+    font-weight 700
+    border-radius 4px
+    padding .32em .6em .25em 1.2em
+    color $neutral800
+    &::before
+      position absolute
+      content: '•'
+      font-size 1.5em
+      left .25em
+      top .12em
+      content: '•'
+      font-size 1.5em
+  &.alpha
+    background-color $danger100 // check palette.styl for values
+    &::before
+      color $danger600
+  &.beta
+    background-color $alternative100
+    &::before
+      color $alternative600
 </style>
 
@@ -20,7 +20,7 @@ The following API parameters are available:
 | `fields`           | Array         | [Select only specific fields to display](/developer-docs/latest/developer-resources/database-apis-reference/rest/populating-fields.md#field-selection) |
 | `pagination`       | Object        | [Page through entries](/developer-docs/latest/developer-resources/database-apis-reference/rest/sort-pagination.md#pagination) |
 | `publicationState` | String        | [Select the Draft & Publish state](/developer-docs/latest/developer-resources/database-apis-reference/rest/filtering-locale-publication.md#publication-state)<br/><br/>Only accepts the following values:<ul><li>`live`</li><li>`preview`</li></ul> |
-| `locale`           | String or Array  | [Select one ore multiple locales](/developer-docs/latest/developer-resources/database-apis-reference/rest/filtering-locale-publication.md#locale) |
+| `locale`           | String or Array  | [Select one or multiple locales](/developer-docs/latest/developer-resources/database-apis-reference/rest/filtering-locale-publication.md#locale) |
 
 Query parameters use the LHS bracket syntax (i.e. they are encoded using square brackets `[]`)
 
 
@@ -499,7 +499,13 @@ The `populateCreatorFields` property is not available to the GraphQL API.
 
 ### Combining Population with other operators
 
-By utilizing the `populate` operator it's possible to combine other operators such as [field selection](/developer-docs/latest/developer-resources/database-apis-reference/rest/populating-fields.md#field-selection) & [sort & pagination](/developer-docs/latest/developer-resources/database-apis-reference/rest/sort-pagination.md) in the population queries. See the following complex population examples:
+By utilizing the `population` operator it is possible to combine other operators such as [field selection](/developer-docs/latest/developer-resources/database-apis-reference/rest/populating-fields.md#field-selection), [filters](/developer-docs/latest/developer-resources/database-apis-reference/rest/filtering-locale-publication.md), and [sort](/developer-docs/latest/developer-resources/database-apis-reference/rest/sort-pagination.md) in the population queries. 
+
+:::caution
+The population and pagination operators cannot be combined.
+:::
+
+See the following complex population examples:
 
 #### Populate with field selection
 
 
@@ -23,7 +23,7 @@ As it goes hand in hand with the open-source ecosystem, Strapi is open to contri
 - [`strapi/strapi`](https://github.com/strapi/strapi): main repository of Strapi, which contains the core of the project. You can find the admin panel, core plugins, plugin providers, and the whole code that runs your Strapi application. Please read the [`CONTRIBUTING.md`](https://github.com/strapi/strapi/blob/master/CONTRIBUTING.md) file to have more information about contributions to the main repository.
 - [`strapi/documentation`](https://github.com/strapi/documentation): contains the whole documentation of Strapi. Please read the [contribution guide](https://github.com/strapi/documentation/blob/main/CONTRIBUTING.md) to have more information about contributions to the Strapi documentation.
 - [`strapi/design-system`](https://github.com/strapi/design-system): is the design system that is used in the admin panel. It brings consistency between the different admin plugins.
-- [`strapi/awesome-strapi`](https://github.com/strapi/awesome-strapi): contains everything the community built and all managed plugins. It is used as a central place to find and submit new packages such as plugins, middlewares, hooks, and general enhancements to the core of Strapi.
+- [`strapi-community/awesome-strapi`](https://github.com/strapi-community/awesome-strapi): contains everything the community built and all managed plugins. It is used as a central place to find and submit new packages such as plugins, middlewares, hooks, and general enhancements to the core of Strapi. 
 
 ## Strapi Community
 
 
@@ -338,9 +338,18 @@ This request:
 
 ### Updating an entry
 
-It is not possible to change the locale of an existing localized entry.
+To update an existing localized entry, send a `PUT` request to the appropriate URL depending on the type of content:
 
-When updating a localized entry (with `PUT /{localized-content-type}/:id`), if you set a `locale` attribute in the request body, it will be ignored.
+| Content-Type    | Request URL format                           |
+| --------------- | -------------------------------------------- |
+| Collection type | `PUT /api/{localized-content-type}/:id` |
+| Single type     | `PUT /api/{localized-content-type}/?locale={locale}` |
+
+When updating a localization for existing localized entries, the body of the `PUT` request can only accept localized fields.
+
+::: tip
+It is not possible to change the locale of an existing localized entry. When updating a localized entry, if you set a `locale` attribute in the request body it will be ignored.
+:::
 
 ## Usage with the GraphQL plugin
Original file line number	Diff line number	Diff line change
`@@ -112,4 +112,4 @@ dist`
`112`	`112`
`113`	`113`
`114`	`114`	`# Auto generated files`
`115`		`-docs/.vuepress/config.js`
	`115`	`+docs/.vuepress/config.js`