Skip to content

Commit 2f692fc

Browse files
mattmakaimattmakai
committed
Updating OS section.
1 parent bda700f commit 2f692fc

File tree

6 files changed

+34
-12
lines changed

6 files changed

+34
-12
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>2012-12-30T14:05:32Z</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-02T11:36:13Z</updated></feed>

‎index.html‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,8 @@ <h2>Server Resources</h2>
186186
</section>
187187
<section id="operating-system" class="tech-section">
188188
<h1>Operating System</h1>
189-
<p>The operating system sits directly on top of the server or virtual server
190-
and provides access to computing resources. The only operating
189+
<p>The operating system runs on top of the server or virtual server
190+
and controls access to computing resources. The only operating
191191
system I can recommend for production Python web stack deployments is
192192
a flavor of Linux. Ubuntu Long Term Support (LTS) releases, Red Hat
193193
Enterprise Linux, and CentOS are all viable options.</p>
@@ -204,9 +204,15 @@ <h2>Ubuntu</h2>
204204
</div>
205205
<div class="section" id="red-hat-and-centos">
206206
<h2>Red Hat and CentOS</h2>
207-
<p>Red Hat Enterprise Linux (RHEL) and Community enterprise Operating
207+
<p><a class="reference external" href="http://www.redhat.com/products/enterprise-linux/">Red Hat Enterprise Linux</a>
208+
(RHEL) and Community enterprise Operating
208209
System (CentOS) are essentially the same distribution. The key
209210
difference is that CentOS is an open source free derivative of RHEL.</p>
211+
<p>RHEL and CentOS use a different package manager and command-line interface
212+
from Debian-based Linux distributions: RPM Package Manager (RPM) and the
213+
Yellowdog Updater, Modified (YUM). RPM has a specific .rpm file format
214+
to handle the packaging and installation of libraries and applications. YUM
215+
provides a command-line interface for interacting with the RPM system.</p>
210216
</div>
211217

212218
</section>
@@ -342,7 +348,8 @@ <h2>Web Analytics Resources</h2>
342348
</section>
343349
<section id="change-log" class="tech-section">
344350
<h1>Change Log</h1>
345-
<p>2012.12.30: Updated introduction with improved wording. Working on CDN section. Added very basic database content and removed stub from that section.</p>
351+
<p>2013.01.02: Minor updates to OS section.</p>
352+
<p>2012.12.30: Updated introduction with improved wording. Working on CDN section. Added very basic database content and removed stub from that section.</p>
346353
<p>2012.12.27: Added beginning of section on Python web frameworks. Added stub for content delivery network.</p>
347354
<p>2012.12.25: Initial incomplete release on fullstackpython.com.</p>
348355

‎pages/change-log.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@
4545
<h1>Change Log</h1>
4646

4747

48-
<p>2012.12.30: Updated introduction with improved wording. Working on CDN section. Added very basic database content and removed stub from that section.</p>
48+
<p>2013.01.02: Minor updates to OS section.</p>
49+
<p>2012.12.30: Updated introduction with improved wording. Working on CDN section. Added very basic database content and removed stub from that section.</p>
4950
<p>2012.12.27: Added beginning of section on Python web frameworks. Added stub for content delivery network.</p>
5051
<p>2012.12.25: Initial incomplete release on fullstackpython.com.</p>
5152

‎pages/operating-system.html‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
<h1>Operating System</h1>
4646

4747

48-
<p>The operating system sits directly on top of the server or virtual server
49-
and provides access to computing resources. The only operating
48+
<p>The operating system runs on top of the server or virtual server
49+
and controls access to computing resources. The only operating
5050
system I can recommend for production Python web stack deployments is
5151
a flavor of Linux. Ubuntu Long Term Support (LTS) releases, Red Hat
5252
Enterprise Linux, and CentOS are all viable options.</p>
@@ -63,9 +63,15 @@ <h2>Ubuntu</h2>
6363
</div>
6464
<div class="section" id="red-hat-and-centos">
6565
<h2>Red Hat and CentOS</h2>
66-
<p>Red Hat Enterprise Linux (RHEL) and Community enterprise Operating
66+
<p><a class="reference external" href="http://www.redhat.com/products/enterprise-linux/">Red Hat Enterprise Linux</a>
67+
(RHEL) and Community enterprise Operating
6768
System (CentOS) are essentially the same distribution. The key
6869
difference is that CentOS is an open source free derivative of RHEL.</p>
70+
<p>RHEL and CentOS use a different package manager and command-line interface
71+
from Debian-based Linux distributions: RPM Package Manager (RPM) and the
72+
Yellowdog Updater, Modified (YUM). RPM has a specific .rpm file format
73+
to handle the packaging and installation of libraries and applications. YUM
74+
provides a command-line interface for interacting with the RPM system.</p>
6975
</div>
7076

7177
<hr/>

‎source/content/pages/change-log.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ Change Log
55
:slug: change-log
66
:sort-order: 10
77

8+
2013.01.02: Minor updates to OS section.
9+
810
2012.12.30: Updated introduction with improved wording. Working on CDN section. Added very basic database content and removed stub from that section.
911

1012
2012.12.27: Added beginning of section on Python web frameworks. Added stub for content delivery network.

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ Operating System
55
:slug: operating-system
66
:sort-order: 03
77

8-
The operating system sits directly on top of the server or virtual server
9-
and provides access to computing resources. The only operating
8+
The operating system runs on top of the server or virtual server
9+
and controls access to computing resources. The only operating
1010
system I can recommend for production Python web stack deployments is
1111
a flavor of Linux. Ubuntu Long Term Support (LTS) releases, Red Hat
1212
Enterprise Linux, and CentOS are all viable options.
@@ -26,7 +26,13 @@ is added to the distribution to provide a user interface.
2626

2727
Red Hat and CentOS
2828
------------------
29-
Red Hat Enterprise Linux (RHEL) and Community enterprise Operating
29+
`Red Hat Enterprise Linux <http://www.redhat.com/products/enterprise-linux/>`_
30+
(RHEL) and Community enterprise Operating
3031
System (CentOS) are essentially the same distribution. The key
3132
difference is that CentOS is an open source free derivative of RHEL.
3233

34+
RHEL and CentOS use a different package manager and command-line interface
35+
from Debian-based Linux distributions: RPM Package Manager (RPM) and the
36+
Yellowdog Updater, Modified (YUM). RPM has a specific .rpm file format
37+
to handle the packaging and installation of libraries and applications. YUM
38+
provides a command-line interface for interacting with the RPM system.

0 commit comments

Comments
 (0)