Skip to content

Commit 03aad28

Browse files
mattmakaimattmakai
committed
streamline table of contents
1 parent 4806055 commit 03aad28

18 files changed

+62
-195
lines changed

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

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,19 @@ control services are:
7474
[pricing](https://about.gitlab.com/pricing/) for businesses that need
7575
additional hosting support.
7676

77-
* [GitHub](https://github.com/) provides free open source repositories
78-
and paid private repositories for Git.
77+
* [GitHub](https://github.com) is a software-as-a-service platform that
78+
provides a user interface, tools and backup for developers to use with their
79+
[Git](/git.html) repositories. Accounts are free for public open source
80+
development and private Git repositories can also be hosted for
81+
[$7 per month](https://github.com/pricing).
7982

80-
* [BitBucket](https://bitbucket.org/) also has free Git and Mercurial
81-
repositories for open projects, but adds private repositories for up to
82-
five users. Users pay for hosting private repositories with more than
83-
five users.
83+
* [BitBucket](https://bitbucket.org/) is
84+
[Atlassian](https://www.atlassian.com/)'s software-as-a-service tool that
85+
with a user interface, comparison tools and backup for Git projects. There
86+
are many features in BitBucket focused on making it easier for groups of
87+
developers to work on projects together. BitBucket also has private
88+
repositories for up to five users. Users pay for hosting private
89+
repositories with more than five users.
8490

8591

8692
## General source control resources
@@ -125,6 +131,14 @@ and out of a centralized repository, which is a problem when using
125131
[a full page on Git](/git.html) with further details and resources.
126132

127133

134+
### GitHub resources
135+
* [A Beginner’s Git and GitHub Tutorial](http://blog.udacity.com/2015/06/a-beginners-git-github-tutorial.html)
136+
137+
* [Hello World: GitHub edition](https://guides.github.com/activities/hello-world/)
138+
139+
* [Git and GitHub learning resources](https://help.github.com/articles/git-and-github-learning-resources/)
140+
141+
128142
### Source control learning checklist
129143
1. Pick a version control system. Git is recommended because on the web there
130144
are a significant number of tutorials to help both new and advanced users.

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

Lines changed: 0 additions & 23 deletions
This file was deleted.

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

Lines changed: 0 additions & 27 deletions
This file was deleted.

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

Lines changed: 0 additions & 17 deletions
This file was deleted.

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

Lines changed: 0 additions & 17 deletions
This file was deleted.

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

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,6 @@ kept up to date with accurate descriptions and resources.
6868
|[Git](/git.html) | starter |
6969
|[Mercurial](/mercurial.html) | starter |
7070
|[Apache Subversion](/apache-subversion.html) | starter |
71-
|[Hosted source control](/hosted-source-control-services.html) | starter |
72-
|[GitHub](/github.html) | starter |
73-
|[BitBucket](/bitbucket.html) | starter |
74-
|[GitLab](/gitlab.html) | starter |
7571

7672

7773
## Chapter 3: Data
@@ -133,10 +129,6 @@ kept up to date with accurate descriptions and resources.
133129
|Database testing | not yet |
134130
|[Code metrics](/code-metrics.html) | starter |
135131
|[Debugging](/debugging.html) | starter |
136-
|pdb | not yet |
137-
|ipdb | not yet |
138-
|pudb | not yet |
139-
|wdb | not yet |
140132

141133

142134
## Chapter 5: Web App Deployment
@@ -153,10 +145,8 @@ kept up to date with accurate descriptions and resources.
153145
|Graphite | not yet |
154146
|Prometheus | not yet |
155147
|Service Canary | not yet |
156-
|Hosted Monitoring Services | not yet |
157148
|[Rollbar](/rollbar.html) | starter |
158149
|Sentry | not yet |
159-
|New Relic | not yet |
160150
|Scout | not yet |
161151
|Web App Performance | not yet |
162152
|[Caching](/caching.html) | starter |
@@ -169,5 +159,4 @@ kept up to date with accurate descriptions and resources.
169159
|[Web analytics](/web-analytics.html) | starter |
170160
|Google Analytics | not yet |
171161
|Piwik | not yet |
172-
|MixPanel | not yet |
173162

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -493,6 +493,5 @@ on their respective pages:
493493
* [Source control](/source-control.html)
494494
* [Git](/git.html)
495495
* [Hosted source control services](/hosted-source-control-services.html)
496-
* [GitHub](/github.html)
497496
* [Code metrics](/code-metrics.html)
498497
* [NoSQL](/no-sql-datastore.html)

‎redirects/bitbucket.html‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<meta http-equiv="refresh" content="0; url=https://www.fullstackpython.com/source-control.html">
5+
</head>
6+
<body>
7+
</body>
8+
</html>

‎redirects/github.html‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<meta http-equiv="refresh" content="0; url=https://www.fullstackpython.com/source-control.html">
5+
</head>
6+
<body>
7+
</body>
8+
</html>

‎redirects/gitlab.html‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<meta http-equiv="refresh" content="0; url=https://www.fullstackpython.com/source-control.html">
5+
</head>
6+
<body>
7+
</body>
8+
</html>

0 commit comments

Comments
 (0)