Merge lp:~prysdieheer/ubuntu-africa/starting-pages into lp:ubuntu-africa

Proposed by Ashton van Niekerk on 2015-04-08
Status: Merged
Merged at revision: 4
Proposed branch: lp:~prysdieheer/ubuntu-africa/starting-pages
Merge into: lp:ubuntu-africa
Diff against target: 204 lines (+184/-0)
3 files modified
pages/chat-with-us.rst (+19/-0)
pages/get-ubuntu.rst (+86/-0)
pages/join-us.rst (+79/-0)
To merge this branch: bzr merge lp:~prysdieheer/ubuntu-africa/starting-pages
Reviewer Review Type Date Requested Status
Gustav H Meyer Approve on 2015-04-09
Raoul Snyman 2015-04-08 Approve on 2015-04-09
Review via email: mp+255571@code.launchpad.net

Description of the Change

Used the bzr add thing this time.

To post a comment you must log in.
review: Approve
Gustav H Meyer (inetpro) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'files/african-map.png'
2Binary files files/african-map.png 1970-01-01 00:00:00 +0000 and files/african-map.png 2015-04-08 19:59:46 +0000 differ
3=== added file 'files/community.png'
4Binary files files/community.png 1970-01-01 00:00:00 +0000 and files/community.png 2015-04-08 19:59:46 +0000 differ
5=== added file 'files/ubuntu-logo-140x140.png'
6Binary files files/ubuntu-logo-140x140.png 1970-01-01 00:00:00 +0000 and files/ubuntu-logo-140x140.png 2015-04-08 19:59:46 +0000 differ
7=== added file 'pages/chat-with-us.rst'
8--- pages/chat-with-us.rst 1970-01-01 00:00:00 +0000
9+++ pages/chat-with-us.rst 2015-04-08 19:59:46 +0000
10@@ -0,0 +1,19 @@
11+.. title: Chat with us.
12+.. slug: chat-with-us
13+.. date: 2015-03-24 16:11:07 UTC
14+.. tags:
15+.. category:
16+.. link:
17+.. description:
18+.. type: text
19+
20+
21+.. raw:: html
22+
23+ <p>You can talk to us on <a href="https://freenode.net/" target="_blank">freenode</a> by using your favourite IRC client. Join the channel <a href="irc://irc.freenode.net/ubuntu-africa" target="_blank">#ubuntu-africa</a>. Alternatively you can use the webclient bellow. Enter the Captha and after connecting to out channel you can change you nickname by typing /nick your_nick.</p>
24+
25+ <br />
26+ <iframe src="//webchat.freenode.net?randomnick=1&channels=%23ubuntu-africa&uio=OT10cnVlJjExPTMxf2" width="100%" height="600" border=1></iframe>
27+
28+.. _freenode : https://freenode.net/
29+.. _#ubuntu-africa : irc://irc.freenode.net/ubuntu-africa
30
31=== added file 'pages/get-ubuntu.rst'
32--- pages/get-ubuntu.rst 1970-01-01 00:00:00 +0000
33+++ pages/get-ubuntu.rst 2015-04-08 19:59:46 +0000
34@@ -0,0 +1,86 @@
35+.. title: Get Ubuntu!
36+.. slug: get-ubuntu
37+.. date: 2015-03-24 19:23:32 UTC
38+.. tags:
39+.. category:
40+.. link:
41+.. description:
42+.. type: text
43+
44+Ubuntu is a the most popular free and opensource operating system in the world! It is user friendly and packed with features. You get to choose from many different flavours to fit your needs.
45+
46+Step 1: Choose a flavour.
47+-------------------------
48+Every flavour of Ubuntu has it's own user interface to cater for the needs of various users. The flavour you chose will be determined by your needs and preferences.
49+
50+|Ubuntu| is the flagship flavour of Ubuntu. It uses a modern User Interface, with the focus on ease of use. Perfect for beginners.
51+
52+|Kubuntu| is Ubuntu using the KDE interface which is a more tradition User Interface. Perfect if you prefer a traditional desktop experience.
53+
54+|Edubuntu| is the same as Ubuntu with unity but includes educational software for kids of all ages. Perfect for classrooms, students and teachers.
55+
56+|Xubuntu| and |Lubuntu| are lightweight versions of Ubuntu running on the XFCE and LXDE desktop environments respectively. Lubuntu is even more lightweight than Xubuntu, but packs fewer features. Perfect for older computers.
57+
58+|Ubuntu GNOME| uses, like Ubuntu (unity), a modern User Interface aimed at ease of use. Perfect for users who want a modern UI, but do not like Unity.
59+
60+|Ubuntu MATE| uses the MATE User Interface which is based on the old GNOME 2 interface. Perfect for users who prefer GNOME 2 over Unity.
61+
62+More on flavours |flavours|.
63+
64+Step 2: Make a disk or bootable flash drive and install.
65+--------------------------------------------------------
66+Once you have downloaded the flavour you want, |burn the image| to a CD/DVD or |make a bootable flash drive|. Then just boot from the CD/DVD and follow the on-screen instructions to install!
67+
68+Also see the |Ubuntu installation guide|.
69+
70+Step 3: Enjoy!
71+--------------
72+That's It! You can now use Ubuntu and install any programs you want from the Software Center.
73+
74+Once you are done, `come say hello`_!
75+
76+.. |Ubuntu| raw:: html
77+
78+ <a href="http://www.ubuntu.com/download/desktop/" target="_blank">Ubuntu (unity)</a>
79+
80+.. |Kubuntu| raw:: html
81+
82+ <a href="http://www.kubuntu.org/" target="_blank">Kubuntu</a>
83+
84+.. |Edubuntu| raw:: html
85+
86+ <a href="http://www.edubuntu.org/" target="_blank">Edubuntu</a>
87+
88+.. |Xubuntu| raw:: html
89+
90+ <a href="http://xubuntu.org/" target="_blank">Xubuntu</a>
91+
92+.. |Lubuntu| raw:: html
93+
94+ <a href="https://wiki.ubuntu.com/Lubuntu" target="_blank">Lubuntu</a>
95+
96+.. |Ubuntu GNOME| raw:: html
97+
98+ <a href="http://ubuntugnome.org/" target="_blank">Ubuntu GNOME</a>
99+
100+.. |Ubuntu MATE| raw:: html
101+
102+ <a href="https://ubuntu-mate.org/" target="_blank">Ubuntu MATE</a>
103+
104+.. |flavours| raw:: html
105+
106+ <a href="http://www.ubuntu.com/about/about-ubuntu/flavours" target="_blank">here</a>
107+
108+.. |burn the image| raw:: html
109+
110+ <a href="https://help.ubuntu.com/community/BurningIsoHowto" target="_blank">burn the image</a>
111+
112+.. |make a bootable flash drive| raw:: html
113+
114+ <a href="https://help.ubuntu.com/community/Installation/FromUSBStick" target="_blank">make a bootable flash drive</a>
115+
116+.. |Ubuntu installation guide| raw:: html
117+
118+ <a href="https://help.ubuntu.com/community/Installation" target="_blank">Ubuntu installation guide</a>
119+
120+.. _come say hello: chat-with-us.html
121
122=== added file 'pages/join-us.rst'
123--- pages/join-us.rst 1970-01-01 00:00:00 +0000
124+++ pages/join-us.rst 2015-04-08 19:59:46 +0000
125@@ -0,0 +1,79 @@
126+.. title: Join Ubuntu Africa!
127+.. slug: join-us
128+.. date: 2015-03-24 16:10:37 UTC
129+.. tags:
130+.. category:
131+.. link:
132+.. description: Help make
133+.. type: text
134+
135+Why Join?
136+=========
137+Change the world!
138+-----------------
139+That is right! By being part of the Ubuntu community you are helping to make the world (and Africa in particular) a better place! Free and open source Software like Ubuntu, give to humanity without asking anything in return. By joining us you are helping us spread this gift to humanity.
140+
141+Give meaning to your life.
142+--------------------------
143+The philosophy of Ubuntu states that we are what we are through what we are to others. In other words, our life finds its meaning in what we do to and for our fellow humans. By joining the Ubuntu community you will be doing a lot for your fellow human beings and as a result, a lot of meaning to your life.
144+
145+Make a lot of friends!
146+----------------------
147+The Ubuntu Africa community consists of very friendly and helpful members who share your interests. By working with them you will make a lot of new friends.
148+
149+The whole is more than the sum of its parts.
150+---------------------------------------------
151+By cooperating, individuals and local communities can do more than by working alone. One person's strength might be another person's weakness. For example: Let's say you are good at programming, but not as good with design. Someone else in the group may be better with design, but not as good with programming. Working together you are more than 4 times as productive!
152+
153+If you are already part of a local Ubuntu community, all of the above might still apply to you. Ubuntu Africa stretches the borders of your community.
154+
155+Who may join?
156+=============
157+Anyone using Ubuntu (or any of it's flavours) may join the community. If you do not yet have Ubuntu, `get it here`_. Ubuntu Africa of course concentrates on the African community, but anyone is free to join if they feel like helping us out.
158+
159+How to join?
160+============
161+There are many ways you can join Ubuntu Africa!
162+
163+If you are already part of an African LoCo simply `start chatting with us`_. Also see if your LoCo is listed on |wiki_link|. If not, please add the details of your Loco.
164+
165+If you you are not yet part of a community, `come say hello`_, and we'll get you started. Also consider joining |Launchpad|. From Launchpad you will be able to help with any one of thousands of projects! You can help with design, coding, bug-reports, technical support and even by translating software into your own language!
166+
167+A wonderful way of showing your involvement is by signing the |conduct|. By signing the code of conduct you agree to treat other people with respect.
168+
169+Finally you may consider becoming an |member|. This is not necessary to be part of the Ubuntu Africa community, but there are some awesome benefits in joining.
170+
171+How can I help?
172+=================
173+In addition to the many ways you can help on Launchpad, you can also help by:
174+
175+* Adding ideas and enthusiasm to meetings.
176+
177+* Spreading the word of Ubuntu and helping people use it.
178+
179+* Giving technical support on the `IRC channel`_.
180+
181+* Simply keeping us company on the `IRC channel`_.
182+
183+.. Links
184+.. _get it here: get-ubuntu.html
185+.. _start chatting with us: chat-with-us.html
186+.. |wiki_link| raw:: html
187+
188+ <a href="https://wiki.ubuntu.com/AfricanTeams" target="_blank">on our wikipage</a>
189+
190+.. _come say hello: chat-with-us.html
191+.. |Launchpad| raw:: html
192+
193+ <a href="https://launchpad.net/" target="_blank">Launchpad</a>
194+
195+.. |conduct| raw:: html
196+
197+ <a href="https://launchpad.net/codeofconduct" target="_blank">Ubuntu Code of Conduct</a>
198+
199+.. |member| raw:: html
200+
201+ <a href="https://wiki.ubuntu.com/Membership" target="_blank">Official Ubuntu member</a>
202+
203+.. _IRC Channel: chat-with-us.html
204+

Subscribers

People subscribed via source and target branches