Merge branch 'zaeph-fixups'

2 files changed, 16 insertions, 17 deletions

diff --git a/2021/cfp.md b/2021/cfp.md
index c0b35274..e854b338 100644
--- a/2021/cfp.md
+++ b/2021/cfp.md
@@ -110,10 +110,10 @@ As you think about your talk, consider what you can share in:
 - **Up to 40 minutes total:** What would benefit from a deep dive?
   How do you keep it engaging?
 
-When you write your proposal, outline what you plan to talk about if
-you have 5-10 minutes.  If you would like to propose a longer talk,
-outline what you might include for a 5-10 minute talk, a 20-minute
-talk, and optionally a 40-minute talk.
+When writing your proposal, please write an outline of what you would like to
+discuss if you had 5-10 minutes.  If you would like to propose a longer talk,
+please also provide outlines for the shorter formats to make it easier for us
+to schedule everything.
 
 Example for a 40-minute talk:
 
diff --git a/2021/emacsconf-2021-cfp.org b/2021/emacsconf-2021-cfp.org
index a24e0db4..8665fbfb 100644
--- a/2021/emacsconf-2021-cfp.org
+++ b/2021/emacsconf-2021-cfp.org
@@ -14,9 +14,8 @@ your experiments and adventures with the Emacs text editor / operating
 system / way of life!  We welcome speakers of *all backgrounds* and
 *all levels of experience*, including newcomers giving their first
 talk.  What have you found exciting about Emacs lately?  What do you
-wish someone had told you when you were starting out or learning more?
-What part of your workflow might inspire someone to get into Emacs or
-go deeper?
+wish someone had told you when you were starting out?  What part of
+your workflow might inspire someone to get into Emacs or go deeper?
 
 A great way to get started with writing a proposal is to start by
 exploring the programs from previous years: [[https://emacsconf.org/2020/schedule/][2020]], [[https://emacsconf.org/2019/schedule/][2019]], [[https://emacsconf.org/2015/schedule/][2015]], [[https://emacsconf.org/2013/#program][2013]].
@@ -32,12 +31,12 @@ it if EmacsConf 2021 could highlight interesting perspectives and
 reflect the diversity of our community.  If you know someone who might
 have a good idea for a talk, please reach out to them and encourage
 them to submit a proposal.  Many people (especially from
-underrepresented groups such as women, people of colour, and
-non-developers) might not consider themselves expert enough to share
-their thoughts.  If you let them know that you value their knowledge
-and maybe even suggest something that you think others would like to
-hear more about, they may realize that they have something worth
-sharing and that we would love to hear from them.
+underrepresented groups such as women, people of colour,
+non-developers, etc.) might not consider themselves expert enough to
+share their thoughts.  If you let them know that you value their
+knowledge and maybe even suggest something that you think others would
+like to hear more about, they may realize that they have something
+worth sharing and that we would love to hear from them.
 
 * Important dates
 
@@ -86,10 +85,10 @@ As you think about your talk, consider what you can share in:
 - *Up to 40 minutes total:* What would benefit from a deep dive?
   How do you keep it engaging?
 
-When you write your proposal, outline what you plan to talk about if
-you have 5-10 minutes.  If you would like to propose a longer talk,
-outline what you might include for a 5-10 minute talk, a 20-minute
-talk, and optionally a 40-minute talk.
+When writing your proposal, please write an outline of what you would
+like to discuss if you had 5-10 minutes.  If you would like to propose
+a longer talk, please also provide outlines for the shorter formats to
+make it easier for us to schedule everything.
 
 Example for a 40-minute talk: