Merge lp:~mpt/software-center/help-3.0 into lp:software-center

Proposed by Matthew Paul Thomas
Status: Merged
Merged at revision: 1135
Proposed branch: lp:~mpt/software-center/help-3.0
Merge into: lp:software-center
Diff against target: 156 lines (+55/-38)
1 file modified
help/C/software-center.xml (+55/-38)
To merge this branch: bzr merge lp:~mpt/software-center/help-3.0
Reviewer Review Type Date Requested Status
software-store-developers Pending
Review via email: mp+34878@code.launchpad.net

Description of the change

Updates the help for 3.0.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'help/C/software-center.xml'
2--- help/C/software-center.xml 2010-03-25 13:25:49 +0000
3+++ help/C/software-center.xml 2010-09-08 16:45:55 +0000
4@@ -6,8 +6,8 @@
5 <!--<?yelp:chunk-depth 4?>-->
6 <!--
7 (Do not remove this comment block.)
8- Version: 2.0
9- Last modified: Mar 25, 2010
10+ Version: 3.0
11+ Last modified: Sep 8, 2010
12 Maintainers:
13 Michael Vogt <mvo@ubuntu.com>
14
15@@ -74,8 +74,8 @@
16 and you can install an item with the click of a button.
17 </para>
18 <para>
19- The Center also lets you examine the software installed on the
20- computer already,
21+ You can also examine which software is installed on the computer
22+ already,
23 and remove anything you no longer need.
24 </para>
25 </chapter>
26@@ -129,26 +129,24 @@
27 <title id="launching-title"
28 >Using a program once it&#8217;s installed</title>
29 <para>
30- Most installed applications appear
31- in the <guimenu>Applications</guimenu> menu in the corner of the screen,
32- in the same category as they came from in the Software Center.
33- </para>
34- <para>
35- For example, if you installed a program from the
36- <guilabel>Office</guilabel> department, it will appear inside
37- <menuchoice><guimenu>Applications</guimenu>
38- <guisubmenu>Office</guisubmenu></menuchoice>.
39- </para>
40- <para>
41- Utilities for changing settings may appear inside
42+ For most programs, once they are installed,
43+ you can launch them from the <guimenu>Applications</guimenu> menu.
44+ (Utilities for changing settings may appear inside
45 <menuchoice><guimenu>System</guimenu>
46 <guisubmenu>Preferences</guisubmenu></menuchoice> or
47 <menuchoice><guimenu>System</guimenu>
48- <guisubmenu>Administration</guisubmenu></menuchoice>.
49+ <guisubmenu>Administration</guisubmenu></menuchoice> instead).
50+ </para>
51+ <para>
52+ To find out where to launch a new program,
53+ navigate to the screen for that program in Ubuntu Software Center,
54+ if it is not still being displayed.
55+ The menu location should be displayed on that screen,
56+ below the colored bar.
57 </para>
58 <para>
59 If you are using Ubuntu Netbook Edition,
60- an application appears in its category on the home screen.
61+ an application appears in the appropriate category on the home screen.
62 </para>
63 <para>
64 Some items, such as media playback or Web browser plugins,
65@@ -193,13 +191,13 @@
66 >Why is it asking me to remove several programs together?</title>
67 <para>
68 Sometimes if you try to remove one item,
69- the Software Center will warn you that other items will be removed too.
70+ Ubuntu Software Center will warn you that other items will be removed too.
71 There are two main reasons this happens.
72 </para>
73 <itemizedlist>
74 <listitem>
75 <para>
76- If you remove an application, any add-ons or accessories
77+ If you remove an application, any add-ons or plugins
78 for that application usually will be removed too.
79 </para>
80 </listitem>
81@@ -233,7 +231,7 @@
82 <chapter id="canonical-maintained">
83 <title>What is &#8220;Canonical-maintained&#8221;?</title>
84 <para>
85- Some of the software available in Ubuntu Software Center is
86+ Some of the software available for Ubuntu is
87 maintained by Canonical.
88 Canonical engineers ensure that security fixes and other critical updates
89 are provided for these programs.
90@@ -254,22 +252,40 @@
91 Ubuntu Software Center.
92 </para>
93 </chapter>
94- <chapter id="why-free">
95- <title id="why-free-title">Why are all the programs free?</title>
96- <para>
97- Currently, all software in Ubuntu Software Center is free of charge.
98- </para>
99- <para>
100- Most of this software is developed as <firstterm>open source</firstterm>,
101- which means anyone is allowed to alter it and redistribute it for any
102- price.
103- Ubuntu developers, Debian developers, and others
104- package the software available in Ubuntu Software Center,
105- and make it available to you for free.
106- </para>
107- <para>
108- In a future version of Ubuntu, the Center will also allow software
109- purchases.
110+ <chapter id="commercial">
111+ <title id="commercial-title">Do I need to pay anything?</title>
112+ <para>
113+ Most software in Ubuntu Software Center is free of charge.
114+ </para>
115+ <para>
116+ If something costs money,
117+ it has a <guilabel>Buy</guilabel> button instead of an
118+ <guilabel>Install</guilabel> button, and
119+ its price is shown on the screen for the individual item.
120+ </para>
121+ <para>
122+ To pay for commercial software, you need an Internet connection,
123+ and an Ubuntu Single Sign On account or Launchpad account.
124+ If you do not have an account,
125+ Ubuntu Software Center will help you register one.
126+ </para>
127+ </chapter>
128+ <chapter id="commercial-reinstalling">
129+ <title id="commercial-reinstalling-title">
130+ What if I paid for software and then lost it?
131+ </title>
132+ <para>
133+ If you accidentally removed software that you purchased,
134+ and you want it back,
135+ choose <menuchoice><guimenu>File</guimenu>
136+ <guimenuitem>Reinstall Previous Purchases</guimenuitem></menuchoice>.
137+ </para>
138+ <para>
139+ Once you sign in to the account that you used to buy the software,
140+ Ubuntu Software Center will display your purchases for reinstalling.
141+ </para>
142+ <para>
143+ This works even if you have reinstalled Ubuntu on the computer.
144 </para>
145 </chapter>
146 <chapter id="missing">
147@@ -306,7 +322,8 @@
148 their <guimenu>Help</guimenu> menu.
149 </para>
150 <para>
151- Otherwise, look through the Center for another program to do what you want.
152+ Otherwise, look through Ubuntu Software Center for another program
153+ to do what you want.
154 </para>
155 <itemizedlist>
156 <listitem><para><xref linkend="removing" endterm="removing-title"/></para></listitem>