diff --git a/CHANGELOG.md b/CHANGELOG.md
index b67b1b6f58c8..0d603877e7f8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,24 @@
 # Changelog
 
-## 2.0.0-alpha4 (Unreleased)
-+ Add a --dry-run option to the installer
-+ Add ability for steps and resource templates to have outputs
-- Prevent a potential k8s scheduler panic from incomplete setting of pod ownership reference
+## 2.0.0-beta1 (2018-01-18)
+
++ Use and install minimal RBAC ClusterRoles for workflow-controller and argo-ui deployments
++ Introduce `retryStrategy` field to control set retries for failed/errored containers
++ Introduce `raw` input artifacts
++ Add `argo install --dry-run` to print Kubernetes YAML manifests without installing
++ Add `argo list` sorts by running pods, then by completion time
++ Add `argo list -o wide` to show pod counts and parameter information
++ Add `argo list --running --completed --status` workflow filtering
++ Add `argo list --since DURATION` to filter workflows based on a time duration
++ Add ability for steps and resource templates to have outputs parameters
++ OpenID Connect auth support (@mthx)
+* Increase controller rate limits for much faster processing of highly parallized workflows
+* Executor sidecar hardening (retrying of Kube API queries)
+* Switch to k8s-codegen generated workflow client and informer
 * {{workflow.uuid}} variable corrected to {{workflow.uid}}
+* Documentation fixes (@reasonthearchitect, @mtx)
+- Prevent a potential k8s scheduler panic from incomplete setting of pod ownership reference
+- Fix issues in controller operating on stale workflow state, and incorrectly identifying deleted pods
 
 ## 2.0.0-alpha3 (2018-01-02)
 + Introduce the "resource" template type for performing CRUD operations on k8s resources
@@ -17,6 +31,7 @@
 * Scalability improvements for highly parallelized workflows
 * Improved validation of volume mounts with input artifacts
 * Argo UI bug fixes and improvements
+* Documentation fixes (@javierbq, @anshumanbh)
 - Recover from unexpected panics when operating on workflows
 - Fix a controller panic when using a script templates with input artifacts
 - Fix issue preventing ability to pass JSON as a command line argument
diff --git a/examples/input-artifact-git.yaml b/examples/input-artifact-git.yaml
index e3fc1857af77..0c2501c57ff1 100644
--- a/examples/input-artifact-git.yaml
+++ b/examples/input-artifact-git.yaml
@@ -16,9 +16,9 @@ spec:
         git:
           repo: https://github.com/argoproj/argo.git
           revision: "master"
-          # For private repositories, first create a k8s secret containing
-          # the git credentials. Then and reference the keys in the secret
-          # selectors: usernameSecret and passwordSecret.
+          # For private repositories, create a k8s secret containing
+          # the git credentials and reference the secret keys in the
+          # secret selectors: usernameSecret and passwordSecret.
           usernameSecret:
             name: github-creds
             key: username
diff --git a/examples/retry-container-to-completion.yaml b/examples/retry-container-to-completion.yaml
index ca8dac3bb954..3ceeab42884b 100644
--- a/examples/retry-container-to-completion.yaml
+++ b/examples/retry-container-to-completion.yaml
@@ -6,11 +6,11 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Workflow
 metadata:
-  generateName: container-retries-
+  generateName: retry-to-completion-
 spec:
-  entrypoint: container-retries
+  entrypoint: retry-to-completion
   templates:
-  - name: container-retries
+  - name: retry-to-completion
     retryStrategy: {}
     container:
       image: shrinand/random-fail
diff --git a/examples/retry-container.yaml b/examples/retry-container.yaml
index 08ab3ea5461e..0940db1d3ef0 100644
--- a/examples/retry-container.yaml
+++ b/examples/retry-container.yaml
@@ -5,11 +5,11 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Workflow
 metadata:
-  generateName: container-retries-
+  generateName: retry-container-
 spec:
-  entrypoint: container-retries
+  entrypoint: retry-container
   templates:
-  - name: container-retries
+  - name: retry-container
     retryStrategy:
       limit: 4
     container: