Merge branch '5.x' into 6.x

# Conflicts: # .github/workflows/docs.yml # CHANGELOG.md # docs/.vitepress/config.mjs # docs/.vitepress/sidebar.json # docs/guides/importing-commerce-products.md # docs/guides/importing-commerce-variants.md # docs/guides/migrating-from-wordpress.md # docs/index.md # package-lock.json # package.json
craftcms · Oct 15, 2024 · 2ec0fd9 · 2ec0fd9
2 parents bfe586b + 0edf420
commit 2ec0fd9
Show file tree

Hide file tree

Showing 6 changed files with 12,711 additions and 6,035 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Release Notes for Feed Me
 
+## Unreleased
+
+- When duplicating a feed, a new passkey is generated instead of using the passkey on the original feed. ([#1534](https://github.com/craftcms/feed-me/pull/1534))
+
 ## 6.4.1 - 2024-10-09
 
 - Fixed a PHP error that would occur when importing Products that had new Variants. ([#1528](https://github.com/craftcms/feed-me/pull/1528))

diff --git a/docs/guides/importing-commerce-variants.md b/docs/guides/importing-commerce-variants.md
@@ -2,4 +2,4 @@
 
 ::: warning
 This guide is no longer maintained! [Commerce variants](https://craftcms.com/docs/commerce/5.x/system/products-variants.html) are imported as nested records of [products](importing-commerce-products.md).
-:::
+:::
diff --git a/docs/guides/migrating-from-wordpress.md b/docs/guides/migrating-from-wordpress.md
@@ -16,8 +16,6 @@ The first step is to get your data out of WordPress. We’ll assume you’re usi
 Use one or more of the tutorials to set up exports for the data you need. Keep in mind that you can import content in multiple stages via different feeds—you don't have to import (or export) _everything_ at once!
 :::
 
-The “shape” of your exported data is flexible. As long as 
-
 ### WP JSON
 
 If you have a relatively vanilla WordPress installation, you may be able to use the [built-in REST API](https://learn.wordpress.org/tutorial/using-the-wordpress-rest-api/) to dynamically retrieve your site’s content as JSON.

diff --git a/docs/index.md b/docs/index.md
@@ -12,4 +12,4 @@ Feed Me is a content importing and synchronization plugin for [Craft CMS](https:
 - Pagination and background processing for large feeds.
 - Automatic database backups before each feed processing.
 - Troubleshoot feed processing issues with verbose, context-rich logs.
-- Use feed data directly in your Twig templates.
+- Use feed data directly in your Twig templates.