From 764c63f3e84eb177daff2c8d3b2b5ec268f962b2 Mon Sep 17 00:00:00 2001
From: Andrew Morgan <andrew@amorgan.xyz>
Date: Mon, 15 Oct 2018 15:22:23 +0200
Subject: [PATCH] Add proposal template

---
 proposals/proposal_template.md    | 12 ++++++++++++
 specification/proposals_intro.rst |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 proposals/proposal_template.md

diff --git a/proposals/proposal_template.md b/proposals/proposal_template.md
new file mode 100644
index 00000000..fb86d8fc
--- /dev/null
+++ b/proposals/proposal_template.md
@@ -0,0 +1,12 @@
+# MSC Proposal Title
+
+## Problem/Background
+
+## Proposal/Solution
+
+## Tradeoffs
+
+## Potential Issues
+
+## Conclusion
+
diff --git a/specification/proposals_intro.rst b/specification/proposals_intro.rst
index 9d64c1dc..858db6f9 100644
--- a/specification/proposals_intro.rst
+++ b/specification/proposals_intro.rst
@@ -27,7 +27,7 @@ follows:
     author desires; there is no formal template; the intention is to iterate
     as quickly as possible to get to a good design.
   - However, a `template with suggested headers
-    <https://docs.google.com/document/d/1CoLCPTcRFvD4PqjvbUl3ZIWgGLpmRNbqxsT2Tu7lCzI/>`_
+    <https://github.com/matrix-org/matrix-doc/blob/master/proposals/proposals_template.md>`_
     is available to get you started if necessary.
   - Take care in creating your proposal. Specify your intended changes, and
     give reasoning to back them up. Changes without justification will likely