Merge branch '5.x' into 6.x

craftcms · Nov 19, 2024 · 8279866 · 8279866
2 parents 64e25fd + 1122b88
commit 8279866
Show file tree

Hide file tree

Showing 7 changed files with 10,082 additions and 15,978 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,8 +11,6 @@ tests/.env
 /node_modules/*
 /build/*
 /yarn-error.log
-/docs/.vitepress/dist
-/docs/.vitepress/cache
 
 # MISC FILES
 .cache

diff --git a/docs/.gitignore b/docs/.gitignore
@@ -0,0 +1,3 @@
+node_modules
+.vitepress/dist
+.vitepress/cache
diff --git a/docs/get-started/configuration.md b/docs/get-started/configuration.md
@@ -1,6 +1,6 @@
 # Configuration
 
-Create an `feed-me.php` file under your `/config` directory with the following options available to you. You can also use multi-environment options to change these per environment.
+Create a `feed-me.php` file under your `/config` directory with any of the following. Feed Me’s configuration file allows customization [per-environment](https://craftcms.com/docs/4.x/config/#multi-environment-configs) and [per-feed](#configuration-options) (see `feedOptions`).
 
 ```php
 <?php