Ubuntu Documentation

Merge lp:~tim-clicks/ubuntu-docs/minor into lp:ubuntu-docs/lucid

  1. minor
  2. Merge into lucid
Proposed by Tim McNamara
Status: Rejected
Rejected by: Connor Imes
Proposed branch: lp:~tim-clicks/ubuntu-docs/minor
Merge into: lp:ubuntu-docs/lucid
Diff against target: 60 lines (+19/-11)
1 file modified
newtoubuntu/C/newtoubuntu.xml (+19/-11)
To merge this branch: bzr merge lp:~tim-clicks/ubuntu-docs/minor
Reviewer Review Type Date Requested Status
Connor Imes (community) Disapprove
Review via email: mp+21764@code.launchpad.net

Description of the change

Largely cosmetic, but overall, beneficial changes

Added the occasional comma. Discarded semi-colons in favour of new
sentences. Attempted to shorten sentences where beneficial.

Non-trivial changes:
  location - action - justification
  l 78 - deleted some text - Sounded a little too much like an advert.
  l 79 - removed 'update' - Not accurate
  l 87 - content changes - Provided some more specifics, used 'non-free'
                           over 'proprietary' because it's more accurate

Validation:
$ bash ./scripts/validate.sh ./newtoubuntu/C/newtoubuntu.xml
 --Validating ./newtoubuntu/C/newtoubuntu.xml ...

yelp seems to render well.

To post a comment you must log in.
lp:~tim-clicks/ubuntu-docs/minor updated
483. By Tim McNamara

Edited introductory paragraphs

Actions & justifications:

"New to Ubuntu?"
  Removed redundancy in "New to Ubuntu"?
    Appeared twice: once in header, then in first sentence
  Expanded the first sentance into listitems
    Attempted to use more of the page, so the contents didn't
    have such a visually dominating effect.

"Welcome to Ubuntu"
  Spread content out to two sentences
    There were two messages. One was about Ubuntu, the other
    was about getting new software. This commit provides a
    visual seperation, so that the messages are clearer.

Revision history for this message
Connor Imes (ckimes) wrote :

Rejected in favor of https://code.launchpad.net/~tim-clicks/ubuntu-docs/minor2/+merge/21767

review: Disapprove

Unmerged revisions

483. By Tim McNamara

Edited introductory paragraphs

Actions & justifications:

"New to Ubuntu?"
  Removed redundancy in "New to Ubuntu"?
    Appeared twice: once in header, then in first sentence
  Expanded the first sentance into listitems
    Attempted to use more of the page, so the contents didn't
    have such a visually dominating effect.

"Welcome to Ubuntu"
  Spread content out to two sentences
    There were two messages. One was about Ubuntu, the other
    was about getting new software. This commit provides a
    visual seperation, so that the messages are clearer.

482. By Tim McNamara

Largely cosmetic changes

Added the occasional comma. Discarded semi-colons in favour of new
sentences. Attempted to shorten sentences where beneficial.

Non-trivial changes:
  location - action - justification
  l 78 - deleted some text - Sounded a little too much like an advert.
  l 79 - removed 'update' - Not accurate
  l 87 - content changes - Provided some more specifics, used 'non-free'
                           over 'proprietary' because it's more accurate

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'newtoubuntu/C/newtoubuntu.xml'
2--- newtoubuntu/C/newtoubuntu.xml 2010-02-07 09:32:36 +0000
3+++ newtoubuntu/C/newtoubuntu.xml 2010-03-20 04:20:46 +0000
4@@ -16,19 +16,26 @@
5 &legalnotice;
6 <!-- This document is in the process of being written. To contribute or view the planned changes, see https://wiki.ubuntu.com/DocumentationTeam/Ideas/NewToUbuntu -->
7 </articleinfo>
8- <para>If you are new to Ubuntu, this section will help you to familiarize yourself with the desktop, perform some common tasks, and point you towards getting further help if you need it.</para>
9+ <para>This section helps you to familiarize yourself with your new operating system.</para>
10+ <para>We focus on a few areas:</para>
11+ <itemizedlist>
12+ <listitem><para>learning about the desktop,</para></listitem>
13+ <listitem><para>performing some common tasks, and</para></listitem>
14+ <listitem><para>pointing you towards getting further help if you need it.</para></listitem>
15+ </itemizedlist>
16 <section id="welcome" status="review">
17 <title>Welcome to Ubuntu</title>
18 <para><inlinemediaobject><imageobject><imagedata fileref="/usr/share/icons/Humanity/places/48/distributor-logo.svg" format="SVG"/></imageobject></inlinemediaobject></para>
19- <para>Ubuntu is a community developed operating system that is perfect for laptops, desktops and servers. Whether you use it at home, at school or at work Ubuntu contains all the applications you'll ever need.</para>
20+ <para>Ubuntu is an operating system that is perfect for laptops, desktops and servers. It is developed by a worldwide community of software developers, documenters and translators. Whether you use it at home, at school or at work, you will find Ubuntu to be a great asset to your daily life.</para>
21 <para>The key promises of Ubuntu are:
22- <itemizedlist>
23- <listitem><para>Ubuntu will always be free of charge, and there is no extra fee for the "enterprise edition".</para></listitem>
24- <listitem><para>Ubuntu includes the very best in translations and accessibility infrastructure that the free software community has to offer, to make Ubuntu usable for as many people as possible.</para></listitem>
25- <listitem><para>Ubuntu is released regularly and predictably; a new release is made every six months. Each release is supported for at least 18 months.</para></listitem>
26- <listitem><para>Ubuntu is entirely committed to the principles of open source software development; we encourage people to use open source software, improve it and pass it on.</para></listitem>
27+ <itemizedlist>
28+ <listitem><para>Ubuntu will always be free of charge. There is no extra fee for the "enterprise edition".</para></listitem>
29+ <listitem><para>Ubuntu includes the very best in translations and accessibility infrastructure that the free software community has to offer. This makes Ubuntu usable for the widest audience possible.</para></listitem>
30+ <listitem><para>Ubuntu is released regularly and predictably. New releases are made every six months. Each release is supported for at least 18 months.</para></listitem>
31+ <listitem><para>Ubuntu is entirely committed to the principles of open source software development. We encourage people to use open source software, improve it and pass it on.</para></listitem>
32 </itemizedlist>
33 </para>
34+ <para>Ubuntu contains all the applications you'll ever need. Unlike other operating systems you may have used, you don't need to hunt websites to find them. The Ubuntu Software Centre includes thousands of applications. They are downloadable as soon as you connect to the Internet.</para>
35 <note><para>For more information about Ubuntu, see <ulink url="ghelp:about-ubuntu">About Ubuntu</ulink>.</para></note>
36 </section>
37 <section id="desktop" status="review">
38@@ -74,9 +81,9 @@
39 <section id="add-applications" status="review">
40 <title>Adding applications</title>
41 <para><inlinemediaobject><imageobject><imagedata fileref="/usr/share/icons/Humanity/apps/48/gnome-apt.svg" format="SVG"/></imageobject></inlinemediaobject></para>
42- <para>Ubuntu makes it easy to add new applications.</para>
43- <para>There is no need to download applications from websites. Simply open the <application>Software Center</application> and you have thousands of applications ready to install at the click of a button from Ubuntu's archive of applications.</para>
44- <para>Any applications installed in this way can be easily and safely updated or removed.</para>
45+ <para>Ubuntu makes it easy to add new applications to your computer.</para>
46+ <para>There is no need to download applications from websites. Simply use the <application>Software Center</application>. It provides thousands of applications ready to install.</para>
47+ <para>Applications installed in this way can be easily and safely removed.</para>
48 <tip><para>You'll find the <application>Software Center</application> in the menu at &software-center;</para></tip>
49 <note><para>For more instructions about using <application>Software Center</application>, see <ulink url="ghelp:software-center">the Software Center help</ulink>. Further reading on how applications are managed in Ubuntu can be found in <ulink url="ghelp:add-applications">Adding, Removing and Updating Applications</ulink>.</para></note>
50 </section>
51@@ -84,7 +91,8 @@
52 <title>Playing music and videos</title>
53 <para><inlinemediaobject><imageobject><imagedata fileref="/usr/share/icons/Humanity/apps/48/gnome-volume-control.svg" format="SVG"/></imageobject></inlinemediaobject></para>
54 <para>Ubuntu includes applications for playing and managing music and for playing and editing video.</para>
55- <para>Music and video files require special software to play them, called <emphasis>codecs</emphasis>. Some codecs (for example those required to play MP3s) are not included by default in Ubuntu because they are <ulink url="ghelp:add-applications#restricted-software">proprietary</ulink>. You will be prompted to add support for the necessary codec if you try to play a music or video file which is not supported.</para>
56+ <para>Music and video files require special software to play them, called <emphasis>codecs</emphasis>. Some codecs (for example those required to play MP3s) are not included by default in Ubuntu. They are considered <ulink url="ghelp:add-applications#restricted-software">non-free</ulink> and may be subject to patent restrictions. You will be prompted to add support for the necessary codec if you try to play a music or video file which is not supported.</para>
57+ <note><para>"Non-free" is a technical term that doesn't mean zero cost software. It refers to software that has not been released under an open source licence. Software freedom is used in this sense to mean the freedom for users to inspect the inside of the software and make enhancements to that software.</para></note>
58 <tip><para>To add support for all frequently used music and video files, <ulink url="apt:ubuntu-restricted-extras">install the ubuntu-restricted-extras package</ulink>. This will also add support for <ulink url="ghelp:musicvideophotos#video-playback-flash">websites which use Flash video</ulink>.</para></tip>
59 <note><para>For more instructions about playing music and videos, see <ulink url="ghelp:musicvideophotos">Music, Video and Photos</ulink>.</para></note>
60 </section>

Subscribers

People subscribed via source and target branches