Merge lp:~bradputzier/ubuntu-za/getting-started into lp:ubuntu-za

Proposed by Bradley Putzier
Status: Merged
Merged at revision: 21
Proposed branch: lp:~bradputzier/ubuntu-za/getting-started
Merge into: lp:ubuntu-za
Diff against target: 106 lines (+86/-0)
3 files modified
conf.py (+1/-0)
pages/getting-started.rst (+57/-0)
pages/poll.rst (+28/-0)
To merge this branch: bzr merge lp:~bradputzier/ubuntu-za/getting-started
Reviewer Review Type Date Requested Status
Gustav H Meyer Approve
Review via email: mp+250530@code.launchpad.net

Description of the change

Added the "getting-started" page for review. Includes a poll for some feedback.

Again, no offence if this is not considered necessary. I enjoyed learning how to put it together.

To post a comment you must log in.
Revision history for this message
Gustav H Meyer (inetpro) wrote :

Looks good to me

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'conf.py'
2--- conf.py 2015-02-04 18:24:30 +0000
3+++ conf.py 2015-02-21 13:14:24 +0000
4@@ -112,6 +112,7 @@
5 NAVIGATION_LINKS = {
6 DEFAULT_LANG: [
7 ('/index.html', 'Home'),
8+ ('/getting-started.html', 'Getting Started'),
9 ('/getting-involved.html', 'Getting Involved'),
10 ('/irc.html', 'IRC Channel'),
11 (
12
13=== added file 'pages/getting-started.rst'
14--- pages/getting-started.rst 1970-01-01 00:00:00 +0000
15+++ pages/getting-started.rst 2015-02-21 13:14:24 +0000
16@@ -0,0 +1,57 @@
17+.. title: Getting Started
18+.. slug: getting-started
19+.. date: 2014-12-18 20:58:59 UTC+02:00
20+.. tags:
21+.. link:
22+.. description:
23+.. type: text
24+
25+Getting started with Ubuntu_ has never been easier. Whether you are
26+wanting to get a few more years of good use out of an older piece of
27+hardware or are looking for a great secure and safe operating system to
28+use as your day to day workhorse, Ubuntu_ can meet your needs.
29+
30+Getting started involves a few steps, namely:
31+
32+- Choose your distribution and download it
33+- Burn the distribution to DVD or to a USB Thumb Drive
34+- Boot your computer from the DVD or Thumb Drive and follow the on-screen instructions
35+
36+Choose your distribution
37+------------------------
38+
39+You may be wondering "What is a distribution?". Simply put, it is a compilation of different software and in particular,
40+a different graphical interface and user experience. Many people have their views on the best distribution and interface, but
41+at the end of the day, it comes down to your personal preference. Some distributions work best on more modern hardware, while
42+others will run on outdated hardware.
43+
44+Ubuntu has a default Ubuntu distribution, however, many Ubuntu based distributions exist. Even Ubuntu is a distribution,
45+being based on Debian_ .
46+
47+Choose the distribution_ that suits your needs and hardware and let us know `your choice </poll.html>`_!
48+
49+Burn a DVD or make a bootable flash drive
50+-----------------------------------------
51+
52+Depending on your hardware, a DVD or usb flash drive may be used to install.
53+
54+Instructions on setting these up can be found in the links below. Remember, if you need help, just ask on
55+our `IRC </irc.html>`_! channel.
56+
57+`General Installations`_
58+
59+`Burning a DVD`_
60+
61+`Making a Bootable USB Drive`_
62+
63+Have fun with your new operating system
64+---------------------------------------
65+Now that things are installed, start having fun. `Get involved </getting-involved.html>`_! in the community or just come and
66+`say hello </irc.html>`_!.
67+
68+.. _Ubuntu : https://www.ubuntu.com
69+.. _Debian : http://www.debian.org
70+.. _distribution : http://www.ubuntu.com/about/about-ubuntu/flavours
71+.. _Burning a DVD : https://help.ubuntu.com/community/BurningIsoHowto
72+.. _General Installations : https://help.ubuntu.com/community/Installation
73+.. _Making a Bootable USB Drive : https://help.ubuntu.com/community/Installation/FromUSBStick
74
75=== added file 'pages/poll.rst'
76--- pages/poll.rst 1970-01-01 00:00:00 +0000
77+++ pages/poll.rst 2015-02-21 13:14:24 +0000
78@@ -0,0 +1,28 @@
79+.. title: Poll
80+.. slug: poll
81+.. date: 2014-12-18 20:58:59 UTC+02:00
82+.. tags:
83+.. link:
84+.. description:
85+.. type: text
86+
87+.. raw:: html
88+
89+ <div class="row text-center">
90+ <div class="col-md-3">&nbsp;</div>
91+ <div class="col-md-6 well">
92+ <p><strong>Share your choice with us </strong></p>
93+ <iframe src="http://strawpoll.me/embed_1/3695197" style="width: 550px; height: 610px; border: 0;">Loading poll...</iframe>
94+ </div>
95+ <div class="col-md-3">&nbsp;</div>
96+ </div>
97+.. raw:: html
98+
99+ <div class="row text-center">
100+ <div class="col-md-3">&nbsp;</div>
101+ <div class="col-md-6 well">
102+ <p><strong>What others are using </strong></p>
103+ <iframe src="http://strawpoll.me/embed_1/3695197/r" style="width: 550px; height: 610px; border: 0;">Loading poll...</iframe>
104+ </div>
105+ <div class="col-md-3">&nbsp;</div>
106+ </div>

Subscribers

People subscribed via source and target branches