Skip to content

Commit 92096b8

Browse files
mattmakaimattmakai
committed
adding a link to mercurial
1 parent b9cf0f6 commit 92096b8

File tree

4 files changed

+14
-7
lines changed

4 files changed

+14
-7
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-01-24T09:48:43Z</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-01-25T13:45:52Z</updated></feed>

‎index.html‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -609,13 +609,15 @@ <h2>Monitoring Resources</h2>
609609
</section>
610610
<section id="source-control" class="tech-section">
611611
<h1>Source Control</h1>
612-
<p>Source control systems (also known as version control systems) store code
613-
and other files, such as images, with a history of the changes made to
612+
<p>Source control systems, also known as version control systems, store code
613+
and other static files, such as images, with a history of the changes made to
614614
those files.</p>
615615
<div class="section" id="source-control-systems">
616616
<h2>Source Control Systems</h2>
617617
<p><a class="reference external" href="http://git-scm.com/">Git</a> is a free and open source distributed version
618618
control system.</p>
619+
<p><a class="reference external" href="http://mercurial.selenic.com/">Mercurial</a> is similar to Git, also a free
620+
and open source distributed version control system.</p>
619621
</div>
620622
<div class="section" id="source-control-third-party-services">
621623
<h2>Source Control Third Party Services</h2>

‎pages/source-control.html‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,15 @@
4848
<h1>Source Control</h1>
4949

5050

51-
<p>Source control systems (also known as version control systems) store code
52-
and other files, such as images, with a history of the changes made to
51+
<p>Source control systems, also known as version control systems, store code
52+
and other static files, such as images, with a history of the changes made to
5353
those files.</p>
5454
<div class="section" id="source-control-systems">
5555
<h2>Source Control Systems</h2>
5656
<p><a class="reference external" href="http://git-scm.com/">Git</a> is a free and open source distributed version
5757
control system.</p>
58+
<p><a class="reference external" href="http://mercurial.selenic.com/">Mercurial</a> is similar to Git, also a free
59+
and open source distributed version control system.</p>
5860
</div>
5961
<div class="section" id="source-control-third-party-services">
6062
<h2>Source Control Third Party Services</h2>

‎source/content/pages/source-control.rst‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ Source Control
55
:slug: source-control
66
:sort-order: 11
77

8-
Source control systems (also known as version control systems) store code
9-
and other files, such as images, with a history of the changes made to
8+
Source control systems, also known as version control systems, store code
9+
and other static files, such as images, with a history of the changes made to
1010
those files.
1111

1212

@@ -15,6 +15,9 @@ Source Control Systems
1515
`Git <http://git-scm.com/>`_ is a free and open source distributed version
1616
control system.
1717

18+
`Mercurial <http://mercurial.selenic.com/>`_ is similar to Git, also a free
19+
and open source distributed version control system.
20+
1821

1922
Source Control Third Party Services
2023
-----------------------------------

0 commit comments

Comments
 (0)