Merge lp:~steven.richards/kubuntu-docs/lucid into lp:kubuntu-docs/lucid

[Steven Richards]

Review of Lucid Kubuntu docs as ordered by david.wonderly

[Nitesh Mistry (mistrynitesh)]

line #8 - IIRC, there was already a discussion about this quite sometime ago. The word "makes" is in regard to the word "team" which is singular and hence "makes" is appropriate.

line #20 - "Kubuntu" will be shown twice with this change.

line #21 - Changing from variable string to fixed string "Kubuntu" might not be appropriate.

line #47 - Just a typo - should be "piece" instead of "pieace"

line #61 - The comma after the word "Windows" is not required

lines #127 & 128 - I guess "&menuk3b;" does the same thing as suggested by Steven

line #209 - Just my opinion, but the word "similar" is more appropriate than "depicted" as it is possible that the user might see a little different dialogue box

line #331 - Again just my opinion, but the word "similar" is more appropriate than "close to".

lines #339-346 - Is that the place holder for the section on IRC? In that case, it would be inappropriate to delete them from the oneiric version right now as someone might take up writing that section.

line #363 - the "s" in "Services" should NOT be capital

line #373 - why is the word "and" not required?

line #472 - KDE games are not installed when installing Kubuntu using any installation media. That is why DVDRom is specifically mentioned and the next sentence differentiates between DVD and CD installation media.

line 494 - why comma after the word "text"?

lines #548-550 - why specific references to 10.04. The user might not have even seen 10.04 version.

line #573 - Again "Kubuntu" will be repeated in final output.

@Steven - Your attention to details is appreciated! :)

review: Needs Fixing

[Steven Richards (steven.richards)]

> line #8 - IIRC, there was already a discussion about this quite sometime ago.
> The word "makes" is in regard to the word "team" which is singular and hence
> "makes" is appropriate.
>
> line #20 - "Kubuntu" will be shown twice with this change.
>
> line #21 - Changing from variable string to fixed string "Kubuntu" might not
> be appropriate.
>
> line #47 - Just a typo - should be "piece" instead of "pieace"
>
> line #61 - The comma after the word "Windows" is not required
>
> lines #127 & 128 - I guess "&menuk3b;" does the same thing as suggested by
> Steven
>
> line #209 - Just my opinion, but the word "similar" is more appropriate than
> "depicted" as it is possible that the user might see a little different
> dialogue box
>
> line #331 - Again just my opinion, but the word "similar" is more appropriate
> than "close to".
>
> lines #339-346 - Is that the place holder for the section on IRC? In that
> case, it would be inappropriate to delete them from the oneiric version right
> now as someone might take up writing that section.
>
> line #363 - the "s" in "Services" should NOT be capital
>
> line #373 - why is the word "and" not required?
>
> line #472 - KDE games are not installed when installing Kubuntu using any
> installation media. That is why DVDRom is specifically mentioned and the next
> sentence differentiates between DVD and CD installation media.
>
> line 494 - why comma after the word "text"?
>
> lines #548-550 - why specific references to 10.04. The user might not have
> even seen 10.04 version.
>
> line #573 - Again "Kubuntu" will be repeated in final output.
>
> @Steven - Your attention to details is appreciated! :)

Hi Nitesh,

In regards to your comments, some of my edits are wrong but let me explain a few of your requests to fix:

#61,#373, #494, : Lists are done in the following format: X, Y, and Z. There is always a comma between and and the prior item in the list when there is 3 items. When it is more than three you do not use "and" and simply list: X, Y, Z, A, B.

#472 : I was mistaken as you can take the DVD Image as an ISO and flash it via a USB drive which would ideally be the same media.

#573, #20: Misread the line, whoops ;-)

#47: Typo, will fix, as for the rest I will also look into.

Thanks for your feedback

Unmerged revisions

182. By Steven Richards on 2011-05-30

Final revisions

181. By Steven Richards on 2011-05-22

Reviewed CLI page

180. By steven <steven@kubuntu> on 2011-05-18

Finished review and editing of bugs page

179. By steven <steven@kubuntu> on 2011-05-18

Fixed basics page

178. By Steven Richards on 2011-05-18

Fixed audio page

177. By Steven Richards on 2011-05-18

Fixed the About page

176. By Steven Richards on 2011-05-18

Welcome page patch

=== modified file 'docs/about/C/about.xml'
--- docs/about/C/about.xml	2010-03-27 05:08:21 +0000
+++ docs/about/C/about.xml	2011-05-30 22:57:28 +0000
@@ -53,7 +53,7 @@
 <sect1 id="philosophy">
 <title>Philosophy</title>
 <para>
-The team behind the Ubuntu and &kubuntu; projects makes the following
+The team behind the Ubuntu and &kubuntu; projects make the following
 commitments to
 its users:
 </para>
@@ -75,16 +75,16 @@
 </listitem>
 <listitem>
 <para>
-&kubuntu; includes the best translations and accessibility infrastructure
-that the free software community has to offer to make &kubuntu; usable by as many
-people as possible.
+&kubuntu; Kubuntu includes the best translations and accessibility infrastructure 
+that the free software community has to offer in order to make Kubuntu usable 
+by as many people as possible.
 </para>
 </listitem>
 <listitem>
 <para>
 &kubuntu; is committed to the principles of free software and open source
 development; we encourage people to use free and open source software, improve
-it and pass it on.
+it, and pass it on.
 </para>
 </listitem>
 </itemizedlist>
@@ -94,14 +94,13 @@
 <sect1 id="linux">
 <title>What is Linux?</title>
 <para>
-Linux is an operating system kernel that resembles the UNIX operating system.
-The kernel is the main software required for free operating systems such as
-&kubuntu;. Linux has become a leading element of the worldwide movement to
-embrace free and open source software. The term "GNU/Linux" is another way of
-referring to the Linux kernel; it was created by the <ulink
-url="http://www.fsf.org">Free Software Foundation</ulink>, because the Linux
-kernel was created with many components from the
-<ulink url="http://www.gnu.org">GNU Project</ulink>.
+Linux is an operating system kernel that resembles the UNIX operating system. 
+The kernel is the main pieace of software required for free operating systems such 
+as &Kubuntu; to exist. Linux has become a leading element in the worldwide movement 
+to embrace free and open source software. The term "GNU/Linux" is another way of 
+referring to the Linux kernel; it was created by the <ulink url="http://www.fsf.org">
+Free Software Foundation</ulink>, because the Linux kernel was created with many 
+components from the <ulink url="http://www.gnu.org">GNU Project</ulink>.
 </para>
 <para>
 Find out more about Linux at any of the following websites:
@@ -137,7 +136,7 @@
 entertainment, education, graphics, and software development. &kde; software is
 translated into more than 65 languages and is built for ease of use with modern
 accessibility principles in mind. &kde; 4&apos;s full-featured applications run
-natively on Linux, BSD, Solaris, Windows and Mac OS X.
+natively on Linux, BSD, Solaris, Windows, and Mac OS X.
 
 The KDE Workspace is the default desktop for &kubuntu;.
 </para>
@@ -200,8 +199,8 @@
 after installing &kubuntu;. Furthermore, during the installation, there is a
 choice between using the <application>GNOME Display
 Manager</application> (<acronym>GDM</acronym>) or the <application>KDE Display
-Manager</application> (<acronym>KDM</acronym>) as the login manager. Either
-display manager will work equally well.
+Manager</application> (<acronym>KDM</acronym>) while at the login manager. 
+Either display manager will work equally well.
 </para>
 <para>
 After installation, either &gnome; or &kde; session types can be run, so users

=== modified file 'docs/audio/C/audio.xml'
--- docs/audio/C/audio.xml	2010-05-02 20:53:23 +0000
+++ docs/audio/C/audio.xml	2011-05-30 22:57:28 +0000
@@ -25,12 +25,11 @@
 playing audio <acronym>CDs</acronym>. When a <acronym>CD</acronym> is inserted,
 &kubuntu; will recognize it and display default options. To hear the content
 with <application>Amarok</application>, select <guilabel>Play Audio CD with
-Amarok</guilabel> and then press <guibutton>OK</guibutton> button.
+Amarok</guilabel> and then press the <guibutton>OK</guibutton> button.
 <application>Amarok</application> can be configured to remember this choice
 every time a <acronym>CD</acronym> is inserted by selecting <guilabel>Always do
 this for this type of media</guilabel>, and pressing <guibutton>OK</guibutton>.
-<application>Amarok</application> offers other useful features. If connected to
-the Internet, <application>Amarok</application> will retrieve
+If connected to the Internet, <application>Amarok</application> will retrieve
 <acronym>CD</acronym> artist, title, and track data from <ulink
 url="http://freedb.org">freedb.org</ulink>. It will also download the lyrics
 for the current selection if they are available by choosing the
@@ -77,7 +76,7 @@
 
 <para>
 In addition to being the &kubuntu; music player,
-<application>Amarok</application> is is helpful for managing music
+<application>Amarok</application> is helpful for managing music
 collections. When <application>Amarok</application> is started for the first
 time, it will ask for the primary directory that contains music files. Any 
 supported music files in that directory will be added to the
@@ -94,7 +93,7 @@
 </sect1>
 
 <sect1 id="iPod">
-<title>iPod Time</title>
+<title>iPod Connectivity via Amarok</title>
 
 <para>
 Another exciting <application>Amarok</application> feature is the ability to
@@ -110,7 +109,7 @@
 <procedure>
 <step>
 <para>
-When an audio <acronym>CD</acronym> is inserted, &kubuntu; will
+When a blank <acronym>CD</acronym> is inserted, &kubuntu; will
 recognize it, mount it, and then ask what to do with the <acronym>CD</acronym>.
 Choose <guilabel>Create an audio CD with K3B</guilabel> and press
 <guibutton>OK</guibutton>. This will open
@@ -120,7 +119,8 @@
 </step>
 <step>
 <para>
-To start <application>K3b</application> manually, go to &menuk3b;.
+To start <application>K3b</application> manually, go to <guilabel>Kickoff Application 
+> Applications > Multimedia > </guilabel><application>Disk Burning (K3b)</application>.
 </para>
 </step>
 <step>
@@ -192,7 +192,7 @@
 </step>
 <step>
 <para>
-When all settings are complete, press the <guibutton>Burn</guibutton>
+When all settings have been reviewed, press the <guibutton>Burn</guibutton>
 button.
 </para>
 </step>
@@ -210,7 +210,7 @@
 </listitem>
 <listitem>
 <para><emphasis role="strong">FLAC</emphasis> - The Free Lossless Audio
-Codec<acronym>FLAC</acronym> can compress audio files up to 50% without removing
+Codec, <acronym>FLAC</acronym>, can compress audio files up to 50% without removing
 any information from the audio stream. For more information on this format, see
 the <ulink url="http://flac.sourceforge.net/">FLAC homepage</ulink> on
 sourceforge.net.

=== modified file 'docs/basics/C/basics.xml'
--- docs/basics/C/basics.xml	2010-03-26 21:38:03 +0000
+++ docs/basics/C/basics.xml	2011-05-30 22:57:28 +0000
@@ -50,7 +50,7 @@
 </para>
 <para>
 Opening a terminal (in &kubuntu; this is
-called <application>Konsole</application>) and typing
+called <application>Konsole</application>) and typing:
 <screen>ls /</screen>
 brings up a list similar to the following:
 <screen>

=== modified file 'docs/bugs/C/bugs.xml'
--- docs/bugs/C/bugs.xml	2010-03-27 04:09:39 +0000
+++ docs/bugs/C/bugs.xml	2011-05-30 22:57:28 +0000
@@ -22,13 +22,13 @@
 <title>Types of Bug Reports</title>
 <para>
 Generally, there are three types of bug reports: <emphasis>crash</emphasis>,
-<emphasis>non-crash</emphasis>, and <emphasis>feature request</emphasis>.
+<emphasis>non-crash</emphasis>, and <emphasis>feature request</emphasis> bugs.
 </para>
 <variablelist><title>Overview of bug types</title>
 <varlistentry><term>Crash</term>
 <listitem>
 <para>
-An application or system crash or failure. Most of the time, a crash dialog will
+An application, system crash, or other failure. Most of the time, a crash dialog will
 be presented that can be turned into a bug report.
 </para>
 </listitem>
@@ -81,7 +81,7 @@
 <title>Launchpad</title>
 <para><ulink url="https://launchpad.net/"/></para>
 <para>
-Launchpad is an open source suite of tools that help people and teams to work
+Launchpad is an open source suite of tools that helps people and teams work
 together on software projects. Launchpad is used by the Ubuntu and &kubuntu;
 Projects, as well as various other open source projects.
 </para>
@@ -106,16 +106,15 @@
 <title>Filing a Crash Report</title>
 <para>
 When an application crashes in &kubuntu;, the appropriate crash dialog will
-appear. It is usually easy to file a bug report from the dialog. With a KDE
-application, the KDE crash dialog will appear along with instructions
-for reporting the bug. Otherwise, the Ubuntu crash dialog will appear with
-instructions for filing a bug on Launchpad.
+appear. With a KDE application, the KDE crash dialog will appear along with 
+instructions for reporting the bug. Otherwise, the Ubuntu crash dialog will 
+appear with instructions for filing a bug on Launchpad.
 </para>
 <sect2 id="filing-crash-kde">
 <title>KDE</title>
 <para>
 When an application crashes in KDE, a crash dialog will be presented that is
-similar to the following images. The first image shows the
+depicted in the following images. The first image shows the
 <guilabel>General</guilabel> tab which provides an overview of the crash. The
 second image shows the <guilabel>Developer Information</guilabel> tab which
 provides trace information that is useful to developers.
@@ -557,7 +556,7 @@
 </procedure>
 <para>
 <emphasis role="bold">Congratulations on making a successful crash
-report!</emphasis>Identifying and reporting bugs are essential to improving
+report!</emphasis> Identifying and reporting bugs are essential to improving
 &kubuntu;. Some emails may be sent to the registered address to update progress
 or to allow developers to get additional information about the bug.
 </para>

=== modified file 'docs/cli/C/cli.xml'
--- docs/cli/C/cli.xml	2010-04-15 14:55:40 +0000
+++ docs/cli/C/cli.xml	2011-05-30 22:57:28 +0000
@@ -42,7 +42,7 @@
 <itemizedlist>
 <listitem>
 <para>
-All command names, file names or paths to directories will be shown using a <command>monospace font</command>.
+All commands, file names or paths to directories will be shown using a <command>monospace font</command>.
 </para>
 </listitem>
 <listitem>
@@ -155,6 +155,12 @@
 </listitem>
 <listitem>
 <para>
+To navigate to your home directory from anywhere, type:
+<screen>cd </screen>
+</para>
+</listitem>
+<listitem>
+<para>
 To navigate through multiple levels of directories at once, specify the full
 directory path. For example, type:
 <screen>cd /var/log</screen>

=== modified file 'docs/communication/C/communication.xml'
--- docs/communication/C/communication.xml	2010-03-26 21:38:03 +0000
+++ docs/communication/C/communication.xml	2011-05-30 22:57:28 +0000
@@ -13,7 +13,7 @@
 &legalnotice;
 <abstract>
 <para>
-This document will present the various ways one can communicate with others
+This document will show the various ways in which you can communicate with others
 using &kubuntu;.
 </para>
 </abstract>
@@ -25,8 +25,8 @@
 <para>
 <application>KMail</application> is the default e-mail client used in &kubuntu;.
 <application>KMail</application> is a component of the Personal Information
-Manager (<acronym>PIM</acronym>) called <application>Kontact</application> that
-also includes calendaring, contacts, tasks, and more.
+Manager (<acronym>PIM</acronym>) called <application>Kontact</application> that 
+includes calendaring, contacts, tasks, and more.
 </para>
 
 <para>
@@ -62,7 +62,7 @@
 <varlistentry><term><guilabel>General</guilabel></term>
 <listitem>
 <para>
-Contains information pertaining to name, organization, and e-mail address.
+Contains information such as name, organization, and e-mail address.
 </para>
 </listitem>
 </varlistentry>
@@ -78,7 +78,7 @@
 <varlistentry><term><guilabel>Advanced</guilabel></term>
 <listitem>
 <para>
-Contains information pertaining to reply-to and <acronym>BCC</acronym>
+Contains information about reply-to and <acronym>BCC</acronym>
 addresses, the dictionary to use, and folder locations for sent-mail, drafts,
 and templates.
 </para>
@@ -87,7 +87,7 @@
 <varlistentry><term><guilabel>Templates</guilabel></term>
 <listitem>
 <para>
-Contains information pertaining to custom templates for new messages, reply to
+Contains information about custom templates for new messages, reply to
 sender messages, and more.
 </para>
 </listitem>
@@ -95,7 +95,7 @@
 <varlistentry><term><guilabel>Signature</guilabel></term>
 <listitem>
 <para>
-Contains information pertaining to the use of a signature in e-mails. It can
+Contains information about the use of a signature in e-mails. It can
 be configured to use a signature file, create and use custom text, or have
 <application>KMail</application> run a command and append the output to your
 signature.
@@ -105,7 +105,7 @@
 <varlistentry><term><guilabel>Picture</guilabel></term>
 <listitem>
 <para>
-Contains information pertaining to the use of a picture when sending e-mails.
+Contains information about the use of a picture when sending e-mails.
 </para>
 </listitem>
 </varlistentry>
@@ -157,7 +157,7 @@
 <listitem>
 <para>
 Disconnected <acronym>IMAP</acronym> is similar to <acronym>IMAP</acronym>.
-However e-mail messages are synchronized between the server and the client,
+However, e-mail messages are synchronized between the server and the client,
 leaving everything on the server. Both the server and the client will
 have identical copies.
 </para>
@@ -166,7 +166,7 @@
 <varlistentry><term><guilabel>Maildir mailbox</guilabel></term>
 <listitem>
 <para>
-Similar to the <guilabel>Local mailbox</guilabel>, except that it uses
+Close to the <guilabel>Local mailbox</guilabel>, except that it uses
 the Maildir format instead of the <acronym>mbox</acronym> format.
 </para>
 </listitem>
@@ -219,21 +219,13 @@
 </sect2>
 </sect1>
 
-<!-- IRC -->
-<sect1 id="irc">
-<title>Internet Relay Chat (<acronym>IRC</acronym>)</title>
-<para>
-...
-</para>
-</sect1>
-
 <!-- INSTANT MESSAGING -->
 <sect1 id="im">
 <title>Instant Messaging</title>
 <para>
 The default Instant Messaging (<acronym>IM</acronym>) client for &kubuntu; is
 <application>Kopete</application>. <application>Kopete</application> supports
-many of the messaging protocols including Yahoo, Google Talk, MSN, ICQ, Jabber,
+many messaging protocols and services, such as Yahoo, Google Talk, MSN, ICQ, Jabber,
 AOL, and more.
 </para>
 
@@ -255,15 +247,15 @@
 <title>Microblogging - Twitter and Identi.ca</title>
 <para>
 &kubuntu; ships with the <application>Microblogging Plasma Widget</application>
-which supports both Twitter and Identi.ca. To add the desktop widget,
+which supports both Twitter and Identi.ca Services. To add the desktop widget,
 simply <mousebutton>right</mousebutton> click on the desktop, and select
-<guimenuitem>Add Widgets...</guimenuitem>. Simply click and drag the
+<guimenuitem>Add Widgets...</guimenuitem>. Then click and drag the
 widget to the desktop and configure it for either Twitter or Identi.ca.
 </para>
 <para>
 Another application that is available in the repositories is
 <application>Choqok</application>. <application>Choqok</application> supports
-both Twitter and Identi.ca as well, and sits in the system tray.
+both Twitter and Identi.ca as well, it sits in the system tray.
 </para>
 </sect1>
 

=== modified file 'docs/contact/C/contact.xml'
--- docs/contact/C/contact.xml	2010-03-26 21:38:03 +0000
+++ docs/contact/C/contact.xml	2011-05-30 22:57:28 +0000
@@ -104,7 +104,7 @@
 <para>
 Some of the projects on <ulink url="https://launchpad.net/">Launchpad</ulink>
 have mailing lists as well. When you join a project, check to see if they have a
-list for you to subscribe to.
+mailing list for you to subscribe to.
 </para>
 </note>
 </sect2>

=== modified file 'docs/contribute/C/contribute.xml'
--- docs/contribute/C/contribute.xml	2010-03-27 03:58:54 +0000
+++ docs/contribute/C/contribute.xml	2011-05-30 22:57:28 +0000
@@ -22,10 +22,10 @@
 <title>Introduction</title>
 
 <para>
-The Kubuntu community consist of individuals and teams, working on different aspects of the 
+The Kubuntu community consists of individuals and teams, working on different aspects of the 
 distribution, packaging software, testing, bug traiging, and helping to promote Kubuntu to 
 a wider audience. All of the software, artwork and documentation has been created, tested, 
-used and discussed openly by people around the world participating in the Open Source 
+used, and discussed openly by people around the world participating in the Open Source 
 community made possible by the Internet. So we invite you, to help shape Kubuntu, to better 
 meet your needs. 
 </para>
@@ -36,15 +36,15 @@
 
 <para>
 The easiest way to give back to the Kubuntu community is by sharing Kubuntu with others: Recommend 
-Kubuntu to others, show them how to download and install Kubuntu and the possibilities and 
+Kubuntu to others, show them how to download and install Kubuntu, and the possibilities and 
 qualities of Open Source Software. As our community grows, it will become more accepted and
 supported. Here are some of the steps you can take:
 </para>
 <procedure>
 <step>
 <para>
-Give a talk at your local school, Linux User Group or library on Kubuntu. There are lots of 
-notes from pervious talks given by others in several languages available on the wiki.
+Give a talk at your local school, Linux User Group or library on Kubuntu. There are many 
+notes from previous talks given by others in several languages available on the wiki.
 </para>
 </step>
 <step>
@@ -57,8 +57,8 @@
 </step>
 <step>
 <para>
-Join or start a Local Community Team - discuss the possibilities that Kubuntu brings up, and if you 
-like Kubuntu it is likely that others around you like it as well! See the "Going Local!" section for details.
+Join or start a Local Community Team - discuss the possibilities that Kubuntu offers, and if you 
+like Kubuntu, it is likely that others around you like it as well! See the "Going Local!" section for details.
 </para>
 </step>
 </procedure>
@@ -82,8 +82,8 @@
 
 <para>
 If your home language is not English but you happen to have really good English skills and are 
-comfortable using software in English, you help to translate the Kubuntu applications and documentation 
-into your native language. To help out you can:
+comfortable using software in English, then you help to translate the Kubuntu applications and 
+documentation into your native language. To help out you can:
 </para>
 <procedure>
 <step>

=== modified file 'docs/desktop/C/desktop.xml'
--- docs/desktop/C/desktop.xml	2010-03-29 19:05:53 +0000
+++ docs/desktop/C/desktop.xml	2011-05-30 22:57:28 +0000
@@ -181,8 +181,8 @@
 
 <step>
 <para>Open <application>Konsole</application> by going to &menukonsole;. At the
-command prompt type the following and press the <keycap>Enter</keycap> key (if
-asked for a password, type in the proper user password followed by the
+command prompt type the command shown below and press the <keycap>Enter</keycap> 
+key (if asked for a password, type in the proper user password followed by the
 <keycap>Enter</keycap> key):
 <screen>
 sudo /etc/init.d/kdm restart

=== modified file 'docs/games/C/games.xml'
--- docs/games/C/games.xml	2010-03-26 21:38:03 +0000
+++ docs/games/C/games.xml	2011-05-30 22:57:28 +0000
@@ -23,7 +23,7 @@
 <title>Introduction</title>
 
 <para>
-When installing &kubuntu; via a DVDROM, all of the KDE Games are installed.
+When installing &kubuntu; via any installation media, all of the KDE Games are installed.
 However, when installing &kubuntu; from a CDROM, no KDE Games are installed, due
 to the lack of available space on the CDROM. It is simple to install games after
 a CDROM install. Please review the <ulink type="help"

=== modified file 'docs/graphics/C/graphics.xml'
--- docs/graphics/C/graphics.xml	2010-03-27 04:09:39 +0000
+++ docs/graphics/C/graphics.xml	2011-05-30 22:57:28 +0000
@@ -24,7 +24,7 @@
 <para>
 There are many free and open source graphics and image editing applications
 available for Kubuntu such as <application>GIMP</application>,
-<application>Blender</application>, <application>InkScape</application> and
+<application>Blender</application>, <application>InkScape</application>, and
 more. These applications are not part of a default &kubuntu; installation.
 However, they can be installed easily with the package manager
 <application>KpackageKit</application>. This topic is an introduction to common
@@ -241,7 +241,7 @@
 <para>
 Some features of <application>Inkscape</application> are:
 <itemizedlist>
-<listitem><para>Create ellipses, rectangles, circles, paths, text using the
+<listitem><para>Create ellipses, rectangles, circles, paths, text, using the
 different types of tools available.</para></listitem>
 <listitem><para>Manipulate, style, rotate and edit objects.</para></listitem>
 <listitem><para>Command-line interface, primarily for format conversion

=== modified file 'docs/netbook/C/netbook.xml'
--- docs/netbook/C/netbook.xml	2010-03-26 21:38:03 +0000
+++ docs/netbook/C/netbook.xml	2011-05-30 22:57:28 +0000
@@ -24,8 +24,8 @@
 
 <para>
 Welcome to the Kubuntu Netbook Remix (KNR) &distro-rev;, the &distro-version;
-release. The KNR was designed for netbook computers that typically have screens
-10 inches or less and don't have optical drives. It is designed to run on systems
+release. The KNR was designed for netbook computers that typically have screen sizes
+of 10 inches or less and don't have optical drives. It is designed to run on systems
 with reduced hard drive capacity.
 </para>
 

=== modified file 'docs/office/C/office.xml'
--- docs/office/C/office.xml	2010-03-27 03:58:54 +0000
+++ docs/office/C/office.xml	2011-05-30 22:57:28 +0000
@@ -23,7 +23,7 @@
 
 <para>
 The default office application in &kubuntu; is OpenOffice.org 3.2.  This office
-suite includes Writer, Calc, Draw, Impress and Math. This suite is the
+suite includes Writer, Calc, Draw, Impress, and Math. This suite is the
 open source equivalent of the Microsoft Office suite, and each application
 corresponds to a similar product in that line. Calc is similar to Excel, Writer
 is like Word, Impress is similar to PowerPoint, Base and Access have similar

=== modified file 'docs/welcome/C/welcome.xml'
--- docs/welcome/C/welcome.xml	2010-03-14 05:11:33 +0000
+++ docs/welcome/C/welcome.xml	2011-05-30 22:57:28 +0000
@@ -61,7 +61,7 @@
 <para>
 If you own a netbook computer, &kubuntu; has a version optimized specifically
 for these small computers. More information on the netbook remix can be found in
-the <xref linkend="releases-netbook"/> section.
+the <xref linkend="releases-netbook"/>.
 </para>
 </note>
 </sect2>
@@ -69,24 +69,13 @@
 <sect2 id="releases-netbook">
 <title>&kubuntu; Netbook Remix &distro-rev;</title>
 <para>
-Features KDE &kde-version; with the Plasma Netbook workspace that is optimized
-for use with netbooks and smaller, portable devices. The &kubuntu; Netbook Remix
-is a full-featured operating system that contains plenty of applications to
-suit your everyday needs, with more than 20,000 other titles available to be
-easily installed.
+It's nearly identical to Kubuntu 10.04 for Laptops and Desktops, with all the 
+same functionality and simplicity, but is optimized for the screen size of your 
+netbook. It even features all the great apps you can install in Kubuntu 10.04.
 </para>
 </sect2>
 </sect1>
 
-<sect1 id="installing">
-<title>Installing &kubuntu;</title>
-<para>
-Installing either &kubuntu; Desktop Edition or the Netbook Remix is exactly the
-same. Both use the same graphical installer known as
-<application>Ubiquity</application>.
-</para>
-</sect1>
-
 <sect1 id="support">
 <title>Getting Support for &kubuntu;</title>
 <para>
@@ -96,8 +85,9 @@
 <sect2 id="support-documentation">
 <title>&kubuntu; System Documentation</title>
 <para>
-&kubuntu; ships with system documentation covering various topics which provide
-introduction as well as configuration and troubleshooting topics.
+&kubuntu; Kubuntu ships with system documentation covering various topics 
+which provide an introduction to Kubuntu as well as configuration and 
+troubleshooting topics.
 </para>
 <para>
 To view &kubuntu;&apos;s system documentation, please view the <ulink
@@ -130,7 +120,7 @@
 </sect1>
 
 <sect1 id="contact">
-<title>Contacting the &kubuntu; Project</title>
+<title>Contacting the &kubuntu; Project Team</title>
 <para>
 If you are interested in contacting the &kubuntu; team, please view the <ulink
 type="help" url="help:/kubuntu/contact/">Contact &kubuntu;</ulink> topic.