From 4f519fec6787deaf1596e7da24a7a43b155fbc56 Mon Sep 17 00:00:00 2001
From: Avery Harnish <averyharnish@gmail.com>
Date: Fri, 30 Aug 2019 12:50:33 -0500
Subject: [PATCH 01/18] Remove link to docs for installation because they link
 back to wrangler README

---
 README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.md b/README.md
index 149ded34a..9958616e4 100644
--- a/README.md
+++ b/README.md
@@ -27,8 +27,6 @@ cargo install wrangler
 
 If you don't have `cargo` or `npm` installed, you will need to follow these [additional instructions](#additional-installation-instructions)
 
-For more information on installation, click [here](https://workers.cloudflare.com/docs/quickstart/cli-setup/).
-
 ## Updating
 
 For information regarding updating Wrangler, click [here](https://workers.cloudflare.com/docs/quickstart/updating-the-cli/).

From e9c94c887337fa66f7e1df711a2303f1482b66aa Mon Sep 17 00:00:00 2001
From: Avery Harnish <averyharnish@gmail.com>
Date: Tue, 10 Sep 2019 15:32:22 -0500
Subject: [PATCH 02/18] Add environment documentation to build, preview, and
 publish sections of readme

---
 README.md | 279 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 145 insertions(+), 134 deletions(-)

diff --git a/README.md b/README.md
index 0e4ee2b52..af406f7cb 100644
--- a/README.md
+++ b/README.md
@@ -41,99 +41,111 @@ General documentation surrounding workers development and using `wrangler` can b
 
 - ### 👯 `generate`
 
-    Scaffold a project, including boilerplate for a Rust library and a Cloudflare Worker.
-    You can pass a name and template to this command optionally.
+  Scaffold a project, including boilerplate for a Rust library and a Cloudflare Worker.
+  You can pass a name and template to this command optionally.
 
-    ```bash
-    wrangler generate <name> <template> --type=["webpack", "javascript", "rust"]
-    ```
+  ```bash
+  wrangler generate <name> <template> --type=["webpack", "javascript", "rust"]
+  ```
 
-    All of the arguments and flags to this command are optional:
-        - `name`: defaults to `worker`
-        - `template`: defaults to the [`https://github.com/cloudflare/worker-template`](https://github.com/cloudflare/worker-template)
-        - `type`: defaults to "webpack"
+  All of the arguments and flags to this command are optional: - `name`: defaults to `worker` - `template`: defaults to the [`https://github.com/cloudflare/worker-template`](https://github.com/cloudflare/worker-template) - `type`: defaults to "webpack"
 
 - ### 🦀⚙️ `build`
 
-    Build your project. This command looks at your `wrangler.toml` file and runs the build steps associated
-    with the `"type"` declared there.
+  Build your project. This command looks at your `wrangler.toml` file and runs the build steps associated
+  with the `"type"` declared there.
+
+  Additionally, you can build different environments. This is useful if you have different builds for different environments, but typically isn't needed. For more information see the [environments documentation](https://github.com/cloudflare/wrangler/blob/master/docs/environments.md).
 
 - ### 🔧 `config`
 
-    Configure your global Cloudflare user. This is an interactive command that will prompt you for your email and API key:
+  Configure your global Cloudflare user. This is an interactive command that will prompt you for your email and API key:
 
-    ```bash
-    wrangler config
-    Enter email:
-    testuser@example.com
-    Enter api key:
-    ...
-    ```
+  ```bash
+  wrangler config
+  Enter email:
+  testuser@example.com
+  Enter api key:
+  ...
+  ```
 
-    You can also [use environment variables](#using-environment-variables) to configure these values.
+  You can also [use environment variables](#using-environment-variables) to configure these values.
 
 - ### ☁️ 🆙 `publish`
 
-    Publish your Worker to Cloudflare. This uses several keys in your `wrangler.toml` depending on whether
-    you are publishing to a workers.dev subdomain or your own domain, registered with Cloudflare.
+  Publish your Worker to Cloudflare. This uses several keys in your `wrangler.toml` depending on whether
+  you are publishing to a workers.dev subdomain or your own domain, registered with Cloudflare.
 
-    ```bash
-    wrangler publish
-    ```
+  ```bash
+  wrangler publish
+  ```
 
-    To use this command, you'll need to have the following keys in your `wrangler.toml`:
+  To use this command, you'll need to have the following information in your `wrangler.toml` no matter where you want to publish your worker
 
-    - `name`
-    - `type`
-    - `account_id`
+  | Key        | Value                                                                     | Example                                           |
+  | ---------- | ------------------------------------------------------------------------- | ------------------------------------------------- |
+  | name       | the name of your worker                                                   | `name = "your-worker"`                            |
+  | type       | build type (webpack, rust, or javascript)                                 | `type = "webpack"`                                |
+  | account_id | your Cloudflare account ID, this can be found in the Cloudflare dashboard | `account_id = "a655bacaf2b4cad0e2b51c5236a6b974"` |
 
-    You'll also need to have a workers.dev subdomain registered. You can register a subdomain by using:
+  From here, you have two options, you can choose to publish to your own domain or you can choose to publish to [\<your-worker\>.\<your-subdomain\>.workers.dev](https://workers.dev).
 
-    ```bash
-    wrangler subdomain <name>
-    ```
+  If you want to publish to [workers.dev](https://workers.dev), add this to your `wrangler.toml`.
+
+  First you will need to have a [workers.dev](https://workers.dev) subdomain registered. You can register a subdomain by executing:
 
-    A `--release` can be optionally passed to publish your worker to a domain you have registered with
-    Cloudflare. To use `--release` your `wrangler.toml` must include:
+  ```bash
+  wrangler subdomain <name>
+  ```
 
-    - `name`
-    - `type`
-    - `account_id`
-    - `zone_id`
-    - `route`
+  | Key             | Value | Example                  |
+  | --------------- | ----- | ------------------------ |
+  | workers_dot_dev | true  | `workers_dot_dev = true` |
+
+  If you would like to publish to your own domain, add this to your `wrangler.toml`
+
+  | Key             | Value                                                                  | Example                                        |
+  | --------------- | ---------------------------------------------------------------------- | ---------------------------------------------- |
+  | workers_dot_dev | false                                                                  | `workers_dot_dev = false`                      |
+  | route           | The route you would like to publish to                                 | `route = "example.com/my-worker/*"`            |
+  | zone_id         | Your Cloudflare zone ID, this can be found in the Cloudflare dashboard | `zone_id = "b6558acaf2b4cad1f2b51c5236a6b972"` |
+
+  If you would like to be able to publish your code to multiple places, please see the documentation for [environments](https://github.com/cloudflare/wrangler/blob/master/docs/environments.md).
 
 - ### 🔬 `preview`
 
-    Preview your project using the [Cloudflare Workers preview service](https://cloudflareworkers.com/).
+  Preview your project using the [Cloudflare Workers preview service](https://cloudflareworkers.com/).
 
-    By default, `wrangler preview` will only bundle your project a single time. To enable live preview,
-    where Wrangler will continually update the preview service with the newest version of your project,
-    pass the `--watch` flag:
+  By default, `wrangler preview` will only bundle your project a single time. To enable live preview,
+  where Wrangler will continually update the preview service with the newest version of your project,
+  pass the `--watch` flag:
 
-    ```bash
-    wrangler preview --watch
-    ```
+  ```bash
+  wrangler preview --watch
+  ```
 
-    You can optionally pass `get` or `post` and a `body` to this command. This will send a request to your
-    worker on the preview service and return the response in your terminal. For example:
+  You can optionally pass `get` or `post` and a `body` to this command. This will send a request to your
+  worker on the preview service and return the response in your terminal. For example:
 
-    GET requests can be sent with 
+  GET requests can be sent with
 
-    ```bash
-    wrangler preview
-    ```
+  ```bash
+  wrangler preview
+  ```
 
-    or
+  or
 
-    ```bash
-    wrangler preview get
-    ```
+  ```bash
+  wrangler preview get
+  ```
 
-    POST requests can be sent with
+  POST requests can be sent with
 
-    ```bash
-    wrangler preview post hello=hello
-    ```
+  ```bash
+  wrangler preview post hello=hello
+  ```
+
+  Additionally, you can preview different environments. This is useful if you have different builds for different environments, but typically isn't needed. For more information see the [environments documentation](https://github.com/cloudflare/wrangler/blob/master/docs/environments.md).
 
 ## 🔩 Configuration
 
@@ -141,72 +153,71 @@ There are two types of configuration that `wrangler` uses: global user and per p
 
 - ### Global User
 
-    In Cloudflare's system, you have a User that can have multiple Accounts and Zones. As a result, your User
-    is configured globally on your machine. Your Account(s) and Zone(s) will be configured per project, but
-    will use your User credentials to authenticate all API calls. This config file is created in a `.wrangler`
-    directory in your computer's home directory.
+  In Cloudflare's system, you have a User that can have multiple Accounts and Zones. As a result, your User
+  is configured globally on your machine. Your Account(s) and Zone(s) will be configured per project, but
+  will use your User credentials to authenticate all API calls. This config file is created in a `.wrangler`
+  directory in your computer's home directory.
 
-    To set up `wrangler` to work with your Cloudflare user, use the following commands:
+  To set up `wrangler` to work with your Cloudflare user, use the following commands:
 
-    - 🔧 `config`: a command that prompts you to enter your `email` and `api` key.
-    - 🕵️‍♀️ `whoami`: run this command to confirm that your configuration is appropriately set up.
-       When successful, this command will print out your user information, including the type of plan you
-       are currently on.
+  - 🔧 `config`: a command that prompts you to enter your `email` and `api` key.
+  - 🕵️‍♀️ `whoami`: run this command to confirm that your configuration is appropriately set up.
+    When successful, this command will print out your user information, including the type of plan you
+    are currently on.
 
 - #### Using environment variables
 
-    You can also configure your global user with environment variables. This is the preferred method for using Wrangler in CI:
+  You can also configure your global user with environment variables. This is the preferred method for using Wrangler in CI:
 
-    ```bash
-    # e.g.
-    CF_API_KEY=superlongapikey CF_EMAIL=testuser@example.com wrangler publish --release
-    # where
-    # $CF_API_KEY -> your Cloudflare API key
-    # $CF_EMAIL -> your Cloudflare account email
-    ```
+  ```bash
+  # e.g.
+  CF_API_KEY=superlongapikey CF_EMAIL=testuser@example.com wrangler publish --release
+  # where
+  # $CF_API_KEY -> your Cloudflare API key
+  # $CF_EMAIL -> your Cloudflare account email
+  ```
 
 - ### Per Project
 
-    Your project will need to have several things configured before you can publish your worker. These values
-    are stored in a `wrangler.toml` file that `wrangler generate` will make for you. You will need to manually
-    edit this file to add these values before you can publish.
-
-    - `name`: This is the name of your project. It will be the name of your script.
-    - `type`: This key tells `wrangler build` how to build your project. There are currently 3 options, but we
-        expect there to be more as the community grows.
-        - `javascript`: This project contains a single JavaScript file, defined in `package.json`'s `main` key.
-        - `rust`: This project contains a Rust crate that uses `wasm-bindgen`. It will be built with `wasm-pack`.
-        - `webpack`: This project contains any number of JavaScript files or Rust/C/C++ files that compile to
-            WebAssembly. Rust files will be built with `wasm-pack`.
-            This project type uses webpack and webpack plugins in the background to build your worker.
-    - `zone_id`: This is the ID of the "zone" or domain you want to run your script on. This is optional if you
-        are using a workers.dev subdomain and is only required when `workers_dot_dev` is false, or excluded from an [environment](https://github.com/cloudflare/wrangler/blob/master/docs/environments.md).
-    - `account_id`: This is the ID of the account associated with your zone. You might have more than one account,
-        so make sure to use the ID of the account associated with the `zone_id` you provide, if you provide one.
-    - `route`: This is the route you'd like to use your worker on. You need to include the hostname. Examples:
-        - `*example.com/*`
-        - `http://example.com/hello`
-        
-        This key is optional if you are using a workers.dev subdomain and is only required when `workers_dot_dev` is false, or excluded from an [environment](https://github.com/cloudflare/wrangler/blob/master/docs/environments.md). 
-    - `webpack_config`: This is the path to the webpack configuration file for your worker. This is optional and
-        defaults to `webpack.config.js`
-    - `workers_dot_dev`: This is an optional (but recommended due to impending deprecation of the `--release` flag boolean that specifies whether your worker should be deployed to `<your-project>.<your-subdomain>.workers.dev`. For more information, please read the [environments documentation](https://github.com/cloudflare/wrangler/blob/master/docs/environments.md).
-    - `[[kv-namespaces]]`: These specify any [Workers KV](https://workers.cloudflare.com/docs/reference/storage/) namespaces you want to access from
-        inside your Worker. Each namespace you include should have an entry in your wrangler.toml that includes:
-
-        - `binding`: the name you want to bind to in your script
-        - `id`: the namespace_id assigned to your kv namespace upon creation.
-            e.g. (per namespace):
-
-        ```toml
-        [[kv-namespaces]]
-        binding = "FOO"
-        id = "0f2ac74b498b48028cb68387c421e279"
-        ```
-
-        Note: Creating your KV Namespaces should be handled either via the [api](https://workers.cloudflare.com/docs/reference/storage/writing-data/) or via your Cloudflare dashboard.
-
-    Additionally, you can configure Wrangler to publish to multiple environments. This means that your same codebase can be deployed to multiple places on your [workers.dev](https://workers.dev) subdomain, across multiple accounts, zones, and routes. Read more [here](/docs/environments.md).
+  Your project will need to have several things configured before you can publish your worker. These values
+  are stored in a `wrangler.toml` file that `wrangler generate` will make for you. You will need to manually
+  edit this file to add these values before you can publish.
+
+  - `name`: This is the name of your project. It will be the name of your script.
+  - `type`: This key tells `wrangler build` how to build your project. There are currently 3 options, but we
+    expect there to be more as the community grows.
+    - `javascript`: This project contains a single JavaScript file, defined in `package.json`'s `main` key.
+    - `rust`: This project contains a Rust crate that uses `wasm-bindgen`. It will be built with `wasm-pack`.
+    - `webpack`: This project contains any number of JavaScript files or Rust/C/C++ files that compile to
+      WebAssembly. Rust files will be built with `wasm-pack`.
+      This project type uses webpack and webpack plugins in the background to build your worker.
+  - `zone_id`: This is the ID of the "zone" or domain you want to run your script on. This is optional if you
+    are using a workers.dev subdomain and is only required when `workers_dot_dev` is false, or excluded from an [environment](https://github.com/cloudflare/wrangler/blob/master/docs/environments.md).
+  - `account_id`: This is the ID of the account associated with your zone. You might have more than one account,
+    so make sure to use the ID of the account associated with the `zone_id` you provide, if you provide one.
+  - `route`: This is the route you'd like to use your worker on. You need to include the hostname. Examples:
+    - `*example.com/*`
+    - `http://example.com/hello`
+    This key is optional if you are using a workers.dev subdomain and is only required when `workers_dot_dev` is false, or excluded from an [environment](https://github.com/cloudflare/wrangler/blob/master/docs/environments.md).
+  - `webpack_config`: This is the path to the webpack configuration file for your worker. This is optional and
+    defaults to `webpack.config.js`
+  - `workers_dot_dev`: This is an optional (but recommended due to impending deprecation of the `--release` flag boolean that specifies whether your worker should be deployed to `<your-project>.<your-subdomain>.workers.dev`. For more information, please read the [environments documentation](https://github.com/cloudflare/wrangler/blob/master/docs/environments.md).
+  - `[[kv-namespaces]]`: These specify any [Workers KV](https://workers.cloudflare.com/docs/reference/storage/) namespaces you want to access from
+    inside your Worker. Each namespace you include should have an entry in your wrangler.toml that includes:
+
+    - `binding`: the name you want to bind to in your script
+    - `id`: the namespace_id assigned to your kv namespace upon creation.
+      e.g. (per namespace):
+
+    ```toml
+    [[kv-namespaces]]
+    binding = "FOO"
+    id = "0f2ac74b498b48028cb68387c421e279"
+    ```
+
+    Note: Creating your KV Namespaces should be handled either via the [api](https://workers.cloudflare.com/docs/reference/storage/writing-data/) or via your Cloudflare dashboard.
+
+  Additionally, you can configure Wrangler to publish to multiple environments. This means that your same codebase can be deployed to multiple places on your [workers.dev](https://workers.dev) subdomain, across multiple accounts, zones, and routes. Read more [here](/docs/environments.md).
 
 ## Additional Installation Instructions
 
@@ -216,37 +227,37 @@ Wrangler can be installed both through [npm](https://www.npmjs.com/get-npm) and
 
 1. If you don't already have npm on your machine, install it using [npm's recommended method](https://www.npmjs.com/get-npm), a node.js version manager.
 
-    If you have already installed npm with a package manager, it is possible you will run into an `EACCES` error while installing wrangler. This is related to how many system packagers install npm. You can either uninstall npm and reinstall using the npm recommended install method (a version manager), or use one of our other install methods.
+   If you have already installed npm with a package manager, it is possible you will run into an `EACCES` error while installing wrangler. This is related to how many system packagers install npm. You can either uninstall npm and reinstall using the npm recommended install method (a version manager), or use one of our other install methods.
 
 2. Install Wrangler by running:
 
-    ```bash
-    npm i @cloudflare/wrangler -g
-    ```
+   ```bash
+   npm i @cloudflare/wrangler -g
+   ```
 
 ### Using `cargo`
 
 1. Install `cargo`:
 
-    Rustup, a tool for installing Rust, will also install Cargo. On Linux and macOS systems, `rustup` can be installed as follows:
+   Rustup, a tool for installing Rust, will also install Cargo. On Linux and macOS systems, `rustup` can be installed as follows:
 
-    ```bash
-    curl https://sh.rustup.rs -sSf | sh
-    ```
+   ```bash
+   curl https://sh.rustup.rs -sSf | sh
+   ```
 
-    Additional installation methods are available [here](https://forge.rust-lang.org/other-installation-methods.html).
+   Additional installation methods are available [here](https://forge.rust-lang.org/other-installation-methods.html).
 
 2. Install `wrangler`:
 
-    ```bash
-    cargo install wrangler
-    ```
+   ```bash
+   cargo install wrangler
+   ```
 
-    Installing wrangler on linux requires some [OpenSSL-related packages](https://docs.rs/openssl/0.10.24/openssl/#automatic) to be installed. If you don't want to deal with this, you can use vendored OpenSSL.
+   Installing wrangler on linux requires some [OpenSSL-related packages](https://docs.rs/openssl/0.10.24/openssl/#automatic) to be installed. If you don't want to deal with this, you can use vendored OpenSSL.
 
-    ```bash
-    cargo install wrangler --features vendored-openssl
-    ```
+   ```bash
+   cargo install wrangler --features vendored-openssl
+   ```
 
 ### Manual Install
 

From e81e1220869cccaa78c132a3e03aad13738ba46e Mon Sep 17 00:00:00 2001
From: Avery Harnish <averyharnish@gmail.com>
Date: Tue, 10 Sep 2019 15:52:26 -0500
Subject: [PATCH 03/18] md formatting newline

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

diff --git a/README.md b/README.md
index af406f7cb..a8073f679 100644
--- a/README.md
+++ b/README.md
@@ -196,9 +196,12 @@ There are two types of configuration that `wrangler` uses: global user and per p
   - `account_id`: This is the ID of the account associated with your zone. You might have more than one account,
     so make sure to use the ID of the account associated with the `zone_id` you provide, if you provide one.
   - `route`: This is the route you'd like to use your worker on. You need to include the hostname. Examples:
+
     - `*example.com/*`
     - `http://example.com/hello`
+
     This key is optional if you are using a workers.dev subdomain and is only required when `workers_dot_dev` is false, or excluded from an [environment](https://github.com/cloudflare/wrangler/blob/master/docs/environments.md).
+
   - `webpack_config`: This is the path to the webpack configuration file for your worker. This is optional and
     defaults to `webpack.config.js`
   - `workers_dot_dev`: This is an optional (but recommended due to impending deprecation of the `--release` flag boolean that specifies whether your worker should be deployed to `<your-project>.<your-subdomain>.workers.dev`. For more information, please read the [environments documentation](https://github.com/cloudflare/wrangler/blob/master/docs/environments.md).

From c36493e3b072c74fc0482aaf13dcc077630fb5b9 Mon Sep 17 00:00:00 2001
From: Avery Harnish <averyharnish@gmail.com>
Date: Tue, 10 Sep 2019 15:58:12 -0500
Subject: [PATCH 04/18] Fix ordering of subdomain registration steps

---
 README.md | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index a8073f679..83b4b6bed 100644
--- a/README.md
+++ b/README.md
@@ -90,27 +90,27 @@ General documentation surrounding workers development and using `wrangler` can b
 
   From here, you have two options, you can choose to publish to your own domain or you can choose to publish to [\<your-worker\>.\<your-subdomain\>.workers.dev](https://workers.dev).
 
-  If you want to publish to [workers.dev](https://workers.dev), add this to your `wrangler.toml`.
-
-  First you will need to have a [workers.dev](https://workers.dev) subdomain registered. You can register a subdomain by executing:
+  If you want to publish to [workers.dev](https://workers.dev), you will first need to have a [workers.dev](https://workers.dev) subdomain registered. You can register a subdomain by executing:
 
   ```bash
   wrangler subdomain <name>
   ```
 
-  | Key             | Value | Example                  |
-  | --------------- | ----- | ------------------------ |
-  | workers_dot_dev | true  | `workers_dot_dev = true` |
+  After you have registered a subdomain, add `workers_dot_dev` to your `wrangler.toml`.
+
+| Key             | Value | Example                  |
+| --------------- | ----- | ------------------------ |
+| workers_dot_dev | true  | `workers_dot_dev = true` |
 
-  If you would like to publish to your own domain, add this to your `wrangler.toml`
+If you would like to publish to your own domain, add this to your `wrangler.toml`
 
-  | Key             | Value                                                                  | Example                                        |
-  | --------------- | ---------------------------------------------------------------------- | ---------------------------------------------- |
-  | workers_dot_dev | false                                                                  | `workers_dot_dev = false`                      |
-  | route           | The route you would like to publish to                                 | `route = "example.com/my-worker/*"`            |
-  | zone_id         | Your Cloudflare zone ID, this can be found in the Cloudflare dashboard | `zone_id = "b6558acaf2b4cad1f2b51c5236a6b972"` |
+| Key             | Value                                                                  | Example                                        |
+| --------------- | ---------------------------------------------------------------------- | ---------------------------------------------- |
+| workers_dot_dev | false                                                                  | `workers_dot_dev = false`                      |
+| route           | The route you would like to publish to                                 | `route = "example.com/my-worker/*"`            |
+| zone_id         | Your Cloudflare zone ID, this can be found in the Cloudflare dashboard | `zone_id = "b6558acaf2b4cad1f2b51c5236a6b972"` |
 
-  If you would like to be able to publish your code to multiple places, please see the documentation for [environments](https://github.com/cloudflare/wrangler/blob/master/docs/environments.md).
+If you would like to be able to publish your code to multiple places, please see the documentation for [environments](https://github.com/cloudflare/wrangler/blob/master/docs/environments.md).
 
 - ### 🔬 `preview`
 

From ced3387d5484f231da10e7805cfb3d053678a7b9 Mon Sep 17 00:00:00 2001
From: Avery Harnish <averyharnish@gmail.com>
Date: Tue, 10 Sep 2019 16:33:05 -0500
Subject: [PATCH 05/18] Break up publish targets into separate subheadings

---
 README.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 83b4b6bed..a37b7191d 100644
--- a/README.md
+++ b/README.md
@@ -90,6 +90,8 @@ General documentation surrounding workers development and using `wrangler` can b
 
   From here, you have two options, you can choose to publish to your own domain or you can choose to publish to [\<your-worker\>.\<your-subdomain\>.workers.dev](https://workers.dev).
 
+  #### Publishing to workers.dev
+
   If you want to publish to [workers.dev](https://workers.dev), you will first need to have a [workers.dev](https://workers.dev) subdomain registered. You can register a subdomain by executing:
 
   ```bash
@@ -102,7 +104,9 @@ General documentation surrounding workers development and using `wrangler` can b
 | --------------- | ----- | ------------------------ |
 | workers_dot_dev | true  | `workers_dot_dev = true` |
 
-If you would like to publish to your own domain, add this to your `wrangler.toml`
+#### Publishing to your own domain
+
+If you would like to publish to your own domain, you will need to specify these three fields in your `wrangler.toml`.
 
 | Key             | Value                                                                  | Example                                        |
 | --------------- | ---------------------------------------------------------------------- | ---------------------------------------------- |
@@ -110,6 +114,8 @@ If you would like to publish to your own domain, add this to your `wrangler.toml
 | route           | The route you would like to publish to                                 | `route = "example.com/my-worker/*"`            |
 | zone_id         | Your Cloudflare zone ID, this can be found in the Cloudflare dashboard | `zone_id = "b6558acaf2b4cad1f2b51c5236a6b972"` |
 
+#### Publishing the same code to multiple places
+
 If you would like to be able to publish your code to multiple places, please see the documentation for [environments](https://github.com/cloudflare/wrangler/blob/master/docs/environments.md).
 
 - ### 🔬 `preview`

From 33dbedf227b99df6198137fda7ad4407202b7a14 Mon Sep 17 00:00:00 2001
From: Avery Harnish <averyharnish@gmail.com>
Date: Tue, 10 Sep 2019 16:35:57 -0500
Subject: [PATCH 06/18] Update prose based on Victoria's comments

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index a37b7191d..66c8a3d50 100644
--- a/README.md
+++ b/README.md
@@ -73,14 +73,14 @@ General documentation surrounding workers development and using `wrangler` can b
 
 - ### ☁️ 🆙 `publish`
 
-  Publish your Worker to Cloudflare. This uses several keys in your `wrangler.toml` depending on whether
-  you are publishing to a workers.dev subdomain or your own domain, registered with Cloudflare.
+  Publish your Worker to Cloudflare. Several keys in your `wrangler.toml` determine whether
+  you are publishing to a workers.dev subdomain or your own registered domain - proxied with Cloudflare.
 
   ```bash
   wrangler publish
   ```
 
-  To use this command, you'll need to have the following information in your `wrangler.toml` no matter where you want to publish your worker
+  To use this command, the following fields are required in your `wrangler.toml`.
 
   | Key        | Value                                                                     | Example                                           |
   | ---------- | ------------------------------------------------------------------------- | ------------------------------------------------- |

From d8e645e6fc27e388eed33055906f5b9d4c300597 Mon Sep 17 00:00:00 2001
From: Avery Harnish <averyharnish@gmail.com>
Date: Tue, 10 Sep 2019 16:41:59 -0500
Subject: [PATCH 07/18] Add period to end of install sentence

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2c8917f35..a42a0a76c 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ npm i @cloudflare/wrangler -g
 cargo install wrangler
 ```
 
-If you don't have `cargo` or `npm` installed, you will need to follow these [additional instructions](#additional-installation-instructions)
+If you don't have `cargo` or `npm` installed, you will need to follow these [additional instructions](#additional-installation-instructions).
 
 ## Updating
 

From a96f58c553249a418cdd654a0157adfa8a4302ff Mon Sep 17 00:00:00 2001
From: Avery Harnish <averyharnish@gmail.com>
Date: Wed, 11 Sep 2019 13:49:29 -0500
Subject: [PATCH 08/18] Add namespaces to environments documentation

---
 docs/environments.md | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/docs/environments.md b/docs/environments.md
index 22cea19b1..3c929c073 100644
--- a/docs/environments.md
+++ b/docs/environments.md
@@ -218,6 +218,47 @@ name = "my-worker-staging"
 
 Your default `wrangler build`, `wrangler preview`, and `wrangler publish` commands will all build with `webpack.dev.js`, as will `wrangler build -e staging`, `wrangler preview -e staging`, and `wrangler publish -e staging`. `wrangler build -e production`, `wrangler preview -e production`, and `wrangler publish -e production` would all use your `webpack.config.js` file.
 
+### KV Namespaces with environments
+
+You can specify different kv namespaces for different environments. There are two options for this configuration
+
+#### Option 1 (recommended)
+
+```toml
+name = "my-worker"
+type = "webpack"
+account_id = "12345678901234567890"
+workers_dot_dev = true
+kv-namespaces = [
+    { binding = "KV", id = "06779da6940b431db6e566b4846d64db" }
+]
+
+[env.production]
+kv-namespaces = [
+    { binding = "KV", id = "bd46d6484b665e6bd134b0496ad97760" }
+]
+```
+
+#### Option 2
+
+```toml
+name = "my-worker"
+type = "webpack"
+account_id = "12345678901234567890"
+workers_dot_dev = true
+
+[[kv_namespaces]]
+binding = "KV"
+id = "06779da6940b431db6e566b4846d64db"
+
+[env.production]
+name = "my-worker"
+
+[[env.production.kv_namespaces]]
+binding = "KV"
+id = "bd46d6484b665e6bd134b0496ad97760"
+```
+
 ## Invalid configurations
 
 ### Multiple types

From 9a30d0110097e60da54a09f12bb027d0faaf3842 Mon Sep 17 00:00:00 2001
From: Avery Harnish <averyharnish@gmail.com>
Date: Wed, 11 Sep 2019 14:02:53 -0500
Subject: [PATCH 09/18] Fix indentation and clarify environments wording

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index befb87f17..dd4fde73a 100644
--- a/README.md
+++ b/README.md
@@ -88,7 +88,7 @@ General documentation surrounding workers development and using `wrangler` can b
 
   From here, you have two options, you can choose to publish to your own domain or you can choose to publish to [\<your-worker\>.\<your-subdomain\>.workers.dev](https://workers.dev).
 
-  #### Publishing to workers.dev
+#### Publishing to workers.dev
 
   If you want to publish to [workers.dev](https://workers.dev), you will first need to have a [workers.dev](https://workers.dev) subdomain registered. You can register a subdomain by executing:
 
@@ -149,7 +149,7 @@ If you would like to be able to publish your code to multiple places, please see
   wrangler preview post hello=hello
   ```
 
-  Additionally, you can preview different environments. This is useful if you have different builds for different environments, but typically isn't needed. For more information see the [environments documentation](https://github.com/cloudflare/wrangler/blob/master/docs/environments.md).
+  Additionally, you can preview different environments. This is useful if you have different builds for different environments (like staging vs. production), but typically isn't needed. For more information see the [environments documentation](https://github.com/cloudflare/wrangler/blob/master/docs/environments.md).
 
 ## 🔩 Configuration
 
@@ -196,7 +196,7 @@ There are two types of configuration that `wrangler` uses: global user and per p
       WebAssembly. Rust files will be built with `wasm-pack`.
       This project type uses webpack and webpack plugins in the background to build your worker.
   - `zone_id`: This is the ID of the "zone" or domain you want to run your script on. This is optional if you
-    are using a workers.dev subdomain and is only required when `workers_dot_dev` is false, or excluded from an [environment](https://github.com/cloudflare/wrangler/blob/master/docs/environments.md).
+    are using a workers.dev subdomain and is only required when `workers_dot_dev` is false, or left out of any given [environment](https://github.com/cloudflare/wrangler/blob/master/docs/environments.md) configuration.
   - `account_id`: This is the ID of the account associated with your zone. You might have more than one account,
     so make sure to use the ID of the account associated with the `zone_id` you provide, if you provide one.
   - `route`: This is the route you'd like to use your worker on. You need to include the hostname. Examples:

From 3142b9710f8d94ab65556f90905e5056a8d56b3c Mon Sep 17 00:00:00 2001
From: Avery Harnish <averyharnish@gmail.com>
Date: Wed, 11 Sep 2019 14:54:07 -0500
Subject: [PATCH 10/18] Update kv namespaces configuration documentation

---
 README.md | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 8a047ce8a..a880f1a49 100644
--- a/README.md
+++ b/README.md
@@ -189,17 +189,34 @@ There are two types of configuration that `wrangler` uses: global user and per p
     - `webpack_config`: This is the path to the webpack configuration file for your worker. This is optional and
         defaults to `webpack.config.js`
     - `workers_dot_dev`: This is an optional (but recommended due to impending deprecation of the `--release` flag boolean that specifies whether your worker should be deployed to `<your-project>.<your-subdomain>.workers.dev`. For more information, please read the [environments documentation](https://github.com/cloudflare/wrangler/blob/master/docs/environments.md).
-    - `[[kv-namespaces]]`: These specify any [Workers KV](https://workers.cloudflare.com/docs/reference/storage/) namespaces you want to access from
+    - `kv-namespaces`: These specify any [Workers KV](https://workers.cloudflare.com/docs/reference/storage/) namespaces you want to access from
         inside your Worker. Each namespace you include should have an entry in your wrangler.toml that includes:
 
         - `binding`: the name you want to bind to in your script
         - `id`: the namespace_id assigned to your kv namespace upon creation.
-            e.g. (per namespace):
+            e.g. (per namespace).
+
+        There are two ways to define kv namespaces:
+
+        **Option 1 (recommended)**
+
+        ```toml
+        kv-namespaces = [
+            { binding = "FOO", id = "0f2ac74b498b48028cb68387c421e279" },
+            { binding = "BAR", id = "068c101e168d03c65bddf4ba75150fb0" }
+        ]
+        ```
+
+        **Option 2**
 
         ```toml
         [[kv-namespaces]]
         binding = "FOO"
         id = "0f2ac74b498b48028cb68387c421e279"
+
+        [[kv-namespaces]]
+        binding = "BAR"
+        id = "068c101e168d03c65bddf4ba75150fb0"
         ```
 
         Note: Creating your KV Namespaces should be handled either via the [api](https://workers.cloudflare.com/docs/reference/storage/writing-data/) or via your Cloudflare dashboard.

From c77b9507a85db6084b6306a6f439988a4f104a25 Mon Sep 17 00:00:00 2001
From: Avery Harnish <averyharnish@gmail.com>
Date: Wed, 11 Sep 2019 14:58:39 -0500
Subject: [PATCH 11/18] Add environment heading

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index dd4fde73a..9a7f89bd0 100644
--- a/README.md
+++ b/README.md
@@ -224,7 +224,9 @@ There are two types of configuration that `wrangler` uses: global user and per p
 
     Note: Creating your KV Namespaces should be handled either via the [api](https://workers.cloudflare.com/docs/reference/storage/writing-data/) or via your Cloudflare dashboard.
 
-  Additionally, you can configure Wrangler to publish to multiple environments. This means that your same codebase can be deployed to multiple places on your [workers.dev](https://workers.dev) subdomain, across multiple accounts, zones, and routes. Read more [here](/docs/environments.md).
+    #### Environments
+
+    Additionally, you can configure Wrangler to publish to multiple environments. This means that your same codebase can be deployed to multiple places on your [workers.dev](https://workers.dev) subdomain, across multiple accounts, zones, and routes. Read more [here](/docs/environments.md).
 
 ## Additional Installation Instructions
 

From 6d5f11d3433970bce3091a134748c04d81adc440 Mon Sep 17 00:00:00 2001
From: Avery Harnish <averyharnish@gmail.com>
Date: Wed, 11 Sep 2019 15:05:01 -0500
Subject: [PATCH 12/18] standardize to KV Namespace

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index a880f1a49..a658c4531 100644
--- a/README.md
+++ b/README.md
@@ -193,10 +193,10 @@ There are two types of configuration that `wrangler` uses: global user and per p
         inside your Worker. Each namespace you include should have an entry in your wrangler.toml that includes:
 
         - `binding`: the name you want to bind to in your script
-        - `id`: the namespace_id assigned to your kv namespace upon creation.
+        - `id`: the namespace_id assigned to your KV Namespace upon creation.
             e.g. (per namespace).
 
-        There are two ways to define kv namespaces:
+        There are two ways to define KV Namespaces:
 
         **Option 1 (recommended)**
 

From 9d2d0abbd4b23087ddb805d5ff535045c3f7cb67 Mon Sep 17 00:00:00 2001
From: Avery Harnish <averyharnish@gmail.com>
Date: Wed, 11 Sep 2019 15:08:36 -0500
Subject: [PATCH 13/18] Remove option 2 from kv namespace config docs

---
 README.md | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/README.md b/README.md
index a658c4531..17a093564 100644
--- a/README.md
+++ b/README.md
@@ -194,11 +194,7 @@ There are two types of configuration that `wrangler` uses: global user and per p
 
         - `binding`: the name you want to bind to in your script
         - `id`: the namespace_id assigned to your KV Namespace upon creation.
-            e.g. (per namespace).
-
-        There are two ways to define KV Namespaces:
-
-        **Option 1 (recommended)**
+            e.g. (per namespace)
 
         ```toml
         kv-namespaces = [
@@ -207,18 +203,6 @@ There are two types of configuration that `wrangler` uses: global user and per p
         ]
         ```
 
-        **Option 2**
-
-        ```toml
-        [[kv-namespaces]]
-        binding = "FOO"
-        id = "0f2ac74b498b48028cb68387c421e279"
-
-        [[kv-namespaces]]
-        binding = "BAR"
-        id = "068c101e168d03c65bddf4ba75150fb0"
-        ```
-
         Note: Creating your KV Namespaces should be handled either via the [api](https://workers.cloudflare.com/docs/reference/storage/writing-data/) or via your Cloudflare dashboard.
 
     Additionally, you can configure Wrangler to publish to multiple environments. This means that your same codebase can be deployed to multiple places on your [workers.dev](https://workers.dev) subdomain, across multiple accounts, zones, and routes. Read more [here](/docs/environments.md).

From a9d91c3df106d5ed099d9ac53a3acceb2084fd8f Mon Sep 17 00:00:00 2001
From: Avery Harnish <averyharnish@gmail.com>
Date: Wed, 11 Sep 2019 15:09:10 -0500
Subject: [PATCH 14/18] Remove option 2 from env kv namespace config docs

---
 docs/environments.md | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

diff --git a/docs/environments.md b/docs/environments.md
index 3c929c073..fbba71e0b 100644
--- a/docs/environments.md
+++ b/docs/environments.md
@@ -220,9 +220,7 @@ Your default `wrangler build`, `wrangler preview`, and `wrangler publish` comman
 
 ### KV Namespaces with environments
 
-You can specify different kv namespaces for different environments. There are two options for this configuration
-
-#### Option 1 (recommended)
+You can specify different kv namespaces for different environments.
 
 ```toml
 name = "my-worker"
@@ -239,26 +237,6 @@ kv-namespaces = [
 ]
 ```
 
-#### Option 2
-
-```toml
-name = "my-worker"
-type = "webpack"
-account_id = "12345678901234567890"
-workers_dot_dev = true
-
-[[kv_namespaces]]
-binding = "KV"
-id = "06779da6940b431db6e566b4846d64db"
-
-[env.production]
-name = "my-worker"
-
-[[env.production.kv_namespaces]]
-binding = "KV"
-id = "bd46d6484b665e6bd134b0496ad97760"
-```
-
 ## Invalid configurations
 
 ### Multiple types

From 758d43234417c4de5146a2228bb941113e6f2a14 Mon Sep 17 00:00:00 2001
From: Ashley Michal <ashleymichal@gmail.com>
Date: Wed, 11 Sep 2019 15:17:54 -0500
Subject: [PATCH 15/18] give `e.g.` newline

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

diff --git a/README.md b/README.md
index 17a093564..13c6b0d64 100644
--- a/README.md
+++ b/README.md
@@ -194,6 +194,7 @@ There are two types of configuration that `wrangler` uses: global user and per p
 
         - `binding`: the name you want to bind to in your script
         - `id`: the namespace_id assigned to your KV Namespace upon creation.
+
             e.g. (per namespace)
 
         ```toml

From 5175f880d9e3aea76a9891a3da39018f88432a17 Mon Sep 17 00:00:00 2001
From: Avery Harnish <averyharnish@gmail.com>
Date: Wed, 11 Sep 2019 15:29:16 -0500
Subject: [PATCH 16/18] Remove e.g. and replace w for example

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 17a093564..4a1607af8 100644
--- a/README.md
+++ b/README.md
@@ -194,7 +194,9 @@ There are two types of configuration that `wrangler` uses: global user and per p
 
         - `binding`: the name you want to bind to in your script
         - `id`: the namespace_id assigned to your KV Namespace upon creation.
-            e.g. (per namespace)
+
+
+        For example:
 
         ```toml
         kv-namespaces = [

From 9f8422be03ce21722e744e9387ddeb4beb5bdeef Mon Sep 17 00:00:00 2001
From: Avery Harnish <averyharnish@gmail.com>
Date: Wed, 11 Sep 2019 16:53:40 -0500
Subject: [PATCH 17/18] Gabbis comments

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

diff --git a/README.md b/README.md
index 781a9d350..04212033c 100644
--- a/README.md
+++ b/README.md
@@ -71,8 +71,7 @@ General documentation surrounding workers development and using `wrangler` can b
 
 - ### ☁️ 🆙 `publish`
 
-  Publish your Worker to Cloudflare. Several keys in your `wrangler.toml` determine whether
-  you are publishing to a workers.dev subdomain or your own registered domain - proxied with Cloudflare.
+  Publish your Worker to Cloudflare. Several keys in your `wrangler.toml` determine whether you are publishing to a workers.dev subdomain or your own registered domain, proxied through Cloudflare.
 
   ```bash
   wrangler publish
@@ -186,7 +185,7 @@ There are two types of configuration that `wrangler` uses: global user and per p
     Your project will need to have several things configured before you can publish your worker. These values are stored in a `wrangler.toml` file that `wrangler generate` will make for you. You will need to manually edit this file to add these values before you can publish.
 
     - `name`: This is the name of your project. It will be the name of your script.
-    - `type`: This key tells `wrangler build` how to build your project. There are currently 3 options, but we expect there to be more as the community grows.
+    - `type`: This key tells `wrangler build` how to build your project. There are currently three options (`webpack`, `javascript`, and `rust`), but we expect there to be more as the community grows.
         - `javascript`: This project contains a single JavaScript file, defined in `package.json`'s `main` key.
         - `rust`: This project contains a Rust crate that uses `wasm-bindgen`. It will be built with `wasm-pack`.
         - `webpack`: This project contains any number of JavaScript files or Rust/C/C++ files that compile to

From 20b2e63ee8108a62871ac7946d781f315519f5ae Mon Sep 17 00:00:00 2001
From: Gabbi Fisher <gabbi@cloudflare.com>
Date: Thu, 12 Sep 2019 07:25:59 -0700
Subject: [PATCH 18/18] Update README.md

Co-Authored-By: Ashley Michal <ashleymichal@gmail.com>
---
 README.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index cb7a53dee..60b132dbf 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,11 @@ General documentation surrounding workers development and using `wrangler` can b
   wrangler generate <name> <template> --type=["webpack", "javascript", "rust"]
   ```
 
-  All of the arguments and flags to this command are optional: - `name`: defaults to `worker` - `template`: defaults to the [`https://github.com/cloudflare/worker-template`](https://github.com/cloudflare/worker-template) - `type`: defaults to "webpack"
+  All of the arguments and flags to this command are optional: 
+  
+  - `name`: defaults to `worker`
+  - `template`: defaults to the [`https://github.com/cloudflare/worker-template`](https://github.com/cloudflare/worker-template)
+  - `type`: defaults to "webpack"
 
 - ### 🦀⚙️ `build`