Skip to content

Commit 6d66a59

Browse files
mattmakaimattmakai
committed
fix typo on postgresql page
1 parent 705a503 commit 6d66a59

File tree

12 files changed

+66
-14
lines changed

12 files changed

+66
-14
lines changed

‎content/pages/08-web-app-deployment/06-virtual-private-servers.markdown‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
title: Virtual Private Servers (VPS)
2+
category: page
3+
slug: virtual-private-servers-vps
4+
sortorder: 0806
5+
toc: False
6+
sidebartitle: Virtual Private Servers
7+
meta: A virtual private server is a software-isolated portion of hardware run with a hypervisor on a physical server.
8+
9+
10+
# Virtual private servers (VPS)
11+
Virtual private servers (VPSs) are sandboxed slices of hardware run with a
12+
hypervisor running on top of a physical server. Virtualization software
13+
such as [Xen](http://www.xenproject.org/) and
14+
[VMWare](http://www.vmware.com/virtualization) allow a providers'
15+
customers to use fractions of a full server that appear as their own
16+
independent instances. For example, a server with an 8-core processor
17+
and 16 gigabytes of memory can be roughly virtualized into 8 pieces with
18+
the equivalent of 1-core and 2 gigabytes of memory.
19+
20+
The primary disadvantage of virtualized servers is that there is resource
21+
overhead in the virtualization process. But for our web application
22+
deployment, a single well-configured virtual private server provides
23+
more than enough performance and represents a huge cost savings over
24+
purchasing dedicated hardware.

‎content/pages/09-data/03-postgresql.markdown‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ meta: PostgreSQL is an open source relational database commonly used with Python
1111
[PostgreSQL](http://www.postgresql.org/), often written as "Postgres" and
1212
pronounced "Poss-gres", is an open source
1313
[relational database](/databases.html) implementation frequently used by
14-
Python applications as a backed for data storage and retrieval.
14+
Python applications as a backend for data storage and retrieval.
1515

1616
<img src="/img/logos/postgresql.jpg" width="100%" alt="PostgreSQL logo." class="technical-diagram" />
1717

‎static/img/170920-provision-ubuntu-linode/header.jpg‎

56 KB
Loading

‎static/img/170920-provision-ubuntu-linode/linode-landing-page.png‎

333 KB
Loading

‎static/img/170920-provision-ubuntu-linode/linode-sign-up.png‎

96.5 KB
Loading

‎static/img/logos/bash.png‎

8.98 KB
Loading

‎static/img/logos/foundation.jpg‎

33.6 KB
Loading

‎static/img/logos/materialize.png‎

11.9 KB
Loading

‎theme/templates/blog/provision-ubuntu-linux-servers-linode.html‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<a href="/servers.html" class="list-group-item smaller-item">Servers</a>
2+
<a href="/operating-systems.html" class="list-group-item smaller-item">Operating Systems</a>
3+
<a href="/ubuntu.html" class="list-group-item smaller-item">Ubuntu</a>
4+
<a href="/wsgi-servers.html" class="list-group-item smaller-item">Deployment</a>

‎theme/templates/choices/virtual-private-servers-vps.html‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<h3>What else do you want to learn about deployment?</h3>
2+
<div class="row">
3+
<div class="col-md-4">
4+
<div class="well select-next">
5+
{% include "choices/buttons/operating-systems.html" %}
6+
</div>
7+
</div>
8+
<div class="col-md-4">
9+
<div class="well select-next">
10+
{% include "choices/buttons/web-servers.html" %}
11+
</div>
12+
</div>
13+
<div class="col-md-4">
14+
<div class="well select-next">
15+
{% include "choices/buttons/platform-as-a-service.html" %}
16+
</div>
17+
</div>
18+
</div>

0 commit comments

Comments
 (0)