streamline table of contents

Author: mattmakai

content/pages/02-development-environments/20-source-control.markdown

@@ -74,13 +74,19 @@ control services are:
   [pricing](https://about.gitlab.com/pricing/) for businesses that need
   additional hosting support.
 
-* [GitHub](https://github.com/) provides free open source repositories 
-  and paid private repositories for Git.
+* [GitHub](https://github.com) is a software-as-a-service platform that 
+  provides a user interface, tools and backup for developers to use with their 
+  [Git](/git.html) repositories. Accounts are free for public open source 
+  development and private Git repositories can also be hosted for 
+  [$7 per month](https://github.com/pricing).
 
-* [BitBucket](https://bitbucket.org/) also has free Git and Mercurial 
-  repositories for open projects, but adds private repositories for up to 
-  five users. Users pay for hosting private repositories with more than 
-  five users.
+* [BitBucket](https://bitbucket.org/) is 
+  [Atlassian](https://www.atlassian.com/)'s software-as-a-service tool that 
+  with a user interface, comparison tools and backup for Git projects. There 
+  are many features in BitBucket focused on making it easier for groups of 
+  developers to work on projects together. BitBucket also has private 
+  repositories for up to five users. Users pay for hosting private 
+  repositories with more than five users.
 
 
 ## General source control resources
@@ -125,6 +131,14 @@ and out of a centralized repository, which is a problem when using
 [a full page on Git](/git.html) with further details and resources.
 
 
+### GitHub resources
+* [A Beginner’s Git and GitHub Tutorial](http://blog.udacity.com/2015/06/a-beginners-git-github-tutorial.html)
+
+* [Hello World: GitHub edition](https://guides.github.com/activities/hello-world/)
+
+* [Git and GitHub learning resources](https://help.github.com/articles/git-and-github-learning-resources/)
+
+
 ### Source control learning checklist
 1. Pick a version control system. Git is recommended because on the web there
    are a significant number of tutorials to help both new and advanced users.

content/pages/02-development-environments/24-hosted-version-control.markdown

@@ -68,10 +68,6 @@ kept up to date with accurate descriptions and resources.
 |[Git](/git.html)                                              | starter      |
 |[Mercurial](/mercurial.html)                                  | starter      |
 |[Apache Subversion](/apache-subversion.html)                  | starter      |
-|[Hosted source control](/hosted-source-control-services.html) | starter      |
-|[GitHub](/github.html)                                        | starter      |
-|[BitBucket](/bitbucket.html)                                  | starter      |
-|[GitLab](/gitlab.html)                                        | starter      |
 
 
 ## Chapter 3: Data
@@ -133,10 +129,6 @@ kept up to date with accurate descriptions and resources.
 |Database testing                                           | not yet      |
 |[Code metrics](/code-metrics.html)                         | starter      |
 |[Debugging](/debugging.html)                               | starter      |
-|pdb                                                        | not yet      |
-|ipdb                                                       | not yet      |
-|pudb                                                       | not yet      |
-|wdb                                                        | not yet      |
 
 
 ## Chapter 5: Web App Deployment
@@ -153,10 +145,8 @@ kept up to date with accurate descriptions and resources.
 |Graphite                                                    | not yet      |
 |Prometheus                                                  | not yet      |
 |Service Canary                                              | not yet      |
-|Hosted Monitoring Services                                  | not yet      |
 |[Rollbar](/rollbar.html)                                    | starter      |
 |Sentry                                                      | not yet      |
-|New Relic                                                   | not yet      |
 |Scout                                                       | not yet      |
 |Web App Performance                                         | not yet      |
 |[Caching](/caching.html)                                    | starter      |
@@ -169,5 +159,4 @@ kept up to date with accurate descriptions and resources.
 |[Web analytics](/web-analytics.html)                        | starter      |
 |Google Analytics                                            | not yet      |
 |Piwik                                                       | not yet      |
-|MixPanel                                                    | not yet      |
 

content/pages/02-development-environments/25-github.markdown

@@ -493,6 +493,5 @@ on their respective pages:
 * [Source control](/source-control.html)
 * [Git](/git.html)
 * [Hosted source control services](/hosted-source-control-services.html)
-* [GitHub](/github.html)
 * [Code metrics](/code-metrics.html)
 * [NoSQL](/no-sql-datastore.html)

content/pages/02-development-environments/26-bitbucket.markdown

@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="refresh" content="0; url=https://www.fullstackpython.com/source-control.html">
+</head>
+<body>
+</body>
+</html>

content/pages/02-development-environments/27-gitlab.markdown

@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="refresh" content="0; url=https://www.fullstackpython.com/source-control.html">
+</head>
+<body>
+</body>
+</html>

content/pages/meta/04-page-statuses.markdown

@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="refresh" content="0; url=https://www.fullstackpython.com/source-control.html">
+</head>
+<body>
+</body>
+</html>

content/posts/171101-continuous-delivery-devops-you.markdown

@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="refresh" content="0; url=https://www.fullstackpython.com/source-control.html">
+</head>
+<body>
+</body>
+</html>

redirects/bitbucket.html

@@ -13,5 +13,4 @@
 <a href="/source-control.html" class="lgi">Source control</a>
 <a href="/git.html" class="lgi">Git</a>
 <a href="/hosted-source-control-services.html" class="lgi">Hosted source control services</a>
-<a href="/github.html" class="lgi">GitHub</a>
 <a href="/code-metrics.html" class="lgi">Code metrics</a>

redirects/github.html

@@ -1,5 +1,5 @@
 <a href="/source-control.html" class="lgi">Source control</a>
 <a href="/git.html" class="lgi">Git</a>
-<a href="/github.html" class="lgi">GitHub</a>
+<a href="https://github.com/" class="lgi">GitHub {% include "blog/external-link.html" %}</a>
 <a href="http://gitpython.readthedocs.io/en/stable/index.html" class="lgi">Official GitPython Docs {% include "blog/external-link.html" %}</a>
 <a href="https://github.com/fullstackpython/blog-code-examples/tree/master/first-steps-gitpython" class="lgi">Code for this post {% include "blog/external-link.html" %}</a>

redirects/gitlab.html

@@ -53,10 +53,6 @@ <h4>2.5 <a href="/source-control.html">Source Control</a></h4>
 <div class="tc"><a href="/git.html">Git</a></div>
 <div class="tc"><a href="/mercurial.html">Mercurial</a></div>
 <div class="tc"><a href="/apache-subversion.html">Apache Subversion</a></div>
-<h4>2.6 <a href="/hosted-source-control-services.html">Hosted Source Control Services</a></h4>
-<div class="tc"><a href="/github.html">GitHub</a></div>
-<div class="tc"><a href="/bitbucket.html">BitBucket</a></div>
-<div class="tc"><a href="/gitlab.html">GitLab</a></div>
 
 <h3>3. <a href="/data.html">Data</a></h3>
 <h4>3.1 <a href="/databases.html">Relational databases</a></h4>
@@ -130,28 +126,25 @@ <h4>4.8 <a href="/testing.html">Testing</a></h4>
 <div class="tc"><a href="/unit-testing.html">Unit testing</a></div>
 <div class="tc"><a href="/integration-testing.html">Integration testing</a></div>
 <div class="tc sn">Database testing</div>
+<div class="tc"><a href="/debugging.html">Debugging</a></div>
 <div class="tc"><a href="/code-metrics.html">Code Metrics</a></div>
-<h4>4.9 <a href="/debugging.html">Debugging</a></h4>
-<div class="tc sn">pdb</div>
-<div class="tc sn">ipdb</div>
-<div class="tc sn">wdb</div>
-<h4>4.10 <span class="sn">Networking</span></h4>
-<div class="tc tds"><a href="/https.html">HTTPS</a></div>
-<div class="tc tds"><a href="/websockets.html">WebSockets</a></div>
-<div class="tc tds sn">WebRTC</div>
-<h4>4.11 <a href="/application-programming-interfaces.html">Web APIs</a></h4>
+<h4>4.9 <span class="sn">Networking</span></h4>
+<div class="tc"><a href="/https.html">HTTPS</a></div>
+<div class="tc"><a href="/websockets.html">WebSockets</a></div>
+<div class="tc sn">WebRTC</div>
+<h4>4.10 <a href="/application-programming-interfaces.html">Web APIs</a></h4>
 <div class="tc tds"><a href="/microservices.html">Microservices</a></div>
 <div class="tc tds sn">Webhooks</div>
 <div class="tc tds"><a href="/bots.html">Bots</a></div>
-<h4>4.12 <a href="/api-creation.html">API creation</a></h4>
+<h4>4.11 <a href="/api-creation.html">API creation</a></h4>
 <div class="tc tds sn">Django REST Framework</div>
 <div class="tc tds sn">Flask-RESTful</div>
 <div class="tc tds sn">API Star</div>
-<h4>4.13 <a href="/api-integration.html">API integration</a></h4>
+<h4>4.12 <a href="/api-integration.html">API integration</a></h4>
 <div class="tc tds"><a href="/twilio.html">Twilio</a></div>
 <div class="tc tds sn">Stripe</div>
 <div class="tc tds sn">Slack</div>
-<h4>4.14 <a href="/web-application-security.html">Web application security</a></h4>
+<h4>4.13 <a href="/web-application-security.html">Web application security</a></h4>
 <div class="tc tds sn">Public key infrastructure</div>
 <div class="tc tds sn">SQL injection</div>
 <div class="tc tds sn">Cross Site Request Forgery</div>
@@ -211,10 +204,8 @@ <h4>6.1 <a href="/monitoring.html">Monitoring</a></h4>
 <div class="tc sn">Graphite</div>
 <div class="tc sn">Prometheus</div>
 <div class="tc sn">Service Canary</div>
-<h4>6.2 <span class="sn">Hosted Monitoring Services</span></h4>
 <div class="tc"><a href="/rollbar.html">Rollbar</a></div>
 <div class="tc sn">Sentry</div>
-<div class="tc sn">New Relic</div>
 <div class="tc sn">Scout</div>
 <h4>6.3 <span class="sn">Web App Performance</span></h4>
 <div class="tc"><a href="/caching.html">Caching</a></div>
@@ -227,7 +218,6 @@ <h4>6.4 <a href="/logging.html">Logging</a></h4>
 <h4>6.5 <a href="/web-analytics.html">Web Analytics</a></h4>
 <div class="tc sn">Google Analytics</div>
 <div class="tc sn">Piwik</div>
-<div class="tc sn">MixPanel</div>
 </div>
 </div>
 <br>