update announcements and checklist

Signed-off-by: Chris Warrick <kwpolska@gmail.com>
getnikola · Jul 2, 2015 · d959132 · d959132
1 parent a350a82
commit d959132
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 30 deletions.
diff --git a/announcements/blog.rst b/announcements/blog.rst
@@ -1,17 +1,17 @@
 On behalf of the Nikola team, I am pleased to announce the immediate
-availability of Nikola vX.Y.Z.  It features some bugfixes and new
+availability of Nikola vX.Y.Z. It fixes some bugs and adds new
 features.
 
 What is Nikola?
 ===============
 
-Nikola is a static site and blog generator, written in Python.  It can
-use Mako and Jinja2 templates, and input in many popular markup
+Nikola is a static site and blog generator, written in Python.
+It can use Mako and Jinja2 templates, and input in many popular markup
 formats, such as reStructuredText and Markdown — and can even turn
-IPython Notebooks into blog posts! It also supports image galleries,
-and is multilingual.  Nikola is flexible, and page builds are
-extremely fast, courtesy of doit (which is rebuilding only what has
-been changed).
+Jupyter (IPython) Notebooks into blog posts! It also supports image
+galleries, and is multilingual. Nikola is flexible, and page builds
+are extremely fast, courtesy of doit (which is rebuilding only what
+has been changed).
 
 Find out more at the website: https://getnikola.com/
 

diff --git a/announcements/github.md b/announcements/github.md
@@ -1,9 +1,10 @@
-On behalf of the Nikola team, I am pleased to announce the immediate availability of Nikola vX.Y.Z.  It features some bugfixes and new features.
+On behalf of the Nikola team, I am pleased to announce the immediate availability of Nikola vX.Y.Z. It fixes some bugs and adds new features.
 
 What is Nikola?
 ===============
 
-Nikola is a static site and blog generator, written in Python.  It can use Mako and Jinja2 templates, and input in many popular markup formats, such as reStructuredText and Markdown — and can even turn IPython Notebooks into blog posts! It also supports image galleries, and is multilingual.  Nikola is flexible, and page builds are extremely fast, courtesy of doit (which is rebuilding only what has been changed).
+Nikola is a static site and blog generator, written in Python.
+It can use Mako and Jinja2 templates, and input in many popular markup formats, such as reStructuredText and Markdown — and can even turn Jupyter (IPython) Notebooks into blog posts! It also supports image galleries, and is multilingual. Nikola is flexible, and page builds are extremely fast, courtesy of doit (which is rebuilding only what has been changed).
 
 Find out more at the website: https://getnikola.com/
 

diff --git a/announcements/mail.rst b/announcements/mail.rst
@@ -1,17 +1,17 @@
 On behalf of the Nikola team, I am pleased to announce the immediate
-availability of Nikola vX.Y.Z.  It features some bugfixes and new
+availability of Nikola vX.Y.Z. It fixes some bugs and adds new
 features.
 
 What is Nikola?
 ===============
 
-Nikola is a static site and blog generator, written in Python.  It can
-use Mako and Jinja2 templates, and input in many popular markup
+Nikola is a static site and blog generator, written in Python.
+It can use Mako and Jinja2 templates, and input in many popular markup
 formats, such as reStructuredText and Markdown — and can even turn
-IPython Notebooks into blog posts! It also supports image galleries,
-and is multilingual.  Nikola is flexible, and page builds are
-extremely fast, courtesy of doit (which is rebuilding only what has
-been changed).
+Jupyter (IPython) Notebooks into blog posts! It also supports image
+galleries, and is multilingual. Nikola is flexible, and page builds
+are extremely fast, courtesy of doit (which is rebuilding only what
+has been changed).
 
 Find out more at the website: https://getnikola.com/
 

diff --git a/announcements/sections/greeting.rst b/announcements/sections/greeting.rst
@@ -1,3 +1,3 @@
 On behalf of the Nikola team, I am pleased to announce the immediate
-availability of Nikola vX.Y.Z.  It features some bugfixes and new
+availability of Nikola vX.Y.Z. It fixes some bugs and adds new
 features.
diff --git a/announcements/sections/what-is-nikola.rst b/announcements/sections/what-is-nikola.rst
@@ -1,12 +1,12 @@
 What is Nikola?
 ===============
 
-Nikola is a static site and blog generator, written in Python.  It can
-use Mako and Jinja2 templates, and input in many popular markup
+Nikola is a static site and blog generator, written in Python.
+It can use Mako and Jinja2 templates, and input in many popular markup
 formats, such as reStructuredText and Markdown — and can even turn
-IPython Notebooks into blog posts! It also supports image galleries,
-and is multilingual.  Nikola is flexible, and page builds are
-extremely fast, courtesy of doit (which is rebuilding only what has
-been changed).
+Jupyter (IPython) Notebooks into blog posts! It also supports image
+galleries, and is multilingual. Nikola is flexible, and page builds
+are extremely fast, courtesy of doit (which is rebuilding only what
+has been changed).
 
 Find out more at the website: https://getnikola.com/
diff --git a/checklist.html b/checklist.html
@@ -49,7 +49,7 @@ <h2>Writing announcements</h2>
 <ul>
 <li><input type="checkbox"> Write an announcement for GitHub Releases. It should use Markdown syntax and no word wrap.</li>
 <li><input type="checkbox"> Write an announcement for e-mail. It should use reST-esque syntax, with word wrap at 70 columns.</li>
-<li><input type="checkbox"> Write an announcement for the Nikola blog. Use <code>nikola new_post -t &quot;Nikola v$VERSION is out!&quot; -i path/to/blog.rst</code> to import the announcement template (which you should then edit). Make sure to set the tags to <code>nikola, planet, python, programming, release</code>, and to set the author name to your real name.</li>
+<li><input type="checkbox"> Write an announcement for the Nikola blog. Use <code>nikola new_post -et &quot;Nikola v$VERSION is out\!&quot; -i path/to/blog.rst --tags 'nikola, planet, python, programming, release'</code> to import the announcement template (which you should then edit). Make sure to set the author name to your real name.</li>
 </ul>
 <h2>Versioning and tagging</h2>
 <p>Run all the commands in your terminal:</p>
@@ -86,7 +86,7 @@ <h2>Website update</h2>
 <li><input type="checkbox"> Modify the version numbers in <code>stories/welcome.txt</code> and <code>stories/conf.txt</code></li>
 <li><input type="checkbox"> Optionally regenerate the <code>cerulean</code> theme: <code>nikola bootswatch_theme -s cerulean -n cerulean</code></li>
 <li><input type="checkbox"> Build and deploy the site</li>
-<li><input type="checkbox"> Commit your changes to GitHub</li>
+<li><input type="checkbox"> Commit and push your changes to GitHub</li>
 </ul>
 <h2>E-mails</h2>
 <ul>

diff --git a/src/Makefile b/src/Makefile
@@ -0,0 +1,3 @@
+html:
+	cmark checklist.md > checklist.html
+	cat bootstrap-head.html checklist.html bootstrap-foot.html > ../checklist.html
diff --git a/src/README.md b/src/README.md
@@ -2,5 +2,5 @@
 
 This is source for the checklist.  Post-processing:
 
-* `cmark checklist.html > checklist.md` (or your favorite Markdown implementation)
+* `cmark checklist.md > checklist.html` (or your favorite Markdown implementation)
 * `cat bootstrap-head.html checklist.html bootstrap-foot.html > ../checklist.html`
diff --git a/src/checklist.html b/src/checklist.html
@@ -20,7 +20,7 @@ <h2>Writing announcements</h2>
 <ul>
 <li><input type="checkbox"> Write an announcement for GitHub Releases. It should use Markdown syntax and no word wrap.</li>
 <li><input type="checkbox"> Write an announcement for e-mail. It should use reST-esque syntax, with word wrap at 70 columns.</li>
-<li><input type="checkbox"> Write an announcement for the Nikola blog. Use <code>nikola new_post -t &quot;Nikola v$VERSION is out!&quot; -i path/to/blog.rst</code> to import the announcement template (which you should then edit). Make sure to set the tags to <code>nikola, planet, python, programming, release</code>, and to set the author name to your real name.</li>
+<li><input type="checkbox"> Write an announcement for the Nikola blog. Use <code>nikola new_post -et &quot;Nikola v$VERSION is out\!&quot; -i path/to/blog.rst --tags 'nikola, planet, python, programming, release'</code> to import the announcement template (which you should then edit). Make sure to set the author name to your real name.</li>
 </ul>
 <h2>Versioning and tagging</h2>
 <p>Run all the commands in your terminal:</p>
@@ -57,7 +57,7 @@ <h2>Website update</h2>
 <li><input type="checkbox"> Modify the version numbers in <code>stories/welcome.txt</code> and <code>stories/conf.txt</code></li>
 <li><input type="checkbox"> Optionally regenerate the <code>cerulean</code> theme: <code>nikola bootswatch_theme -s cerulean -n cerulean</code></li>
 <li><input type="checkbox"> Build and deploy the site</li>
-<li><input type="checkbox"> Commit your changes to GitHub</li>
+<li><input type="checkbox"> Commit and push your changes to GitHub</li>
 </ul>
 <h2>E-mails</h2>
 <ul>

diff --git a/src/checklist.md b/src/checklist.md
@@ -25,7 +25,7 @@ You may also add a *Key Changes since last release* block after *What is Nikola?
 
  * <input type="checkbox"> Write an announcement for GitHub Releases. It should use Markdown syntax and no word wrap.
  * <input type="checkbox"> Write an announcement for e-mail. It should use reST-esque syntax, with word wrap at 70 columns.
- * <input type="checkbox"> Write an announcement for the Nikola blog. Use `nikola new_post -t "Nikola v$VERSION is out!" -i path/to/blog.rst` to import the announcement template (which you should then edit). Make sure to set the tags to `nikola, planet, python, programming, release`, and to set the author name to your real name.
+ * <input type="checkbox"> Write an announcement for the Nikola blog. Use `nikola new_post -et "Nikola v$VERSION is out\!" -i path/to/blog.rst --tags 'nikola, planet, python, programming, release'` to import the announcement template (which you should then edit). Make sure to set the author name to your real name.
 
 ## Versioning and tagging
 
@@ -63,7 +63,7 @@ Run all the commands in your terminal:
  * <input type="checkbox"> Modify the version numbers in `stories/welcome.txt` and `stories/conf.txt`
  * <input type="checkbox"> Optionally regenerate the `cerulean` theme: `nikola bootswatch_theme -s cerulean -n cerulean`
  * <input type="checkbox"> Build and deploy the site
- * <input type="checkbox"> Commit your changes to GitHub
+ * <input type="checkbox"> Commit and push your changes to GitHub
 
 ## E-mails