ubuntu-tour team mailing list archive

[mac9416 <mac9416@xxxxxxxxxxxxxxxx>]

mac9416 has proposed merging lp:~mac9416/ubuntu-tour/editing into lp:ubuntu-tour.

Requested reviews:
  Ubuntu-Tour Team (ubuntu-tour)


I did some editing in about-ubuntu and software-management. Hopefully I did more improvement than damage.
-- 
https://code.launchpad.net/~mac9416/ubuntu-tour/editing/+merge/35191
Your team Ubuntu-Tour Team is requested to review the proposed merge of lp:~mac9416/ubuntu-tour/editing into lp:ubuntu-tour.

=== modified file 'about-ubuntu/3_applications-menu'
--- about-ubuntu/3_applications-menu	2010-09-11 11:37:10 +0000
+++ about-ubuntu/3_applications-menu	2010-09-11 15:06:45 +0000
@@ -1,13 +1,13 @@
-Ubuntu categorizes installed user applications under the Applications Menu. This menu provides access to software that falls under Accessories, Games, Graphics, Office and Productivity Tools, Sound and Video, and Internet Connectivity.
+Ubuntu categorizes installed user applications under the Applications Menu.
 
 The Applications Menu has the following sub menus or categories:
 
-Accessories - Ubuntu comes with several accessories such as the Calculator, Character Map, and the Terminal, among others. These handy applications are all listed under this category.
-Games - Ubuntu comes with pre-installed games such as Sudoku, Mine, Solitaire, and many others.
+Accessories - Ubuntu comes with several accessories such as the Calculator, Character Map, and the Terminal, among others.
+Games - Ubuntu comes with many pre-installed games such as Sudoku, Mine, and Solitaire.
 Graphics - Software for viewing and editing images are listed under this sub menu.
-Internet - Applications for Internet connectivity such as web browsers, email and chat clients, and the remote desktop viewer are listed here.
+Internet - Applications for Internet connectivity such as web browsers, email, and chat clients, and the remote desktop viewer are listed here.
 Office - Productivity software such as word processors, database, spreadsheet, and presentation applications are classified under this sub menu. Ubuntu comes with the OpenOffice productivity suite.
-Sound and Video - Software for playing, burning, and ripping music and videos is listed here. Ubuntu comes with its own pre-installed applications such as Brasero Disc Burner, Movie Player, and Rhythmbox Music Player, among others. 
+Sound and Video - Software for playing, burning, and ripping music and videos is listed here. Ubuntu comes with Brasero Disc Burner, Movie Player, and Rhythmbox Music Player, among others. 
 Ubuntu Software Center - The Ubuntu Software Center lets you find applications by name or by category. This will be discussed later.
 
-Launchers in the Application menu will change accordingly if you install or remove applications.
+Launchers in the Application menu will change accordingly when you install or remove applications.

=== modified file 'about-ubuntu/4_places-menu'
--- about-ubuntu/4_places-menu	2010-09-05 02:23:23 +0000
+++ about-ubuntu/4_places-menu	2010-09-11 15:06:45 +0000
@@ -10,8 +10,8 @@
 Videos Folder
 Downloads Folder
 
-We will explain later how to edit these. You can also easily access other devices like CDs and USBs, or other partitions.
+We will explain later how to change the items in this list. You can also easily access other devices like CDs and USBs or other partitions.
 
 Your local network is also easily accessible via The Places Menu. You can click on the Network folder to view all the computers, shared folders, and other places within your local network.
 
-The Places Menu also allows you to Connect to a Server, Search for Files and view the recently opened Documents.
+The Places Menu also allows you to Connect to a Server, Search for Files, and view the recently opened Documents.

=== modified file 'about-ubuntu/5_system-menu'
--- about-ubuntu/5_system-menu	2010-09-05 02:23:23 +0000
+++ about-ubuntu/5_system-menu	2010-09-11 15:06:45 +0000
@@ -1,12 +1,11 @@
-Ubuntu allows you to manage your desktop easily through the System Menu. Here, you can personalize, customize, and modify system settings to suit your computing needs.
+Ubuntu allows you to manage your desktop settings easily through the System Menu. Here, you can personalize, customize, and modify system settings to suit your needs.
 
 The System Menu is categorized into the following:
 
 Preferences
-The items under this category allows you to personalize your desktop. Here, you can modify the appearance of your desktop, assign keyboard shortcuts, manage network connections, change your screen resolution, and so much more. The Ubuntu Tour will orient you on some of the most common customization tasks for your Ubuntu desktop.
+The items under this category allow you to personalize your desktop. Here, you can modify the appearance of your desktop, assign keyboard shortcuts, manage network connections, change your screen resolution, and much more. The Ubuntu Tour will orient you on some of the most common customization tasks for your Ubuntu desktop.
 
 Administration
-The items under this category are the tools and utilities you can use to manage your system and ensure that it is running smoothly. Through these menu items, you can easily perform Ubuntu administration tasks such as changing the time and date of your computer, accessing the Update Manager to easily update installed packages, setting up printing, viewing log files, managing computer users and groups, and many others.
-
-The System Menu also gives easy access to Ubuntu Help and Support documentation as well as information about the GNOME desktop and Ubuntu. Simply click on the links to know more about these items.
-
+The items under this category allow you to manage your system and ensure that it is running smoothly. Through these menu items, you can easily perform administration tasks such as changing the time and date of your computer, accessing the Update Manager to easily update installed packages, setting up printing, viewing log files, managing computer users and groups, and many others.
+
+The System Menu also gives easy access to Ubuntu Help and Support documentation as well as information about the GNOME desktop and Ubuntu. Simply click on the links to learn more about these items.

=== modified file 'about-ubuntu/6_the-notification-area'
--- about-ubuntu/6_the-notification-area	2010-09-05 02:23:23 +0000
+++ about-ubuntu/6_the-notification-area	2010-09-11 15:06:45 +0000
@@ -1,9 +1,9 @@
-(This is just an introduction to the notification area. Different writeups will be made for each of the topics (modifying system time and date, modifying sound preferences, etc) in the future.)
+(This is just an introduction to the notification area. Different writeups will be made for each of the topics [modifying system time and date, modifying sound preferences, etc.] in the future.)
 
-The Notification Area is found near the top right area of your desktop. This displays several applets to change system behaviour. Some applications will add their own applet to the Notification Area, which do things like give status, set options, or show & hide the application. 
+The Notification Area is found near the top right of your desktop. This area holds several applets to change system behaviour. Some applications will add a custom applet to the Notification Area to do things like give status, set options, or show and hide the application. 
 
 Here are the default items in the notification area:
 
 Sound Controls - this allows you to easily modify the system's sound preferences.
-Internet Connectivity - this shows if your computer is connected to the Internet, and contains options about what network to connect to. This applet is more important to laptop users.
+Internet Connectivity - this shows if your computer is connected to the Internet and contains options about what network to connect to. This applet is more important to laptop users.
 Battery - this shows charging and discharging status of the battery. By default this only shows when a battery is present and isn't full, but this can be changed.

=== modified file 'about-ubuntu/7_top-right-panel'
--- about-ubuntu/7_top-right-panel	2010-09-05 02:23:23 +0000
+++ about-ubuntu/7_top-right-panel	2010-09-11 15:06:45 +0000
@@ -3,7 +3,7 @@
 Messaging Menu - 
 Clock - this shows the system date and time and also lets you modify clock settings and the location settings of your computer.
 MeMenu - this launches Ubuntu's Me Menu, a comprehensive social networking application that lets you connect to some of the most popular social networking sites available. 
-Power Menu - allows you to log out, hibernate, show down, or restart the computer.
+Power Menu - this allows you to log out, hibernate, show down, or restart the computer.
 
 Logging out will end your session, and allow another user to use the computer.
 (Do hibernating/suspending)

=== modified file 'about-ubuntu/8_the-bottom-panel'
--- about-ubuntu/8_the-bottom-panel	2010-09-11 13:43:22 +0000
+++ about-ubuntu/8_the-bottom-panel	2010-09-11 15:06:45 +0000
@@ -1,10 +1,9 @@
 The Bottom Panel
 
-The show/hide all button is located on the left side of the bottom panel. If you click the icon once it will hide all the open windows. (Showing your desktop.) It's a toggle button so if you click it again it will restore all the windows.
+The Show/Hide All button is located on the left side of the bottom panel. If you click the icon once, it will hide all the open windows and show your desktop. If you click it again, it will restore all the windows.
 
 In the middle of the panel there is an applet which lists the open windows. You can use this applet to switch between open windows and also to close them.
 
-To the right of the panel there is a desktop swiching applet. It shows you how many virtual desktops you have enabled as well as some information about what applications are open on each desktop. Clicking on one of the icons will take you to the desktop you clicked on.
-
-On the far right there is the trash can icon. When you delete an item using the file manager it will automatically move it to the trash bin. When you click on the icon it will show you the contents of the trash bin, you can permenently delete items by emptying the trash bin or by deleting them from this location. If you accidently delete something in the filemanager you can always restore items from the trash bin, right click on the item you wish to restore and you will see the "Restore" option in the menu.
-
+Near the right of the panel there is a desktop switching applet. It shows you how many virtual desktops you have enabled as well as some information about what applications are open on each desktop. Clicking on one of the icons will take you to the desktop you clicked on.
+
+On the far right there is the Trash Bin icon. When you delete an item using the file manager, it will automatically be moved to the trash bin. Clicking on the icon will open the trash bin in the file manager. From there, you can delete items permanently or restore them to where they were deleted from.

=== modified file 'software-managment/0_software-management'
--- software-managment/0_software-management	2010-08-22 03:05:44 +0000
+++ software-managment/0_software-management	2010-09-11 15:06:45 +0000
@@ -1,3 +1,3 @@
-In this chapter you will be introduced to managing software with ease.
+Thousands of great applications are available for Ubuntu absolutely free. In this chapter you will be introduced to methods of installing, removing, and updating applications.
 
-Only administrators can install, remove, or update software.
+Note that only users with administrative privileges can install, remove, or update software.

=== modified file 'software-managment/1_software-center'
--- software-managment/1_software-center	2010-08-22 03:05:44 +0000
+++ software-managment/1_software-center	2010-09-11 15:06:45 +0000
@@ -1,3 +1,3 @@
-The Ubuntu Software Center is a tool for installing and removing applications easily, from a catalog of thousand of items. Content in the Software Center is up to date, secure, and free.
+The Ubuntu Software Center is a tool for installing and removing applications easily from a catalog of thousand of items. Content in the Software Center is up to date, free, and .
 
-To launch the Software Center, click the Applications menu, then click Ubuntu Software Center, at the bottom of the list.
+To launch the Software Center, click the Applications menu then choose Ubuntu Software Center at the bottom of the list.

=== modified file 'software-managment/2_software-center-overview'
--- software-managment/2_software-center-overview	2010-09-06 18:50:09 +0000
+++ software-managment/2_software-center-overview	2010-09-11 15:06:45 +0000
@@ -1,3 +1,3 @@
-On the left, the Software Center has three tabs, "Get Software", "Installed Software", and "History". "Get Software" shows all applications, "Installed Software" shows installed applications, and "History" show logs of software management.
+On the left, the Software Center has three tabs: "Get Software", "Installed Software", and "History". "Get Software" shows all applications, "Installed Software" shows installed applications, and "History" show logs of software management.
 
 When you launch the Software Center, you will see the main page. This page contains a list of categories for software. You can browse these categories, and sub-categories to find applications. If you are searching for something specific, you can use the search bar in the top right.

=== modified file 'software-managment/3_software-center-finding'
--- software-managment/3_software-center-finding	2010-09-06 18:50:09 +0000
+++ software-managment/3_software-center-finding	2010-09-11 15:06:45 +0000
@@ -1,7 +1,7 @@
-To demonstrate installation, we will get you to install and remove an application called Mousepad. There are two ways to find applications - searching or browsing.
+To demonstrate installation, we will show you how to install and remove an application called Mousepad. There are two ways to find applications: searching and browsing.
 
 To search for Mousepad, type "Mousepad" into the search bar on the top right. The Software Center will refresh the list of applications below as you type.
 
-To browse for Mousepad, click on the "Accessories" department, then scroll down to the "M" section. The Accessories department does not contain sub-departments, though most others do.
+To browse for Mousepad, click on the "Accessories" department, and then scroll down to the "M" section. The Accessories department does not contain sub-departments, though most others do.
 
-When you find it, do not click install, but click "More Info" to learn more about Mousepad.
+When you find Mousepad, do not click install, but click "More Info" to learn more about Mousepad.

=== modified file 'software-managment/4_software-center-installation'
--- software-managment/4_software-center-installation	2010-09-06 18:50:09 +0000
+++ software-managment/4_software-center-installation	2010-09-11 15:06:45 +0000
@@ -1,1 +1,1 @@
-The overview page for Mousepad contains an extended description of Mousepad, a screenshot, as well as links and technical information. Click Install to install Mousepad.
+The overview page for Mousepad contains an extended description of Mousepad, a screenshot, and links and technical information. Click Install to install Mousepad.

=== modified file 'software-managment/5_software-center-removal'
--- software-managment/5_software-center-removal	2010-09-06 18:50:09 +0000
+++ software-managment/5_software-center-removal	2010-09-11 15:06:45 +0000
@@ -1,3 +1,3 @@
-Now that you've installed Mousepad, the overview page shows where to find Mousepad.
+Now that you have installed Mousepad, the overview page shows where to find Mousepad.
 
-It's time to learn how to remove applications. Click on the "Installed Software" tab to show all installed applications. You can manually search or use the search bar to find it again. When you find it, click "Remove". This will remove Mousepad from your system.
+Now you should learn how to remove applications. Click on the "Installed Software" tab to show all installed applications. You can manually search or use the search bar to find Mousepad again. When you find it, click "Remove" to remove Mousepad from your system.

=== modified file 'software-managment/6_software-center_history'
--- software-managment/6_software-center_history	2010-09-06 18:50:09 +0000
+++ software-managment/6_software-center_history	2010-09-11 15:06:45 +0000
@@ -1,3 +1,3 @@
-Clicking the "History" button on the side will show you past software management. There are 4 sections to view; all, installations, removals, and updates. Click any one and you will see a list of past actions, sorted by day.
+Clicking the "History" button on the side will show you past software management. There are four sections to view: all, installations, removals, and updates. Click any one to see a list of past actions, sorted by day.
 
-The history section is useful for when you want to check the names of previously installed or removed packages.
+The history section is useful for finding the names of previously installed or removed packages.

=== modified file 'software-managment/7_software-center_paid-aps'
--- software-managment/7_software-center_paid-aps	2010-09-11 11:30:42 +0000
+++ software-managment/7_software-center_paid-aps	2010-09-11 15:06:45 +0000
@@ -1,4 +1,4 @@
-With Ubuntu 10.10 there are also aps for purchase available.
+In Ubuntu 10.10 there are also applications available for purchase.
 
-You will find these aps in the subsection "For Purchase" that can be found in the "Get Software" section.
-If you find one, clicking on the ‘buy’ button opens up a window for the Ubuntu Single Sign-on service where you can proceed with your payment.
+You will find these applications in the subsection "For Purchase" in the "Get Software" section os Software Center.
+If you find one you want to buy, clicking on the ‘buy’ button opens up a window for the Ubuntu Single Sign-on service where you can proceed with your payment.

=== modified file 'software-managment/8_update-manager'
--- software-managment/8_update-manager	2010-09-11 11:30:42 +0000
+++ software-managment/8_update-manager	2010-09-11 15:06:45 +0000
@@ -1,3 +1,3 @@
-Ubuntu prides itself on keeping software up to date easily. An application called the Update Manager is used to find and install updates for all software on your computer.
+Ubuntu prides itself on the ease of keeping software up to date. An application called Update Manager is used to find and install updates for all software on your computer.
 
-To manually launch the Update Manager, click on the System menu, then Administration, then click Update Manager. Normally, the Update Manager will open itself automatically.
+To manually launch the Update Manager, click on the System menu, then Administration, then click Update Manager. Normally, the Update Manager will open itself automatically when updates are available.

=== modified file 'software-managment/9_update-manager-window'
--- software-managment/9_update-manager-window	2010-09-11 08:47:38 +0000
+++ software-managment/9_update-manager-window	2010-09-11 15:06:45 +0000
@@ -1,5 +1,5 @@
-If you have launched the Update Manager manually, you can click the "Check" button to make the update manager check for updates.
-
-Hitting "Install" will install any updates with checkmarks. Installing all updates is recommended.
-
-Hit the "Settings" button to learn about configuring the Update Manager.
+If you have launched the Update Manager manually, you can click the "Check" button to check for updates.
+
+Clicking "Install" will install any updates with checkmarks. Installing all updates is recommended.
+
+Click the "Settings" button to learn about configuring the Update Manager.