diff --git a/scripts/proposals.py b/scripts/proposals.py
index 8b2107ac..a84804a7 100644
--- a/scripts/proposals.py
+++ b/scripts/proposals.py
@@ -55,7 +55,7 @@ for label in labels:
     text_file.write("     - Proposal Title\n")
     text_file.write("     - Creation Date\n")
     text_file.write("     - Update Date\n")
-    text_file.write("     - Documenation\n")
+    text_file.write("     - Documentation\n")
     text_file.write("     - Author\n")
     text_file.write("     - Shepherd\n")
     text_file.write("     - PRs\n")
diff --git a/specification/proposals.rst b/specification/proposals.rst
index da9d277f..c8d58764 100644
--- a/specification/proposals.rst
+++ b/specification/proposals.rst
@@ -13,7 +13,7 @@ proposal-wip
      - Proposal Title
      - Creation Date
      - Update Date
-     - Documenation
+     - Documentation
      - Author
      - Shepherd
      - PRs
@@ -200,7 +200,7 @@ proposal-ready-for-review
      - Proposal Title
      - Creation Date
      - Update Date
-     - Documenation
+     - Documentation
      - Author
      - Shepherd
      - PRs
@@ -235,7 +235,7 @@ proposal-in-review
      - Proposal Title
      - Creation Date
      - Update Date
-     - Documenation
+     - Documentation
      - Author
      - Shepherd
      - PRs
@@ -270,7 +270,7 @@ proposal-passed-review
      - Proposal Title
      - Creation Date
      - Update Date
-     - Documenation
+     - Documentation
      - Author
      - Shepherd
      - PRs
@@ -290,22 +290,6 @@ proposal-passed-review
      - `@ara4n`_
      - None
      - 
-   * - `MSC1233 <https://github.com/matrix-org/matrix-doc/issues/1233>`_
-     - A proposal for organising spec proposals
-     - 2018-05-10
-     - 2018-05-15
-     - `1233-1 <https://docs.google.com/document/d/1wLln7da12l0H5YgAh5xM2TVE7VsTjXzhEwVh3sRBMCk/edit#>`_
-     - `@ara4n`_
-     - None
-     - `PR#1240`_
-   * - `MSC1234 <https://github.com/matrix-org/matrix-doc/issues/1234>`_
-     - Rich Replies format
-     - 2018-05-12
-     - 2018-05-17
-     - `1234-1 <https://docs.google.com/document/d/1BPd4lBrooZrWe_3s_lHw_e-Dydvc7bXbm02_sV2k6Sc>`_
-     - `@t3chguy`_
-     - None
-     - 
    * - `MSC1236 <https://github.com/matrix-org/matrix-doc/issues/1236>`_
      - Matrix Widget API v2
      - 2018-05-13
@@ -329,18 +313,10 @@ spec-pr-missing
      - Proposal Title
      - Creation Date
      - Update Date
-     - Documenation
+     - Documentation
      - Author
      - Shepherd
      - PRs
-   * - `MSC1197 <https://github.com/matrix-org/matrix-doc/issues/1197>`_
-     - Ignoring Users
-     - 2016-05-03
-     - 2018-05-15
-     - `1197-1 <https://docs.google.com/document/d/1Jex7lDAwmv0KcgyL9oeGfUCsjw0CWSqedPKZ1ViSVis/edit>`_
-     - `@erikjohnston`_
-     - None
-     - 
    * - `MSC1201 <https://github.com/matrix-org/matrix-doc/issues/1201>`_
      - Device Management API
      - 2016-07-14
@@ -456,7 +432,7 @@ spec-pr-missing
    * - `MSC1234 <https://github.com/matrix-org/matrix-doc/issues/1234>`_
      - Rich Replies format
      - 2018-05-12
-     - 2018-05-17
+     - 2018-05-18
      - `1234-1 <https://docs.google.com/document/d/1BPd4lBrooZrWe_3s_lHw_e-Dydvc7bXbm02_sV2k6Sc>`_
      - `@t3chguy`_
      - None
@@ -476,7 +452,7 @@ merged
      - Proposal Title
      - Creation Date
      - Update Date
-     - Documenation
+     - Documentation
      - Author
      - Shepherd
      - PRs
@@ -504,6 +480,14 @@ merged
      - `@richvdh`_
      - None
      - 
+   * - `MSC1233 <https://github.com/matrix-org/matrix-doc/issues/1233>`_
+     - A proposal for organising spec proposals
+     - 2018-05-10
+     - 2018-05-18
+     - `1233-1 <https://docs.google.com/document/d/1wLln7da12l0H5YgAh5xM2TVE7VsTjXzhEwVh3sRBMCk/edit#>`_
+     - `@ara4n`_
+     - None
+     - `PR#1240`_
 
 
 
@@ -519,7 +503,7 @@ abandoned
      - Proposal Title
      - Creation Date
      - Update Date
-     - Documenation
+     - Documentation
      - Author
      - Shepherd
      - PRs
@@ -549,8 +533,8 @@ abandoned
      - 
    * - `MSC1213 <https://github.com/matrix-org/matrix-doc/issues/1213>`_
      - Set defaults for m.federate
-     - 2018-05-10
-     - 2018-05-15
+     - 2017-04-10
+     - 2018-05-18
      - `1213-1 <https://docs.google.com/document/d/14zqsbwl5KKil-bB8w2HMhidBVmFkP9Q7EQKFwKIIfZc/edit#heading=h.eipip5qhqo0d>`_
      - `@psaavedra`_
      - None
@@ -570,7 +554,7 @@ obsolete
      - Proposal Title
      - Creation Date
      - Update Date
-     - Documenation
+     - Documentation
      - Author
      - Shepherd
      - PRs
diff --git a/specification/proposals_intro.rst b/specification/proposals_intro.rst
index fecfc2f9..fdc34a29 100644
--- a/specification/proposals_intro.rst
+++ b/specification/proposals_intro.rst
@@ -6,7 +6,7 @@ Proposals for Spec Changes to Matrix
 
 The process for submitting a Matrix Spec Change (MSC) Proposal is as follows:
 
-- produce a publicly-accessible proposal describing your change:
+- Produce a publicly-accessible proposal describing your change:
 
   - Please use Google Docs, or an equivalent system capable of collaborative
     editing, with versioned history, suggestions ('track changes'), threaded
@@ -28,7 +28,7 @@ The process for submitting a Matrix Spec Change (MSC) Proposal is as follows:
     <https://docs.google.com/document/d/1CoLCPTcRFvD4PqjvbUl3ZIWgGLpmRNbqxsT2Tu7lCzI/>`_
     is available.
 
-- make a new issue at https://github.com/matrix-org/matrix-doc/issues (or
+- Make a new issue at https://github.com/matrix-org/matrix-doc/issues (or
   modify an existing one), whose description should list the metadata as per
   below.
 - Gather feedback as widely as possible from the community and core team on