updating Nikola description based on PR mattmakai#68

mattmakai · mattmakai · commit 474133ee9763 · 2015-11-05T13:12:16.000-08:00
diff --git a/all.html b/all.html
@@ -3084,12 +3084,19 @@ <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 
+  (<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>
+</li>
+</ul>
+<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 early
   2016.</p>
-</li>
+<ul>
 <li>
 <p><a href="http://posativ.org/acrylamid/">Acrylamid</a> 
   (<a href="https://github.com/posativ/acrylamid">source code</a>) uses incremental 
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:48:37Z</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-05T13:12:02Z</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,6 +85,12 @@ 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 
+  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.
+
   ([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, 
diff --git a/static-site-generator.html b/static-site-generator.html
@@ -100,12 +100,19 @@ <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 
+  (<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>
+</li>
+</ul>
+<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 early
   2016.</p>
-</li>
+<ul>
 <li>
 <p><a href="http://posativ.org/acrylamid/">Acrylamid</a> 
   (<a href="https://github.com/posativ/acrylamid">source code</a>) uses incremental 

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:48:37Z</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-05T13:12:02Z</updated></feed>`