changing wording on nikola

mattmakai · mattmakai · commit 6ddbed53b9f1 · 2015-11-06T08:33:31.000-08:00
diff --git a/all.html b/all.html
@@ -3087,8 +3087,8 @@ <h2>Python implementations</h2>
   (<a href="https://github.com/getnikola/nikola">source code</a>) takes in 
   reStructuredText, Markdown or Jupyter (IPython) Notebooks and combines 
   the files with Mako or Jinja2 templates to output static sites. It is 
-  compatible with Python 2.7 until 2016 and Python 3.3+ for the 
-  foreseeable future.</p>
+  compatible with both Python 2.7 and 3.3+. Python 2.7 will be dropped 
+  in early 2016 while Python 3.3+ will continue to be supported.</p>
 </li>
 <li>
 <p><a href="http://posativ.org/acrylamid/">Acrylamid</a> 
diff --git a/feeds/all.atom.xml b/feeds/all.atom.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2015-11-05T18:31:33Z</updated></feed>
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2015-11-06T08:33:21Z</updated></feed>
diff --git a/source/content/pages/04-web-development/16-static-site-generator.markdown b/source/content/pages/04-web-development/16-static-site-generator.markdown
@@ -88,8 +88,8 @@ ones listed here are primarily coded in Python.
   ([source code](https://github.com/getnikola/nikola)) takes in 
   reStructuredText, Markdown or Jupyter (IPython) Notebooks and combines 
   the files with Mako or Jinja2 templates to output static sites. It is 
-  compatible with Python 2.7 until 2016 and Python 3.3+ for the 
-  foreseeable future.
+  compatible with both Python 2.7 and 3.3+. Python 2.7 will be dropped 
+  in early 2016 while Python 3.3+ will continue to be supported.
 
 * [Acrylamid](http://posativ.org/acrylamid/) 
   ([source code](https://github.com/posativ/acrylamid)) uses incremental 
diff --git a/static-site-generator.html b/static-site-generator.html
@@ -103,8 +103,8 @@ <h2>Python implementations</h2>
   (<a href="https://github.com/getnikola/nikola">source code</a>) takes in 
   reStructuredText, Markdown or Jupyter (IPython) Notebooks and combines 
   the files with Mako or Jinja2 templates to output static sites. It is 
-  compatible with Python 2.7 until 2016 and Python 3.3+ for the 
-  foreseeable future.</p>
+  compatible with both Python 2.7 and 3.3+. Python 2.7 will be dropped 
+  in early 2016 while Python 3.3+ will continue to be supported.</p>
 </li>
 <li>
 <p><a href="http://posativ.org/acrylamid/">Acrylamid</a> 

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`<?xml version="1.0" encoding="utf-8"?>`
`2`		`-<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2015-11-05T18:31:33Z</updated></feed>`
	`2`	`+<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2015-11-06T08:33:21Z</updated></feed>`