← Back to team overview

ubuntu-manual team mailing list archive

[Merge] lp:~vibhavp/ubuntu-manual/ubuntu-manual into lp:ubuntu-manual

 

Vibhav Pant has proposed merging lp:~vibhavp/ubuntu-manual/ubuntu-manual into lp:ubuntu-manual.

Requested reviews:
  Ubuntu Manual Team (ubuntu-manual)

For more details, see:
https://code.launchpad.net/~vibhavp/ubuntu-manual/ubuntu-manual/+merge/106653
-- 
https://code.launchpad.net/~vibhavp/ubuntu-manual/ubuntu-manual/+merge/106653
Your team Ubuntu Manual Team is requested to review the proposed merge of lp:~vibhavp/ubuntu-manual/ubuntu-manual into lp:ubuntu-manual.
=== modified file 'advanced-topics/advanced-topics.tex'
--- advanced-topics/advanced-topics.tex	2012-05-01 14:01:24 +0000
+++ advanced-topics/advanced-topics.tex	2012-05-21 16:24:22 +0000
@@ -48,7 +48,7 @@
 To test a terminal command, type \userinput{pwd} and press \keystroke{Enter}. The 
 terminal should display \filepath{/home/\emph{yourusername}}.
 This text is called the ``\gls{output}.'' You have just used the
-\commandlineapp{pwd} (print working directory) command, which outputs (displays) the current directory.
+\commandlineapp{pwd} (print working directory) command, which outputs or prints (displays) the current directory.
 
 \screenshot{06-default-terminal.png}{ss:default-terminal}{The default terminal window allows you to run hundreds of useful commands.}
 

=== modified file 'hardware/scanning.tex'
--- hardware/scanning.tex	2012-04-15 23:32:16 +0000
+++ hardware/scanning.tex	2012-05-21 16:24:22 +0000
@@ -1,6 +1,7 @@
 %Written by Rudolph du Plooy: <rudidu@xxxxxxxxx>. Updated by Sayantan Das <sayantan13@xxxxxxxxx> for Oneiric
 %Edited by JasonCook599s
 % Edited by Hannie (corrections) - No need to mention my name, I just want to say I made some changes
+%Edited by Vibhav Pant - Added Screenshots
 \section{Scanning text and images}
 \index{scanner!using}
 Scanning a document or an image is very simple in Ubuntu. Scanning is handled by the application Simple Scan.
@@ -15,6 +16,7 @@
   \item Click the \button{Paper Icon} to add another page.
   \item Click \button{Save} to save.
 \end{enumerate}
+\screenshot{simple-scan.png}{ss:simple-scan}{You can scan a document or image in Ubuntu from the Simple Scan Application.}
 
 You can save the scanned documents and pictures in jpeg. You can also save in pdf format to enable opening in \application{Acrobat Reader}. To do that, add the extension ``.pdf'' at the end of the filename.
 

=== added file 'screenshots/en/removing-software-from-usc.png'
Binary files screenshots/en/removing-software-from-usc.png	1970-01-01 00:00:00 +0000 and screenshots/en/removing-software-from-usc.png	2012-05-21 16:24:22 +0000 differ
=== added file 'screenshots/en/simple-scan.png'
Binary files screenshots/en/simple-scan.png	1970-01-01 00:00:00 +0000 and screenshots/en/simple-scan.png	2012-05-21 16:24:22 +0000 differ
=== modified file 'software-management/software-management.tex'
--- software-management/software-management.tex	2012-05-20 03:09:53 +0000
+++ software-management/software-management.tex	2012-05-21 16:24:22 +0000
@@ -6,6 +6,7 @@
 % Editor: Varun Kashyap
 % Editor: Rick Fosburgh
 % Editor: Hannie Dumoleyn (Actions: delete, rephrase, correct etc.)
+% Editor: Vibhav Pant
 
 
 \chapter{Software Management}
@@ -55,7 +56,7 @@
 There are numerous ways to install software on an operating system. In Ubuntu, the quickest and easiest way to find and install new applications is through the \application{Ubuntu Software Center}.
 
 To start the application, click on the Ubuntu Software Center icon in the launcher, or click on the \menu{Dash} and search for \application{Ubuntu Software Center}.   
-\screenshot{SoftwareCenter2.png}{ss:softwarecenter2}{You can install and remove applications from your computer using the Software Center.}
+\screenshot{SoftwareCenter2.png}{ss:softwarecenter2}{You can install and remove applications from your computer using the Ubuntu Software Center.}
 %%\screenshot{SoftwareCenterIcon.png}{ss:softcenticon}{Ubuntu Software Center icon in the launcher.}
 
 The Ubuntu Software Center can be used to install applications that are available in the official Ubuntu repositories. The Software Center window has four parts\dash a list of categories on the left, a banner at the top, a Recommended For You panel at the bottom and two featured areas on the right. Clicking on a category will take you to a list of related applications. For example, the Internet category contains Firefox Web Browser. The featured areas highlight What's New and Top Rated software. Each area shows different application icons. Just click an icon to get more information on the application or to install it. To see all software the area contains, click More. 
@@ -95,7 +96,8 @@
 
 \subsubsection{Removing software}
 \index{software! removing}
-Removing applications is very similar to installing them. First find the installed software in \application{Ubuntu Software Center}. You can click on the \button{Installed} button which will show all the installed software listed in different categories. Scroll down to the application you wish to remove. If you click on the arrow next to \button{Installed} button, you will find a list of software providers, which can help you to narrow your search. You also can enter keywords in the Search field to quickly find installed software, or you can search by date in the History tab (more on History below).
+Removing applications is very similar to installing them. First find the installed software in \application{Ubuntu Software Center}. You can click on the \button{Installed} button which will show all the installed software listed in different categories. Scroll down to the application or just search the application you wish to remove. If you click on the arrow next to \button{Installed} button, you will find a list of software providers, which can help you to narrow your search. You also can enter keywords in the Search field to quickly find installed software, or you can search by date in the History tab (more on History below).
+\screenshot{removing-software-from-usc.png}{ss:removing-software-from-usc}{This is an example of removing the game \application{Red Eclipse} from Ubuntu by using the Ubuntu Software Center.}
 
 To remove software:
 \begin{enumerate}