3 files changed, 87 insertions, 30 deletions
diff --git a/docs/release-notes.md b/docs/release-notes.md
index 97aabd37..1c5dc1dd 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -1,6 +1,54 @@
 &larr; [README](README.md)
 
 # Release notes
+<!--
+## Future release
+* For modders:
+  * Migrated to Harmony 2.0 (see [_migrate to Harmony 2.0_](https://stardewvalleywiki.com/Modding:Migrate_to_Harmony_2.0) for more info).
+-->
+
+## 3.6
+Released 20 June 2020 for Stardew Valley 1.4.1 or later.
+
+* For players:
+  * Added crossplatform compatibility for mods which use the `[HarmonyPatch(type)]` attribute.
+  * Added experimental option to reduce startup time when loading mod DLLs (thanks to ZaneYork!). Enable `RewriteInParallel` in the `smapi-internal/config.json` to try it.
+  * Reduced processing time when a mod loads many unpacked images (thanks to Entoarox!).
+  * Mod load warnings are now listed alphabetically.
+  * MacOS files starting with `._` are now ignored and can no longer cause skipped mods.
+  * Simplified paranoid warning logs and reduced their log level.
+  * Fixed black maps on Android for mods which use `.tmx` files.
+  * Fixed `BadImageFormatException` error detection.
+  * Fixed `reload_i18n` command not reloading content pack translations.
+
+* For the web UI:
+  * Added GitHub licenses to mod compatibility list.
+  * Improved JSON validator:
+    * added SMAPI `i18n` schema;
+    * editing an uploaded file now remembers the selected schema;
+    * changed default schema to plain JSON.
+  * Updated ModDrop URLs.
+  * Internal changes to improve performance and reliability.
+
+* For modders:
+  * Added [event priorities](https://stardewvalleywiki.com/Modding:Modder_Guide/APIs/Events#Custom_priority) (thanks to spacechase0!).
+  * Added [update subkeys](https://stardewvalleywiki.com/Modding:Modder_Guide/APIs/Update_checks#Update_subkeys).
+  * Added [a custom build of Harmony](https://github.com/Pathoschild/Harmony#readme) to provide more useful stack traces in error logs.
+  * Added `harmony_summary` console command to list or search current Harmony patches.
+  * Added `Multiplayer.PeerConnected` event.
+  * Added support for overriding update keys from the wiki compatibility list.
+  * Improved mod rewriting for compatibility to support more cases (e.g. custom attributes and generic types).
+  * Fixed `helper.Reflection` blocking access to game methods/properties intercepted by SMAPI.
+  * Fixed asset propagation for Gil's portraits.
+  * Fixed `.pdb` files ignored for error stack traces when mods are rewritten by SMAPI.
+  * Fixed `ModMessageReceived` event handlers not tracked for performance monitoring.
+
+* For SMAPI developers:
+  * Eliminated MongoDB storage in the web services, which complicated the code unnecessarily. The app still uses an abstract interface for storage, so we can wrap a distributed cache in the future if needed.
+  * Overhauled update checks to simplify mod site integrations, centralize common logic, and enable upcoming features.
+  * Merged the separate legacy redirects app on AWS into the main app on Azure.
+  * Changed SMAPI's Harmony ID from `io.smapi` to `SMAPI` for readability in Harmony summaries.
+
 ## 3.5
 Released 27 April 2020 for Stardew Valley 1.4.1 or later.
 
diff --git a/docs/technical/smapi.md b/docs/technical/smapi.md
index c9d5c07e..3cb450ae 100644
--- a/docs/technical/smapi.md
+++ b/docs/technical/smapi.md
@@ -15,6 +15,7 @@ This document is about SMAPI itself; see also [mod build package](mod-package.md
   * [Compiling from source](#compiling-from-source)
   * [Debugging a local build](#debugging-a-local-build)
   * [Preparing a release](#preparing-a-release)
+  * [Using a custom Harmony build](#using-a-custom-harmony-build)
 * [Release notes](#release-notes)
 
 ## Customisation
@@ -57,24 +58,22 @@ SMAPI uses a small number of conditional compilation constants, which you can se
 flag | purpose
 ---- | -------
 `SMAPI_FOR_WINDOWS` | Whether SMAPI is being compiled on Windows for players on Windows. Set automatically in `crossplatform.targets`.
+`HARMONY_2` | Whether to enable experimental Harmony 2.0 support and rewrite existing Harmony 1._x_ mods for compatibility. Note that you need to replace `build/0Harmony.dll` with a Harmony 2.0 build (or switch to a package reference) to use this flag.
 
 ## For SMAPI developers
 ### Compiling from source
-Using an official SMAPI release is recommended for most users.
+Using an official SMAPI release is recommended for most users, but you can compile from source
+directly if needed. There are no special steps (just open the project and compile), but SMAPI often
+uses the latest C# syntax. You may need the latest version of your IDE to compile it.
 
-SMAPI often uses the latest C# syntax. You may need the latest version of
-[Visual Studio](https://www.visualstudio.com/vs/community/) on Windows,
-[MonoDevelop](https://www.monodevelop.com/) on Linux,
-[Visual Studio for Mac](https://www.visualstudio.com/vs/visual-studio-mac/), or an equivalent IDE
-to compile it. It uses build configuration derived from the
-[crossplatform mod config](https://smapi.io/package/readme) to detect your current OS automatically
-and load the correct references. Compile output will be placed in a `bin` folder at the root of the
-git repository.
+SMAPI uses build configuration derived from the [crossplatform mod config](https://smapi.io/package/readme)
+to detect your current OS automatically and load the correct references. Compile output will be
+placed in a `bin` folder at the root of the Git repository.
 
 ### Debugging a local build
 Rebuilding the solution in debug mode will copy the SMAPI files into your game folder. Starting
 the `SMAPI` project with debugging from Visual Studio (on Mac or Windows) will launch SMAPI with
-the debugger attached, so you can intercept errors and step through the code being executed. This
+the debugger attached, so you can intercept errors and step through the code being executed. That
 doesn't work in MonoDevelop on Linux, unfortunately.
 
 ### Preparing a release
@@ -82,14 +81,14 @@ To prepare a crossplatform SMAPI release, you'll need to compile it on two platf
 [crossplatforming info](https://stardewvalleywiki.com/Modding:Modder_Guide/Test_and_Troubleshoot#Testing_on_all_platforms)
 on the wiki for the first-time setup.
 
-1. Update the version number in `.root/build/common.targets` and `Constants::Version`. Make sure
-  you use a [semantic version](https://semver.org). Recommended format:
+1. Update the version numbers in `build/common.targets`, `Constants`, and the `manifest.json` for
+   bundled mods. Make sure you use a [semantic version](https://semver.org). Recommended format:
 
    build type | format                   | example
    :--------- | :----------------------- | :------
-   dev build  | `<version>-alpha.<date>` | `3.0-alpha.20171230`
-   prerelease | `<version>-beta.<count>` | `3.0-beta.2`
-   release    | `<version>`              | `3.0`
+   dev build  | `<version>-alpha.<date>` | `3.0.0-alpha.20171230`
+   prerelease | `<version>-beta.<count>` | `3.0.0-beta.2`
+   release    | `<version>`              | `3.0.0`
 
 2. In Windows:
    1. Rebuild the solution in Release mode.
@@ -103,5 +102,10 @@ on the wiki for the first-time setup.
    3. Rename the folders to `SMAPI <version> installer` and `SMAPI <version> installer for developers`.
    4. Zip the two folders.
 
+### Custom Harmony build
+SMAPI uses [a custom build of Harmony](https://github.com/Pathoschild/Harmony#readme), which is
+included in the `build` folder. To use a different build, just replace `0Harmony.dll` in that
+folder.
+
 ## Release notes
 See [release notes](../release-notes.md).
diff --git a/docs/technical/web.md b/docs/technical/web.md
index 67e86c8b..50237bfe 100644
--- a/docs/technical/web.md
+++ b/docs/technical/web.md
@@ -110,8 +110,9 @@ Available schemas:
 
 format | schema URL
 ------ | ----------
-[SMAPI `manifest.json`](https://stardewvalleywiki.com/Modding:Modder_Guide/APIs/Manifest) | https://smapi.io/schemas/manifest.json
-[Content Patcher `content.json`](https://github.com/Pathoschild/StardewMods/tree/develop/ContentPatcher#readme) | https://smapi.io/schemas/content-patcher.json
+[SMAPI: `manifest.json`](https://stardewvalleywiki.com/Modding:Modder_Guide/APIs/Manifest) | https://smapi.io/schemas/manifest.json
+[SMAPI: translations (`i18n` folder)](https://stardewvalleywiki.com/Modding:Modder_Guide/APIs/Translation) | https://smapi.io/schemas/i18n.json
+[Content Patcher: `content.json`](https://github.com/Pathoschild/StardewMods/tree/develop/ContentPatcher#readme) | https://smapi.io/schemas/content-patcher.json
 
 ## Web API
 ### Overview
@@ -340,9 +341,19 @@ short url | → | target page
 A local environment lets you run a complete copy of the web project (including cache database) on
 your machine, with no external dependencies aside from the actual mod sites.
 
-1. Enter the Nexus credentials in `appsettings.Development.json` . You can leave the other
-   credentials empty to default to fetching data anonymously, and storing data in-memory and
-   on disk.
+1. Edit `appsettings.Development.json` and set these options:
+
+   property name | description
+   ------------- | -----------
+   `NexusApiKey` | [Your Nexus API key](https://www.nexusmods.com/users/myaccount?tab=api#personal_key).
+
+   Optional settings:
+
+   property name               | description
+   --------------------------- | -----------
+   `AzureBlobConnectionString` | The connection string for the Azure Blob storage account. Defaults to using the system's temporary file folder if not specified.
+   `GitHubUsername`<br />`GitHubPassword` | The GitHub credentials with which to query GitHub release info. Defaults to anonymous requests if not specified.
+
 2. Launch `SMAPI.Web` from Visual Studio to run a local version of the site.
 
 ### Production environment
@@ -355,19 +366,15 @@ accordingly.
 
 Initial setup:
 
-1. Launch an empty MongoDB server (e.g. using [MongoDB Atlas](https://www.mongodb.com/cloud/atlas))
-   for mod data.
-2. Create an Azure Blob storage account for uploaded files.
-3. Create an Azure App Services environment running the latest .NET Core on Linux or Windows.
-4. Add these application settings in the new App Services environment:
+1. Create an Azure Blob storage account for uploaded files.
+2. Create an Azure App Services environment running the latest .NET Core on Linux or Windows.
+3. Add these application settings in the new App Services environment:
 
    property name                   | description
    ------------------------------- | -----------------
    `ApiClients.AzureBlobConnectionString` | The connection string for the Azure Blob storage account created in step 2.
    `ApiClients.GitHubUsername`<br />`ApiClients.GitHubPassword` | The login credentials for the GitHub account with which to fetch release info. If these are omitted, GitHub will impose much stricter rate limits.
    `ApiClients:NexusApiKey`        | The [Nexus API authentication key](https://github.com/Pathoschild/FluentNexus#init-a-client).
-   `MongoDB:ConnectionString`      | The connection string for the MongoDB instance.
-   `MongoDB:Database`              | The MongoDB database name (e.g. `smapi` in production or `smapi-edge` in testing environments).
 
    Optional settings:
 
@@ -378,6 +385,4 @@ Initial setup:
    `Site:BetaBlurb`                | If `Site:BetaEnabled` is true and there's a beta version of SMAPI in its GitHub releases, this is shown on the beta download button as explanatory subtext.
    `Site:SupporterList`            | A list of Patreon supports to credit on the download page.
 
-To deploy updates:
-1. [Deploy the web project from Visual Studio](https://docs.microsoft.com/en-us/visualstudio/deployment/quickstart-deploy-to-azure).
-2. If the MongoDB schema changed, delete the MongoDB database. (It'll be recreated automatically.)
+To deploy updates, just [redeploy the web project from Visual Studio](https://docs.microsoft.com/en-us/visualstudio/deployment/quickstart-deploy-to-azure).