adding new CI resource

mattmakai · mattmakai · commit db96b377b8ed · 2014-08-10T14:59:36.000-04:00
diff --git a/all.html b/all.html
@@ -2257,9 +2257,16 @@ <h2>Hosted CI services</h2>
 </ul>
 <h2>Continuous integration resources</h2>
 <ul>
-<li>"<a href="http://www.rackspace.com/blog/diving-into-continuous-integration-as-a-newbie/">Diving into continuous integration as a newbie</a>"
+<li>
+<p><a href="http://martinfowler.com/articles/continuousIntegration.html">What is continuous integration</a>
+  is a classic detailed article by Martin Fowler on the concepts behind CI
+  and how to implement it.</p>
+</li>
+<li>
+<p>"<a href="http://www.rackspace.com/blog/diving-into-continuous-integration-as-a-newbie/">Diving into continuous integration as a newbie</a>"
   is a retrospective on learning CI from a Rackspace intern on how she learned
-  the subject.</li>
+  the subject.</p>
+</li>
 </ul>
 <h3>What do you want to add to your application next?</h3>
                       <h1>Configuration Management</h1>
diff --git a/continuous-integration.html b/continuous-integration.html
@@ -95,9 +95,16 @@ <h2>Hosted CI services</h2>
 </ul>
 <h2>Continuous integration resources</h2>
 <ul>
-<li>"<a href="http://www.rackspace.com/blog/diving-into-continuous-integration-as-a-newbie/">Diving into continuous integration as a newbie</a>"
+<li>
+<p><a href="http://martinfowler.com/articles/continuousIntegration.html">What is continuous integration</a>
+  is a classic detailed article by Martin Fowler on the concepts behind CI
+  and how to implement it.</p>
+</li>
+<li>
+<p>"<a href="http://www.rackspace.com/blog/diving-into-continuous-integration-as-a-newbie/">Diving into continuous integration as a newbie</a>"
   is a retrospective on learning CI from a Rackspace intern on how she learned
-  the subject.</li>
+  the subject.</p>
+</li>
 </ul>
 <h3>What do you want to add to your application next?</h3>
                   <div class="row">
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>2014-08-10T11:32:04Z</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>2014-08-10T14:59:27Z</updated></feed>
diff --git a/source/content/pages/06-automation/0602-continuous-integration.markdown b/source/content/pages/06-automation/0602-continuous-integration.markdown
@@ -64,6 +64,10 @@ do not break existing tests ensure the software works as intended.
 
 
 ## Continuous integration resources
+* [What is continuous integration](http://martinfowler.com/articles/continuousIntegration.html)
+  is a classic detailed article by Martin Fowler on the concepts behind CI
+  and how to implement it.
+
 * "[Diving into continuous integration as a newbie](http://www.rackspace.com/blog/diving-into-continuous-integration-as-a-newbie/)"
   is a retrospective on learning CI from a Rackspace intern on how she learned
   the subject.

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>2014-08-10T11:32:04Z</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>2014-08-10T14:59:27Z</updated></feed>`