adding note that nikola is dropping python 2.x support in near future

mattmakai · mattmakai · commit 313cea270ed8 · 2015-11-05T12:47:53.000-08:00
diff --git a/all.html b/all.html
@@ -3084,9 +3084,11 @@ <h2>Python implementations</h2>
 </li>
 <li>
 <p><a href="https://getnikola.com/">Nikola</a> 
-  (<a href="https://github.com/getnikola/nikola">source code</a>) takes in either Markdown
-  or reStructuredText and combines the files with Mako templates to output
-  static sites. It is compatible with both Python 2.x and 3.x.</p>
+  (<a href="https://github.com/getnikola/nikola">source code</a>) takes in either 
+  Markdown or reStructuredText and combines the files with Mako templates 
+  to output static sites. It is compatible with both Python 2.x and 3.x, 
+  although the current plan is to drop support for Python 2.x in the near 
+  future.</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-05T12:26:19Z</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-05T12:47:40Z</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
@@ -85,9 +85,11 @@ ones listed here are primarily coded in Python.
   more sense to use a different static site generator instead.
 
 * [Nikola](https://getnikola.com/) 
-  ([source code](https://github.com/getnikola/nikola)) takes in either Markdown
-  or reStructuredText and combines the files with Mako templates to output
-  static sites. It is compatible with both Python 2.x and 3.x.
+  ([source code](https://github.com/getnikola/nikola)) takes in either 
+  Markdown or reStructuredText and combines the files with Mako templates 
+  to output static sites. It is compatible with both Python 2.x and 3.x, 
+  although the current plan is to drop support for Python 2.x in the near 
+  future.
 
 * [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
@@ -100,9 +100,11 @@ <h2>Python implementations</h2>
 </li>
 <li>
 <p><a href="https://getnikola.com/">Nikola</a> 
-  (<a href="https://github.com/getnikola/nikola">source code</a>) takes in either Markdown
-  or reStructuredText and combines the files with Mako templates to output
-  static sites. It is compatible with both Python 2.x and 3.x.</p>
+  (<a href="https://github.com/getnikola/nikola">source code</a>) takes in either 
+  Markdown or reStructuredText and combines the files with Mako templates 
+  to output static sites. It is compatible with both Python 2.x and 3.x, 
+  although the current plan is to drop support for Python 2.x in the near 
+  future.</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-05T12:26:19Z</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-05T12:47:40Z</updated></feed>`