Skip to content

Commit 7c17dab

Browse files
mattmakaimattmakai
committed
Updating operating system section.
1 parent 3844a55 commit 7c17dab

File tree

6 files changed

+32
-10
lines changed

6 files changed

+32
-10
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>2013-01-11T13:44:18Z</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>2013-01-11T14:03:11Z</updated></feed>

‎index.html‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -231,13 +231,19 @@ <h2>Ubuntu</h2>
231231
manager</a>. For desktop versions of Ubuntu,
232232
GNOME (until the 11.04 release) or Unity (11.10 through current)
233233
is added to the distribution to provide a user interface.</p>
234+
<p>Ubuntu <a class="reference external" href="https://wiki.ubuntu.com/LTS">Long Term Support (LTS)</a> releases
235+
are the recommended versions to use for deployments. LTS versions receive
236+
five years of post-release updates from Canonical. Every two years, Canonical
237+
creates a new LTS release, which allows for an easy upgrade path as well
238+
as flexibility in skipping every other LTS release if necessary.</p>
234239
</div>
235240
<div class="section" id="red-hat-and-centos">
236241
<h2>Red Hat and CentOS</h2>
237242
<p><a class="reference external" href="http://www.redhat.com/products/enterprise-linux/">Red Hat Enterprise Linux</a>
238-
(RHEL) and Community enterprise Operating
239-
System (CentOS) are essentially the same distribution. The key
240-
difference is that CentOS is an open source free derivative of RHEL.</p>
243+
(RHEL) and <a class="reference external" href="http://www.centos.org/">Community ENTerprise Operating System</a>
244+
(CentOS) are the same distribution. The only difference between the two
245+
(other than the name) is that CentOS is an open source, liberally
246+
licensed free derivative of RHEL.</p>
241247
<p>RHEL and CentOS use a different package manager and command-line interface
242248
from Debian-based Linux distributions: RPM Package Manager (RPM) and the
243249
Yellowdog Updater, Modified (YUM). RPM has a specific .rpm file format
@@ -430,6 +436,7 @@ <h1>Caching</h1>
430436
operations and serving the precomputed answers to clients.</p>
431437
<div class="section" id="caching-resources">
432438
<h2>Caching Resources</h2>
439+
<p><a class="reference external" href="http://memcached.org/">memcached</a> is a common in-memory caching system.</p>
433440
</div>
434441

435442
</section>

‎pages/caching.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ <h1>Caching</h1>
4949
operations and serving the precomputed answers to clients.</p>
5050
<div class="section" id="caching-resources">
5151
<h2>Caching Resources</h2>
52+
<p><a class="reference external" href="http://memcached.org/">memcached</a> is a common in-memory caching system.</p>
5253
</div>
5354

5455
<hr/>

‎pages/operating-system.html‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,19 @@ <h2>Ubuntu</h2>
6060
manager</a>. For desktop versions of Ubuntu,
6161
GNOME (until the 11.04 release) or Unity (11.10 through current)
6262
is added to the distribution to provide a user interface.</p>
63+
<p>Ubuntu <a class="reference external" href="https://wiki.ubuntu.com/LTS">Long Term Support (LTS)</a> releases
64+
are the recommended versions to use for deployments. LTS versions receive
65+
five years of post-release updates from Canonical. Every two years, Canonical
66+
creates a new LTS release, which allows for an easy upgrade path as well
67+
as flexibility in skipping every other LTS release if necessary.</p>
6368
</div>
6469
<div class="section" id="red-hat-and-centos">
6570
<h2>Red Hat and CentOS</h2>
6671
<p><a class="reference external" href="http://www.redhat.com/products/enterprise-linux/">Red Hat Enterprise Linux</a>
67-
(RHEL) and Community enterprise Operating
68-
System (CentOS) are essentially the same distribution. The key
69-
difference is that CentOS is an open source free derivative of RHEL.</p>
72+
(RHEL) and <a class="reference external" href="http://www.centos.org/">Community ENTerprise Operating System</a>
73+
(CentOS) are the same distribution. The only difference between the two
74+
(other than the name) is that CentOS is an open source, liberally
75+
licensed free derivative of RHEL.</p>
7076
<p>RHEL and CentOS use a different package manager and command-line interface
7177
from Debian-based Linux distributions: RPM Package Manager (RPM) and the
7278
Yellowdog Updater, Modified (YUM). RPM has a specific .rpm file format

‎source/content/pages/caching.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@ operations and serving the precomputed answers to clients.
1010

1111
Caching Resources
1212
-----------------
13+
`memcached <http://memcached.org/>`_ is a common in-memory caching system.
1314

‎source/content/pages/operating-system.rst‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,20 @@ manager <http://wiki.debian.org/Apt>`_. For desktop versions of Ubuntu,
2323
GNOME (until the 11.04 release) or Unity (11.10 through current)
2424
is added to the distribution to provide a user interface.
2525

26+
Ubuntu `Long Term Support (LTS) <https://wiki.ubuntu.com/LTS>`_ releases
27+
are the recommended versions to use for deployments. LTS versions receive
28+
five years of post-release updates from Canonical. Every two years, Canonical
29+
creates a new LTS release, which allows for an easy upgrade path as well
30+
as flexibility in skipping every other LTS release if necessary.
31+
2632

2733
Red Hat and CentOS
2834
------------------
2935
`Red Hat Enterprise Linux <http://www.redhat.com/products/enterprise-linux/>`_
30-
(RHEL) and Community enterprise Operating
31-
System (CentOS) are essentially the same distribution. The key
32-
difference is that CentOS is an open source free derivative of RHEL.
36+
(RHEL) and `Community ENTerprise Operating System <http://www.centos.org/>`_
37+
(CentOS) are the same distribution. The only difference between the two
38+
(other than the name) is that CentOS is an open source, liberally
39+
licensed free derivative of RHEL.
3340

3441
RHEL and CentOS use a different package manager and command-line interface
3542
from Debian-based Linux distributions: RPM Package Manager (RPM) and the

0 commit comments

Comments
 (0)