From 314cff4ac0a30d4007065c3ef43ab93242c17194 Mon Sep 17 00:00:00 2001
From: Justin W. Flory <git@jwf.io>
Date: Jun 15 2018 02:23:43 +0000
Subject: Add CFP template, comment out bidding info


---

diff --git a/README.md b/README.md
index 1d59d2f..c1e9cc5 100644
--- a/README.md
+++ b/README.md
@@ -3,11 +3,12 @@
 This repository manages the Flock Call for Papers, Bidding/City Selection process, and stores notes and files related to running Flock.
 The Flock budget is tracked with the rest of the [Fedora Budget](https://budget.fedoraproject.org/budget/docs/index.html).
 
+
 ## Call for Papers
 
-For Flock 2018, We are accepting proposals as issues in the Flock repository on Pagure.
-We are doing this so that you can solicit feedback on your proposal, look for collaborators, and figure out who you need in the room and who will be there.
-To submit, please open a public issue in this repository and select the "Flock CfP" template.
+For Flock 2018, we are accepting proposals as issues in this repository.
+We are doing this so you can solicit feedback on your proposal, look for collaborators, figure out who you need in the room, and who will be there.
+To submit, please open a public issue in this repository and **select the "Flock CfP" template**.
 Then follow these steps:
 
 1. Fill out the issue answering the questions.
@@ -22,6 +23,51 @@ Then follow these steps:
     2. Round 2 selection starts on: 2 July 2018
     3. Final selection starts on: 15 July 2018
 
+The template is included for convenience below:
+
+```
+
+1. What is your proposal?
+
+Be specific about what you want to accomplish, how this helps the project and
+the attendees. Review the CFP call (https://flocktofedora.org/#cfp) for details
+on what we are looking for.
+
+
+2. Who needs to be in the room for this to succeed?
+
+List each person by their name and FAS ID, as shown below:
+
+* Person One (pone)
+* Person Two (ptwo)
+
+
+3. Is this a…
+
+(Delete all that DO NOT apply)
+
+* 5 minutes: **Lightning talk**
+* 60 minutes: **Talk**
+* 2 hours: **Workshop**
+* FAD/Hackfest that lasts a **half-day**
+* FAD/Hackfest that lasts a **full-day**
+
+
+4. Anything else we need to know?
+
+This could be room setup, A/V needs, etc.
+If you have private concerns, please email them to
+flock-admin@fedoraproject.org.
+
+
+5. Who are you?
+
+* Name: 
+* FAS ID: 
+* IRC Nick, if not FAS ID:
+```
+
+<!--
 ## Bidding/City Selection
 
 Bidding for Flock 2018 is now open.
@@ -30,3 +76,4 @@ Answer the questions and you are done.
 You are strongly encourage to circulate your bid and collect feedback via the issue.
 Keep your issue up to do by editing your initial comment.
 The initial comment is what will be read by the bid committee, as they may not read each individual element of feedback.
+-->