Merge branch 'main' into iron-bank

ericpaulsen · ericpaulsen · commit 28082a9a10aa · 2023-01-31T13:03:53.000-05:00
diff --git a/docs/admin/upgrade.md b/docs/admin/upgrade.md
@@ -39,6 +39,18 @@ Coder container:
 docker-compose pull coder && docker-compose up coder -d
 ```
 
+## Via Kubernetes
+
+See [Upgrading Coder via Helm](../install/kubernetes.md#upgrading-coder-via-helm).
+
+## Via Windows
+
+Download the latest Windows installer or binary from [GitHub releases](https://github.com/coder/coder/releases), or upgrade from Winget.
+
+```sh
+winget install Coder.Coder
+```
+
 ## Up Next
 
 - [Learn how to enable Enterprise features](../enterprise.md).
diff --git a/docs/images/install/windows-installer.png b/docs/images/install/windows-installer.png
diff --git a/docs/install/windows.md b/docs/install/windows.md
@@ -0,0 +1,35 @@
+# Windows
+
+Use the Windows installer to download the CLI and add Coder to `PATH`. Alternatively, you can install Coder on Windows via a [standalone binary](./binary.md).
+
+1. Download the Windows installer from [GitHub releases](https://github.com/coder/coder/releases) or from `winget`
+
+   ```powershell
+    winget install Coder.Coder
+   ```
+
+2. Run the application
+
+   ![Windows installer](../images/install/windows-installer.png)
+
+3. Start a Coder server
+
+   ```console
+   # Automatically sets up an external access URL on *.try.coder.app
+   coder server
+
+   # Requires a PostgreSQL instance (version 13 or higher) and external access URL
+   coder server --postgres-url <url> --access-url <url>
+   ```
+
+   > Set `CODER_ACCESS_URL` to the external URL that users and workspaces will use to
+   > connect to Coder. This is not required if you are using the tunnel. Learn more
+   > about Coder's [configuration options](../admin/configure.md).
+
+4. Visit the Coder URL in the logs to set up your first account, or use the CLI.
+
+## Next steps
+
+- [Quickstart](../quickstart.md)
+- [Configuring Coder](../admin/configure.md)
+- [Templates](../templates.md)
diff --git a/docs/manifest.json b/docs/manifest.json
@@ -41,6 +41,11 @@
           "description": "Install Coder with Docker / docker-compose",
           "path": "./install/docker.md"
         },
+        {
+          "title": "Windows",
+          "description": "Install Coder on Windows",
+          "path": "./install/windows.md"
+        },
         {
           "title": "Standalone binaries",
           "description": "Download binaries for macOS, Windows, and Linux",
diff --git a/scripts/release/generate_release_notes.sh b/scripts/release/generate_release_notes.sh
@@ -148,4 +148,10 @@ Compare: [\`$old_version...$new_version\`](https://github.com/coder/coder/compar
 ## Container image
 
 - \`docker pull $image_tag\`
+
+## Install/upgrade
+
+Refer to our docs to [install](https://coder.com/docs/v2/latest/install)
+or [upgrade](https://coder.com/docs/v2/latest/admin/upgrade) Coder, or use
+a release asset below.
 "
