Merge lp:~raoul-snyman/ubuntu-za/ubuntu-blurb into lp:ubuntu-za

[Raoul Snyman]

Add a blurb about Ubuntu and a link to the main site

[lp:~raoul-snyman/ubuntu-za/ubuntu-blurb]

17. By Raoul Snyman on 2015-02-04

Some minor clarification on the Ubuntu blurb

[Gustav H Meyer (inetpro)]

review: Approve

=== added file 'files/ubuntu-logo-140x140.png'
Binary files files/ubuntu-logo-140x140.png	1970-01-01 00:00:00 +0000 and files/ubuntu-logo-140x140.png	2015-02-04 19:11:36 +0000 differ
=== modified file 'pages/index.rst'
--- pages/index.rst	2015-02-04 08:37:48 +0000
+++ pages/index.rst	2015-02-04 19:11:36 +0000
@@ -21,10 +21,10 @@
     <div class="container marketing">
     <div class="row">
     <div class="col-lg-4">
-    <img class="img-circle" src="data:image/gif;base64,R0lGODlhAQABAIAAAHd3dwAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==" alt="Generic placeholder image" style="width: 140px; height: 140px;">
-    <h2>Heading</h2>
-    <p>Donec sed odio dui. Etiam porta sem malesuada magna mollis euismod. Nullam id dolor id nibh ultricies vehicula ut id elit. Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Praesent commodo cursus magna.</p>
-    <p><a class="btn btn-primary" href="#" role="button">View details &raquo;</a></p>
+    <img class="img-circle" src="/ubuntu-logo-140x140.png" alt="Ubuntu Linux">
+    <h2>What is Ubuntu?</h2>
+    <p>Ubuntu is an open source operating system built around the Linux kernel. Ubuntu is a community developed, Linux-based operating system that is perfect for laptops, desktops and servers. It contains most of the applications you need - a web browser, presentation, document and spreadsheet software, instant messaging and much more.</p>
+    <p><a class="btn btn-primary" href="http://www.ubuntu.com/" role="button">Learn more <i class="fa fa-external-link fa-fw"></i></a></p>
     </div><!-- /.col-lg-4 -->
     <div class="col-lg-4">
     <img class="img-circle" src="data:image/gif;base64,R0lGODlhAQABAIAAAHd3dwAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==" alt="Generic placeholder image" style="width: 140px; height: 140px;">