Ubuntu Documentation

Merge lp:~clissold345/ubuntu-docs/fix-for-1637861 into lp:~ubuntu-core-doc/ubuntu-docs/trunk2017-07-10

  1. fix-for-1637861
  2. Merge into trunk2017-07-10
Proposed by Chris Perry
Status: Merged
Merged at revision: 566
Proposed branch: lp:~clissold345/ubuntu-docs/fix-for-1637861
Merge into: lp:~ubuntu-core-doc/ubuntu-docs/trunk2017-07-10
Diff against target: 87 lines (+22/-11)
2 files modified
ubuntu-help/C/addremove-install.page (+12/-7)
ubuntu-help/C/addremove-remove.page (+10/-4)
To merge this branch: bzr merge lp:~clissold345/ubuntu-docs/fix-for-1637861
Reviewer Review Type Date Requested Status
Gunnar Hjalmarsson Approve
Review via email: mp+309835@code.launchpad.net

Description of the change

Ubuntu Software can only install applications (not other software) and can only remove applications (not other software), so I had to change two pages.

Im using the terms "application" and "software" and Ive given a simple definition of "application". Im not using the terms "program" or "package" here. I decided the two pages were mainly about applications (installing them and removing them) but Ive given a quick mention to Synaptic (for installing/removing other software). Of course a user can use the command line to install or remove software - but we don't want to mention that here.

In step 7 of the install procedure I couldn't see the option mentioned - I'm using Ubuntu 16.04 - (it was once in Ubuntu Software?) - so Ive deleted the reference to that.

To post a comment you must log in.
Revision history for this message
Gunnar Hjalmarsson (gunnarhj) wrote :

Sensible changes which address the bug report. When merging I converted the Synaptic references to links.

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntu-help/C/addremove-install.page'
2--- ubuntu-help/C/addremove-install.page 2016-04-19 21:23:40 +0000
3+++ ubuntu-help/C/addremove-install.page 2016-11-02 11:17:56 +0000
4@@ -7,7 +7,7 @@
5 <name>Ubuntu Documentation Team</name>
6 </credit>
7 <desc>
8- Use <app>Ubuntu Software</app> to add programs and make Ubuntu more
9+ Use <app>Ubuntu Software</app> to install additional applications and make Ubuntu more
10 useful.
11 </desc>
12 <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
13@@ -19,17 +19,24 @@
14 </info>
15
16 <title>
17- Install additional software
18+ Install additional applications
19 </title>
20
21 <p>
22+ An application is software that has a graphical user interface (GUI).
23 The Ubuntu development team has chosen a default set of applications that we
24 think makes Ubuntu very useful for most day-to-day tasks. However, you will
25- certainly want to install more software to make Ubuntu more useful to you.
26+ certainly want to install more applications to make Ubuntu more useful to you.
27+ To install an application, you can use <app>Ubuntu Software</app>.
28+ </p>
29+
30+ <p>
31+ You may also wish to install software that does not have a GUI. To install
32+ such software, you can use <app>Synaptic</app>.
33 </p>
34
35 <p>
36- To install additional software, complete the following steps:
37+ To install an application:
38 </p>
39
40 <steps>
41@@ -72,9 +79,7 @@
42 </item>
43 <item>
44 <p>
45- A shortcut to your new app will be added to the Launcher. To disable
46- this feature, uncheck <guiseq><gui>View</gui><gui>New Applications in
47- Launcher</gui></guiseq>.
48+ A shortcut to your new app will be added to the Launcher.
49 </p>
50 </item>
51 </steps>
52
53=== modified file 'ubuntu-help/C/addremove-remove.page'
54--- ubuntu-help/C/addremove-remove.page 2016-04-19 21:23:40 +0000
55+++ ubuntu-help/C/addremove-remove.page 2016-11-02 11:17:56 +0000
56@@ -7,10 +7,11 @@
57 <name>Ubuntu Documentation Team</name>
58 </credit>
59 <desc>
60- Remove software that you no longer use.
61+ Remove applications that you no longer use.
62 </desc>
63 <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
64 <link type="guide" xref="addremove" group="#first"/>
65+ <link type="seealso" xref="addremove-install-synaptic"/>
66 <revision version="16.04" date="2016-03-13" status="review"/>
67 </info>
68
69@@ -18,10 +19,15 @@
70 Remove an application
71 </title>
72
73- <p>
74- <app>Ubuntu Software</app> helps you to remove software that you
75- no longer use.
76+ <p>An application is software that has a graphical user interface (GUI).
77+ You can use <app>Ubuntu Software</app> to remove applications that you
78+ no longer use.</p>
79+
80+ <p>You may also wish to remove software that does not have a GUI.
81+ To remove such software, you can use <app>Synaptic</app>.
82 </p>
83+
84+ <p>To remove an application:</p>
85
86 <steps>
87 <item>

Subscribers

People subscribed via source and target branches