[tor-commits] [torspec/main] Fold 314 (markdown) into 001 (process).

[nickm at torproject.org]

commit 21a23221f6e5721e17db472208063e7c62ffe27b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 22 09:02:20 2021 -0500

    Fold 314 (markdown) into 001 (process).
---
 proposals/001-process.txt                 | 6 ++++++
 proposals/314-allow-markdown-proposals.md | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/proposals/001-process.txt b/proposals/001-process.txt
index d6717bf..7211c3b 100644
--- a/proposals/001-process.txt
+++ b/proposals/001-process.txt
@@ -145,6 +145,12 @@ What should go in a proposal:
         can avoid really expensive performance regressions, and so we can
         avoid wasting time on insignificant gains.
 
+How to format proposals:
+
+   Proposals may be written in plain text (like this one), or in Markdown.
+   If using Markdown, the header must be wrapped in triple-backtick ("```")
+   lines.  Whenever possible, we prefer the Commonmark dialect of Markdown.
+
 Proposal status:
 
    Open: A proposal under discussion.
diff --git a/proposals/314-allow-markdown-proposals.md b/proposals/314-allow-markdown-proposals.md
index 99677f0..8469757 100644
--- a/proposals/314-allow-markdown-proposals.md
+++ b/proposals/314-allow-markdown-proposals.md
@@ -3,7 +3,7 @@ Filename: 314-allow-markdown-proposals.md
 Title: Allow Markdown for proposal format.
 Author: Nick Mathewson
 Created: 23 April 2020
-Status: Finished
+Status: Closed
 ```
 
 # Introduction