adding new version control resources

mattmakai · mattmakai · commit 8ddba005835a · 2014-06-06T07:13:48.000-04:00
diff --git a/change-log.html b/change-log.html
@@ -46,6 +46,8 @@ <h1>Change Log</h1>
 <h2>2014</h2>
 <h3>June</h3>
 <ul>
+<li>Split version control resources from Git resources. Added new version
+  control resources.</li>
 <li>Updated logging page with better explanations and content ordering.</li>
 <li>Added learning checklists for all sections. The remaining sections that now
   also have checklists are logging, web analytics and web application security.</li>
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-06-05T15:13:28Z</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-06-06T07:13:38Z</updated></feed>
diff --git a/source-control.html b/source-control.html
@@ -77,8 +77,9 @@ <h2>Source control hosted services</h2>
 <h2>Source control resources</h2>
 <ul>
 <li>
-<p><a href="http://git-scm.com/book">Pro Git</a> is a free open source book that walks 
-  through all aspects of using the version control system.</p>
+<p><a href="https://blog.rainforestqa.com/2014-05-28-version-control-best-practices/">Version control best practices</a>
+  is part of an ongoing deployment guide written by the folks at 
+  <a href="https://www.rainforestqa.com/">Rainforest</a>.</p>
 </li>
 <li>
 <p><a href="http://www.kalzumeus.com/2010/12/12/staging-servers-source-control-deploy-workflows-and-other-stuff-nobody-teaches-you/">Staging Servers, Source Control &amp; Deploy Workflows, And Other Stuff Nobody Teaches You</a> 
@@ -107,6 +108,13 @@ <h2>Source control resources</h2>
 <p><a href="http://git-scm.com/book/en/Getting-Started-About-Version-Control">About version control</a> 
 reviews the basics of distributed version control systems.</p>
 </li>
+</ul>
+<h2>Git resources</h2>
+<ul>
+<li>
+<p><a href="http://git-scm.com/book">Pro Git</a> is a free open source book that walks 
+  through all aspects of using the version control system.</p>
+</li>
 <li>
 <p><a href="http://wildlyinaccurate.com/a-hackers-guide-to-git">A Hacker's Guide to Git</a>
   covers the basics as well as more advanced Git commands while explaining each
diff --git a/source/content/pages/03-deployment/0313-source-control.markdown b/source/content/pages/03-deployment/0313-source-control.markdown
@@ -51,8 +51,9 @@ as Git or Mercurial.
 
 
 ## Source control resources
-* [Pro Git](http://git-scm.com/book) is a free open source book that walks 
-  through all aspects of using the version control system.
+* [Version control best practices](https://blog.rainforestqa.com/2014-05-28-version-control-best-practices/)
+  is part of an ongoing deployment guide written by the folks at 
+  [Rainforest](https://www.rainforestqa.com/).
 
 * [Staging Servers, Source Control & Deploy Workflows, And Other Stuff Nobody Teaches You](http://www.kalzumeus.com/2010/12/12/staging-servers-source-control-deploy-workflows-and-other-stuff-nobody-teaches-you/) 
   is a comprehensive overview by Patrick McKenzie of why you need source 
@@ -75,6 +76,11 @@ as Git or Mercurial.
 * [About version control](http://git-scm.com/book/en/Getting-Started-About-Version-Control) 
 reviews the basics of distributed version control systems.
 
+
+## Git resources
+* [Pro Git](http://git-scm.com/book) is a free open source book that walks 
+  through all aspects of using the version control system.
+
 * [A Hacker's Guide to Git](http://wildlyinaccurate.com/a-hackers-guide-to-git)
   covers the basics as well as more advanced Git commands while explaining each
   step along the way.
diff --git a/source/content/pages/10-misc/1005-change-log.markdown b/source/content/pages/10-misc/1005-change-log.markdown
@@ -24,6 +24,8 @@ the
 
 ## 2014
 ### June
+* Split version control resources from Git resources. Added new version
+  control resources.
 * Updated logging page with better explanations and content ordering.
 * Added learning checklists for all sections. The remaining sections that now
   also have checklists are logging, web analytics and web application security.

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-06-05T15:13:28Z</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-06-06T07:13:38Z</updated></feed>`