Merge branch '5.x' into feature/1538-support-asset-download-via-guzzle

.github/workflows/docs.yml

@@ -29,6 +29,9 @@ jobs:
   build:
     name: Build VitePress Site
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: docs
     outputs:
       short_hash: ${{ steps.hash.outputs.short_hash }}
     steps:

.gitignore

@@ -11,8 +11,6 @@ tests/.env
 /node_modules/*
 /build/*
 /yarn-error.log
-/docs/.vitepress/dist
-/docs/.vitepress/cache
 
 # MISC FILES
 .cache

docs/.gitignore

@@ -0,0 +1,3 @@
+node_modules
+.vitepress/dist
+.vitepress/cache

docs/.vitepress/sidebar.json

@@ -4,7 +4,6 @@
     "items": [
       {"text": "Introduction", "link": "/"},
       {"text": "Installation", "link": "get-started/installation-setup"},
-      {"text": "Requirements", "link": "get-started/requirements"},
       {"text": "Configuration", "link": "get-started/configuration"}
     ]
   },

docs/get-started/installation-setup.md

@@ -1,10 +1,16 @@
 # Installation & Setup
-You can install Feed Me via the plugin store, or through Composer.
+You can install Feed Me with the in-app [Plugin Store](https://plugins.craftcms.com), or via Composer.
+
+### Requirements
+
+Feed Me 4.x requires Craft CMS 3.7.0 or newer; Feed Me 5.x requires Craft CMS 4.6.0 or newer.
 
 ### Craft Plugin Store
+
 To install **Feed Me**, navigate to the _Plugin Store_ section of your Craft control panel, search for `Feed Me`, and click the _Try_ button.
 
 ### Composer
+
 You can also add the package to your project using Composer.
 
 1. Open your terminal and go to your Craft project:
@@ -15,4 +21,4 @@ cd /path/to/project
 ```
 composer require craftcms/feed-me
 ```
-3. In the Control Panel, go to Settings → Plugins and click the “Install” button for Feed Me.
+3. Run `php craft plugin/install feed-me`, or open the Control Panel and visit **Settings** → **Plugins** and click the “Install” button for Feed Me.