Merge remote-tracking branch 'origin/7.dev' into feature/7.x/member-field

Author: intoeetive

AUTHORS.md

@@ -17,6 +17,7 @@ If an entry is incorrect or duplicated, add or correct the entry in `.mailmap` i
 - Derek Jones <derek.jones@ellislab.com>
 - Doug Black Jr <dougblackjr@gmail.com>
 - Douglas Black <dougblackjr@gmail.com>
+- Eric Swierczek <2423727+swierczek@users.noreply.github.com>
 - Erwin Romkes <hello@stoneandstorm.com>
 - Gareth Davies <hello@garethtdavies.com>
 - Gavin * JCOGS <gavin@jcogs.net>
@@ -54,7 +55,7 @@ If an entry is incorrect or duplicated, add or correct the entry in `.mailmap` i
 - Simon Job <simon@job.id.au>
 - Stefan Rechsteiner <info@stefanrechsteiner.com>
 - Stephen G <45797159+stephengalbraith@users.noreply.github.com>
-- Stephen G <45797159+zdravvy@users.noreply.github.com>
+- zdravvy <45797159+zdravvy@users.noreply.github.com>
 - Terry Leigh Britton <terrybritton@users.noreply.github.com>
 - Tom Jaeger <Tom@PacketTide.com>
 - TomJaeger <Tom@PacketTide.com>

README.md

@@ -8,7 +8,7 @@ The ExpressionEngine user guide is written in human-readable Markdown and uses a
 
 ### Prerequisites
 
-Building the docs requires Node and npm.
+Building the docs requires Node and npm (latest stable version).
 
 In the root of the repository, install all the dependencies:
 
@@ -30,6 +30,10 @@ The documentation css and js files are located under `theme/assets-src`.
 
 To build the theme assets, run `npm run buildAssets`. You can also dynamically rebuild the assets when a file changes: `npm run watchAssets`.
 
+### Viewing local changes
+
+Manually load `/build/index.html` in your browser to view your local build. For example, `file:///Users/<username>/Documents/ExpressionEngine-User-Guide/build/index.html`. You can use the side navigation to navigate to different local files, but the search functionality always takes you to the live version at docs.expressionengine.com.
+
 ## Contributing
 
 See something that needs fixing? Want to improve the user guide or make it more helpful? Great! Check out [CONTRIBUTING.md](CONTRIBUTING.md) for details.