Skip to content

Commit 3eb2409

Browse files
mattmakaimattmakai
committed
improviing source control page to be clearer
1 parent f553cec commit 3eb2409

File tree

3 files changed

+25
-18
lines changed

3 files changed

+25
-18
lines changed

‎feeds/all.atom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
<?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-07-23T10:35:47Z</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-07-23T15:07:01Z</updated></feed>

‎source-control.html‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,21 +39,24 @@
3939
</div> <div class="row">
4040
<div class="col-md-8">
4141
<h1>Source control</h1>
42-
<p>Source control systems, also known as version control systems, store code
43-
and other static files, such as images, with a history of the changes made to
44-
those files.</p>
42+
<p>Source control, also known as <em>version control</em>, stores software code files
43+
with a detailed history of every modification made to those files.</p>
4544
<h2>Why is source control necessary?</h2>
4645
<p>Version control systems allow developers to modify code without worrying
4746
about permanently screwing something up. Unwanted changes can be easily rolled
48-
back. Developers can merge changes with other developer's code through
49-
<a href="http://en.wikipedia.org/wiki/Diff">diff</a> views. </p>
50-
<p>These benefits exist on all software projects. Therefore version control is
51-
a necessity regardless of time size or the programming ecosystem used. Every
47+
back to previous working versions of the code. </p>
48+
<p>Source control also makes team software development easier. One developer
49+
can combine her code modifications with other developers' code through
50+
<a href="http://en.wikipedia.org/wiki/Diff">diff</a> views that show line-by-line
51+
changes then merge the appropriate code into the main code branch.</p>
52+
<p>Version control is a necessity on all software projects regardless of
53+
development time, codebase size or the programming language used. Every
5254
project should immediately begin by using a version control system such
5355
as Git or Mercurial.</p>
54-
<p><img src="theme/img/app-source-control.png" width="100%" class="technical-diagram" alt="App deployment uses a server to pull from the source control system."></p>
56+
<h2>Source control during deployment</h2>
5557
<p>Pulling code during a deployment is a potential way source control systems fit
5658
into the deployment process. </p>
59+
<p><img src="theme/img/app-source-control.png" width="100%" class="technical-diagram" alt="App deployment uses a server to pull from the source control system."></p>
5760
<p>Note that some developers recommend deployment pipelines package the source
5861
code to deploy it and never have a production environment touch a source
5962
control system directly. However, for small scale deployments it's often

‎source/content/pages/03-deployment/0313-source-control.markdown‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,26 +17,30 @@ choice4text:
1717

1818

1919
# Source control
20-
Source control systems, also known as version control systems, store code
21-
and other static files, such as images, with a history of the changes made to
22-
those files.
20+
Source control, also known as *version control*, stores software code files
21+
with a detailed history of every modification made to those files.
2322

2423
## Why is source control necessary?
2524
Version control systems allow developers to modify code without worrying
2625
about permanently screwing something up. Unwanted changes can be easily rolled
27-
back. Developers can merge changes with other developer's code through
28-
[diff](http://en.wikipedia.org/wiki/Diff) views.
26+
back to previous working versions of the code.
2927

30-
These benefits exist on all software projects. Therefore version control is
31-
a necessity regardless of time size or the programming ecosystem used. Every
28+
Source control also makes team software development easier. One developer
29+
can combine her code modifications with other developers' code through
30+
[diff](http://en.wikipedia.org/wiki/Diff) views that show line-by-line
31+
changes then merge the appropriate code into the main code branch.
32+
33+
Version control is a necessity on all software projects regardless of
34+
development time, codebase size or the programming language used. Every
3235
project should immediately begin by using a version control system such
3336
as Git or Mercurial.
3437

35-
<img src="theme/img/app-source-control.png" width="100%" class="technical-diagram" alt="App deployment uses a server to pull from the source control system.">
36-
38+
## Source control during deployment
3739
Pulling code during a deployment is a potential way source control systems fit
3840
into the deployment process.
3941

42+
<img src="theme/img/app-source-control.png" width="100%" class="technical-diagram" alt="App deployment uses a server to pull from the source control system.">
43+
4044
Note that some developers recommend deployment pipelines package the source
4145
code to deploy it and never have a production environment touch a source
4246
control system directly. However, for small scale deployments it's often

0 commit comments

Comments
 (0)