adding google cloud sql as third party db service and updating change log

mattmakai · mattmakai · commit 2f6fbde79d6c · 2014-02-06T08:26:46.000-05:00
diff --git a/change-log.html b/change-log.html
@@ -78,7 +78,9 @@ <h1>Change Log</h1>
 <h2>2014</h2>
 <p>Feb: Adding new Django resources, added sitemap.xml. Rewriting all sections
 to fix first draft typos and grammar mistakes as well as add new content.
-Added task queues section due to reader feedback.</p>
+Added task queues section due to reader feedback. Rewrote intro section.
+Merged several pull requests (see closed
+<a class="reference external" href="https://github.com/makaimc/fullstackpython.github.com/pulls">GitHub repo pull requests</a>).</p>
 <p>Jan: Adding configuration management, application dependencies, and source
 control sections. Also updating about section. Updated design to be fully
 responsive.</p>
diff --git a/databases.html b/databases.html
@@ -118,6 +118,9 @@ <h2>Database third-party services</h2>
 provides pre-configured MySQL and PostgreSQL instances. The instances can
 be scaled to larger or smaller configurations based on storage and performance
 needs.</p>
+<p><a class="reference external" href="https://developers.google.com/cloud-sql/">Google Cloud SQL</a> is a service
+with managed, backed up, replicated, and auto-patched MySQL instances. Cloud
+SQL integrates with Google App Engine but can be used independently as well.</p>
 </div>
 <div class="section" id="database-resources">
 <h2>Database resources</h2>
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-02-05T21:00:21Z</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-02-06T08:26:32Z</updated></feed>
diff --git a/source/content/pages/change-log.rst b/source/content/pages/change-log.rst
@@ -9,7 +9,9 @@ Change Log
 ----
 Feb: Adding new Django resources, added sitemap.xml. Rewriting all sections
 to fix first draft typos and grammar mistakes as well as add new content.
-Added task queues section due to reader feedback.
+Added task queues section due to reader feedback. Rewrote intro section.
+Merged several pull requests (see closed 
+`GitHub repo pull requests <https://github.com/makaimc/fullstackpython.github.com/pulls>`_).
 
 Jan: Adding configuration management, application dependencies, and source 
 control sections. Also updating about section. Updated design to be fully
diff --git a/source/content/pages/databases.rst b/source/content/pages/databases.rst
@@ -61,6 +61,10 @@ provides pre-configured MySQL and PostgreSQL instances. The instances can
 be scaled to larger or smaller configurations based on storage and performance
 needs.
 
+`Google Cloud SQL <https://developers.google.com/cloud-sql/>`_ is a service
+with managed, backed up, replicated, and auto-patched MySQL instances. Cloud
+SQL integrates with Google App Engine but can be used independently as well.
+
 
 Database resources
 ------------------

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-02-05T21:00:21Z</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-02-06T08:26:32Z</updated></feed>`