Ubuntu Documentation

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

  1. fix-for-1200381
  2. Merge into trunk2017-07-10
Proposed by Chris Perry
Status: Merged
Merged at revision: 594
Proposed branch: lp:~clissold345/ubuntu-docs/fix-for-1200381
Merge into: lp:~ubuntu-core-doc/ubuntu-docs/trunk2017-07-10
Diff against target: 121 lines (+76/-20)
3 files modified
ubuntu-help/C/security-settings.page (+71/-0)
ubuntu-help/C/unity-shopping.page (+4/-20)
ubuntu-help/Makefile.am (+1/-0)
To merge this branch: bzr merge lp:~clissold345/ubuntu-docs/fix-for-1200381
Reviewer Review Type Date Requested Status
Gunnar Hjalmarsson Approve
Review via email: mp+315562@code.launchpad.net

Description of the change

I've tried to keep this page relatively brief. Eg I haven't repeated everything that the user can see on the tabs.

I've added a few minor extra pieces of info. Eg I noticed that the companies that provide the online search results are listed in Canonical's privacy policy, so I've mentioned that in passing.

On the Files & Applications tab the "include" and "exclude" lists apply to the usage data, so they don't directly apply to what's listed in the Dash, which I found a bit confusing.

I've deliberately started each tab section with "This setting ..." or "These settings ...". This hopefully makes the structure of the page clearer.

I made the description "Change some security and privacy settings" because there are other settings (described elsewhere in the desktop help) that relate to security and privacy.

Terminology: "checkbox".

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

Thanks for your work with this page! Most of it looks good, but the description of the Search tab needs to be changed.

It's actually described already here:

https://help.ubuntu.com/stable/ubuntu-help/unity-shopping.html

I would suggest that the text at unity-shopping.page (without the steps) is merged into this new page, and that we drop unity-shopping.page. (Just linking to it would be an option, but I think it has served its purpose as a separate page, and that including the contents would be better.)

review: Needs Fixing
Revision history for this message
Chris Perry (clissold345) wrote :

Thanks for the link to unity-shopping.html. I hadn't seen that page. What about keeping unity-shopping.html since it answers a perfectly reasonable question (Why are there shopping links in the Dash?). I could delete the second section (the procedure) and add a link into security-settings.html? Then revise the text of both pages slightly so they're in step? I think that would do.

From the point of view of security-settings.html the shopping links aren't of great importance since they're just one type of online search result (depending on what the search is, there are also links to wikipedia articles, etc).

Revision history for this message
Gunnar Hjalmarsson (gunnarhj) wrote :

Linking would work too.

When saying that it has served its purpose, I had its history in mind. At the beginning that option was enabled by default, which was controversial and the reason why the page was created in the first place:

https://help.ubuntu.com/14.04/ubuntu-help/unity-shopping.html

When Canonical changed it to be disabled by default, we just made a minor change of the page. Given that we now create a new page, the strong focus on that particular feature is not motivated IMO.

Anyway, I leave it to you to decide.

lp:~clissold345/ubuntu-docs/fix-for-1200381 updated
594. By Chris Perry

Security and privacy; LP: #1200381

Revision history for this message
Chris Perry (clissold345) wrote :

This is revision 594 again.

Thanks for letting me decide! I've revised unity-shopping.page. unity-shopping.page is concerned with the shopping links. The relevant part of security-settings.page is concerned with the online search results as a whole (of which the shopping links are part). Does that look OK?

I wasn't sure about naming Amazon in unity-shopping.page. Why pick out Amazon (and not the others)? But I didn't change it.

Revision history for this message
Gunnar Hjalmarsson (gunnarhj) wrote :

Makes sense. Let's keep Amazon as a hint that some commercial companies are included.

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'ubuntu-help/C/security-settings.page'
2--- ubuntu-help/C/security-settings.page 1970-01-01 00:00:00 +0000
3+++ ubuntu-help/C/security-settings.page 2017-01-31 12:23:54 +0000
4@@ -0,0 +1,71 @@
5+<page xmlns="http://projectmallard.org/1.0/"
6+ type="topic"
7+ style="task"
8+ id="security-settings">
9+
10+ <info>
11+ <link type="guide" xref="prefs"/>
12+ <desc>Change some security and privacy settings.</desc>
13+
14+ <revision version="17.04" date="2017-01-24" status="review"/>
15+
16+ <credit type="author">
17+ <name>Ubuntu Documentation Team</name>
18+ </credit>
19+
20+ <link type="seealso" xref="display-lock"/>
21+ <link type="seealso" xref="net-security-tips"/>
22+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
23+ </info>
24+
25+ <title>Security &amp; Privacy</title>
26+
27+ <p>This page describes the settings in the <app>Security &amp; Privacy</app> application. The four tabs are as follows:</p>
28+
29+<section id="tab1">
30+ <title>Security</title>
31+
32+<p>These settings specify whether a password is required when Ubuntu wakes from <link xref="power-suspend">suspend</link> or returns from a blank screen.
33+Your computer will be more secure if in these cases passwords are required.</p>
34+
35+</section>
36+
37+<section id="tab2">
38+ <title>Files &amp; Applications</title>
39+
40+<p>These settings allow you to specify which recently-used files, folders and applications are listed in the <gui>Dash</gui>, and elsewhere.</p>
41+
42+<p>In order to determine the recently-used files, folders and applications, Ubuntu collects usage data.
43+If you wish, you can turn <gui>OFF</gui> collection of usage data and clear some or all of the collected usage data.</p>
44+
45+<p>The <gui>Include:</gui> list lists some common file types. To include a file type in the usage data, tick the checkbox next to it.
46+To exclude a file type from the usage data, clear the checkbox next to it.
47+</p>
48+
49+<p>The <gui>Exclude:</gui> list lists folders and applications excluded from the usage data.
50+ To add a folder or application to the list, click the "+" button and select the required folder or application.
51+To remove a folder or application from the list, select it and click the "-" button.
52+</p>
53+
54+</section>
55+
56+<section id="tab3">
57+ <title>Search</title>
58+
59+<p>This setting specifies whether online search results are included when searching in the <gui>Dash</gui>.
60+ For more details of the online search results, and the companies that provide them,
61+ please see Canonical's privacy policy, which you can access via the <gui>Diagnostics</gui> tab.</p>
62+
63+</section>
64+
65+<section id="tab4">
66+ <title>Diagnostics</title>
67+
68+<p>These settings specify which types of system information Ubuntu can send to Canonical.
69+This information (if you allow it to be sent) will help Canonical improve Ubuntu.
70+If you want more information about how Canonical uses the system information,
71+click <gui>Privacy Policy</gui> to read Canonical's privacy policy.</p>
72+
73+</section>
74+
75+</page>
76
77=== modified file 'ubuntu-help/C/unity-shopping.page'
78--- ubuntu-help/C/unity-shopping.page 2016-03-17 14:37:03 +0000
79+++ ubuntu-help/C/unity-shopping.page 2017-01-31 12:23:54 +0000
80@@ -34,25 +34,9 @@
81 continues to support the Ubuntu project, then uses this money to make
82 Ubuntu better.</p>
83
84-<p>By default, the inclusion of online search results is turned off.</p>
85-
86-<section id="enable-shopping">
87- <title>Turn on online search results</title>
88-
89- <p>If you want to receive online search suggestions, you can
90- enable this feature through the <gui>Security &amp; Privacy</gui> system setting.</p>
91-
92-<steps>
93-
94- <item><p>Click the <gui>system menu</gui> at the far right of the <gui>menu bar</gui> and
95- select <gui>System Settings</gui>.</p></item>
96-
97- <item><p>Open <gui>Security &amp; Privacy</gui> and select the <gui>Search</gui> tab.</p></item>
98-
99- <item><p>Switch on <gui>Include online search results</gui>.</p></item>
100-
101-
102-</steps>
103-</section>
104+<p>By default, the inclusion of online search results is turned off.
105+If you want to include online search results, you can
106+ enable this feature through the <link xref="security-settings"><gui>Security &amp; Privacy</gui></link> settings.</p>
107+
108
109 </page>
110
111=== modified file 'ubuntu-help/Makefile.am'
112--- ubuntu-help/Makefile.am 2017-01-02 20:17:38 +0000
113+++ ubuntu-help/Makefile.am 2017-01-31 12:23:54 +0000
114@@ -286,6 +286,7 @@
115 printing-streaks.page \
116 report-ubuntu-bug.page \
117 screen-shot-record.page \
118+ security-settings.page \
119 session-formats.page \
120 session-language.page \
121 session-screenlocks.page \

Subscribers

People subscribed via source and target branches