From ae1d26e7c11d8ce6fa3e9ed6523bdda0da8abcda Mon Sep 17 00:00:00 2001
From: Michael Stenta <mike@mstenta.net>
Date: Thu, 3 Nov 2022 11:35:49 -0400
Subject: [PATCH 1/2] Link to NPM section under Usage section in README.md.

---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index 1d099ff..6b7bf93 100644
--- a/README.md
+++ b/README.md
@@ -12,6 +12,11 @@ For more information on farmOS, visit [farmOS.org](https://farmOS.org).
 
 ## Usage
 
+For NPM/Webpack usage, see
+[Working with farmOS-map in an NPM/Webpack Project](#working-with-farmos-map-in-an-npmwebpack-project).
+
+For generic HTML/JavaScript usage:
+
 1. Host the `.js` and `.css` files from the `dist/` directory of this package somehow.
 2. Include `farmOS-map.js` and `farmOS-map.css` in the page. e.g.:
   ```html

From 9eba4ce004f9c718ad740620e1981ca7b130e975 Mon Sep 17 00:00:00 2001
From: Jamie Gaehring <gaehj457@gmail.com>
Date: Thu, 3 Nov 2022 14:07:45 -0400
Subject: [PATCH 2/2] Separate installation info from README.md#usage.

---
 README.md | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 6b7bf93..fab93df 100644
--- a/README.md
+++ b/README.md
@@ -10,12 +10,9 @@ farmOS Map is an [OpenLayers](https://openlayers.org/) map for farmOS.
 
 For more information on farmOS, visit [farmOS.org](https://farmOS.org).
 
-## Usage
-
-For NPM/Webpack usage, see
-[Working with farmOS-map in an NPM/Webpack Project](#working-with-farmos-map-in-an-npmwebpack-project).
+## Installation
 
-For generic HTML/JavaScript usage:
+### Via HTML `<script>` Tag
 
 1. Host the `.js` and `.css` files from the `dist/` directory of this package somehow.
 2. Include `farmOS-map.js` and `farmOS-map.css` in the page. e.g.:
@@ -27,6 +24,18 @@ For generic HTML/JavaScript usage:
 4. Call the map creation method with the element ID: `farmOS.map.create('farm-map');`
 5. (optional) Add behaviors - see below.
 
+### Via Package Managers
+
+farmOS-map can be installed via `npm-cli`, `yarn` or other package managers from the npm registry:
+
+```sh
+npm install @farmos.org/farmos-map@2
+```
+
+For additional configuration, see [Working with farmOS-map in an NPM/Webpack Project](#working-with-farmos-map-in-an-npmwebpack-project).
+
+## Usage
+
 ### Creating a Map
 
 The simplest way to create a map is to call the `create` method with an HTML
@@ -634,13 +643,8 @@ The farmOS-map accent color can be changed with the `--farmos-map-accent-color`
 ### Working with farmOS-map in an NPM/Webpack Project
 
 Some integration scenarios require farmOS-map to be modeled as a dependency - i.e. so static analysis can
-validate/document class/method references.
-
-farmOS-map can be added via NPM or similar package managers. e.g.
-
-```sh
-npm install @farmos.org/farmos-map@2
-```
+validate/document class/method references. In these cases, installation is usually performed
+[via a package manager](#via-package-managers) like `npm-cli` or `yarn`.
 
 Then farmOS-map can be accessed using an `import` statement.