Ubuntu Documentation

Merge lp:~clissold345/ubuntu-docs/some-more-nautilus-changes into lp:~ubuntu-core-doc/ubuntu-docs/trunk2017-07-10

  1. some-more-nautilus-changes
  2. Merge into trunk2017-07-10
Proposed by Chris Perry
Status: Merged
Merged at revision: 611
Proposed branch: lp:~clissold345/ubuntu-docs/some-more-nautilus-changes
Merge into: lp:~ubuntu-core-doc/ubuntu-docs/trunk2017-07-10
Diff against target: 113 lines (+39/-21)
3 files modified
ubuntu-help/C/files-browse.page (+31/-17)
ubuntu-help/C/files-lost.page (+2/-3)
ubuntu-help/C/nautilus-bookmarks-edit.page (+6/-1)
To merge this branch: bzr merge lp:~clissold345/ubuntu-docs/some-more-nautilus-changes
Reviewer Review Type Date Requested Status
Gunnar Hjalmarsson Approve
Review via email: mp+319985@code.launchpad.net

Description of the change

Is it possible to get these changes into the 17.04 help?

The output of the local commit was:

Committing to: /home/chris/ubuntu-docs/
modified ubuntu-help/C/files-browse.page
modified ubuntu-help/C/files-lost.page
modified ubuntu-help/C/nautilus-bookmarks-edit.page
Committed revision 611.

In nautilus-bookmarks-edit.page Ive added a short description of what bookmarks do, and Ive added a mention of dragging and dropping a folder in order to add a bookmark. I think it's best if all info about bookmarks - well almost all info - is collected on this page.

In files-lost.page Ive corrected a step that was wrong in 17.04. I'm using English because I couldn't find the correct icons. Even with the correct icons Id have to say "Click <button1> or <button2> to ...".

In files-browse.page the double-click actions are the default actions. They can be changed in preferences. Ive changed and shortened the text about bookmarks and linked to the bookmarks page for more info. The gui uses the terminology "locations", so Ive here followed that in the help. I created one list and one procedure. I think this makes the text clearer. I've checked the text against 17.04 and made some corrections (the gui must have changed since the text was last revised).

Pages Ive worked on usually use "select" not "pick" so Ive here changed "pick" to "select".

If there's not time to get this finished tomorrow, then we can leave it and it can go into the 17.10 help.

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

Makes sense to me. Please push it. 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/files-browse.page'
2--- ubuntu-help/C/files-browse.page 2014-02-20 01:17:51 +0000
3+++ ubuntu-help/C/files-browse.page 2017-03-15 20:19:10 +0000
4@@ -44,8 +44,8 @@
5 the sidebar (link to a topic or explain it here).</p>
6 </comment>
7
8-<p>Use the <app>Files</app> file manager to browse and organize the files on
9-your computer. You can also use it to manage files on storage devices (like
10+<p>Use the <app>Files</app> file manager to browse and organize the files and folders on
11+your computer. You can also use it to manage files and folders on storage devices (like
12 external hard disks), on <link xref="nautilus-connect">file servers</link>, and
13 on network shares.</p>
14
15@@ -58,9 +58,18 @@
16 <section id="files-view-folder-contents">
17 <title>Exploring the contents of folders</title>
18
19-<p>In the file manager, double-click any folder to view its contents,
20-and double-click any file to open it with the default application for
21-that file. You can also right-click a folder to open it in a new tab
22+<p>In the file manager by default:</p>
23+
24+<list type="disc">
25+
26+<item><p>Double-click a folder to view its contents, and</p></item>
27+
28+<item><p>Double-click a file to open it with the default application for
29+that file (if there is one).</p></item>
30+
31+</list>
32+
33+<p>You can also right-click a folder to open it in a new tab
34 or new window.</p>
35
36 <p>The <em>path bar</em> above the list of files and folders shows you which
37@@ -69,18 +78,23 @@
38 folder in the path bar to open it in a new tab or window, copy or move it, or
39 access its properties.</p>
40
41-<p>If you want to quickly skip to a file in the folder you're viewing,
42-start typing its name. A search box will appear at the top of the window and
43-the first file which matches your search will be highlighted. Press the
44-down arrow key, or scroll with the mouse, to skip to the next file that matches
45-your search.</p>
46-
47-<p>You can quickly access common places from the <em>sidebar</em>. If you do
48-not see the sidebar, click the
49-<media type="image" src="figures/go-down.png">down</media> button in the toolbar
50-and pick <gui>Show Sidebar</gui>. You can add bookmarks to folders that you use
51-often and they will appear in the sidebar. Use the <gui>Bookmarks</gui> menu to
52-do this, or simply drag a folder into the sidebar.</p>
53+<p>To quickly skip to a file in the folder you're viewing:</p>
54+
55+<steps>
56+
57+<item><p>Start typing the file name. A search box will appear at the bottom of the window and
58+the first file that matches your search will be highlighted.</p></item>
59+
60+<item><p>Press the down or up arrow keys, or scroll with the mouse, to cycle through the files that match
61+your search.</p></item>
62+
63+</steps>
64+
65+<p>You can quickly access commonly-used locations from the <em>sidebar</em>. If you do
66+not see the sidebar, click the <gui>Files</gui> menu and select <gui>Sidebar</gui>.
67+You can add <link xref="nautilus-bookmarks-edit">bookmarks</link>
68+in the sidebar in order to navigate quickly to folders.</p>
69+
70
71 </section>
72 </page>
73
74=== modified file 'ubuntu-help/C/files-lost.page'
75--- ubuntu-help/C/files-lost.page 2016-12-17 09:12:38 +0000
76+++ ubuntu-help/C/files-lost.page 2017-03-15 20:19:10 +0000
77@@ -48,9 +48,8 @@
78
79 <item><p>You might have renamed the file in a way that made the file hidden.
80 Files that start with a <file>.</file> or end with a <file>~</file> are hidden
81- in the file manager. Click the
82- <media type="image" src="figures/go-down.png">down</media> button in the file
83- manager toolbar and pick <gui>Show Hidden Files</gui> to display them. See
84+ in the file manager. Click the middle button (of three) in the file
85+ manager toolbar and select <gui>Show Hidden Files</gui> to display hidden files. See
86 <link xref="files-hidden"/> to learn more.</p></item>
87 </list>
88
89
90=== modified file 'ubuntu-help/C/nautilus-bookmarks-edit.page'
91--- ubuntu-help/C/nautilus-bookmarks-edit.page 2017-03-05 10:16:56 +0000
92+++ ubuntu-help/C/nautilus-bookmarks-edit.page 2017-03-15 20:19:10 +0000
93@@ -22,7 +22,8 @@
94 </info>
95
96 <title>Edit folder bookmarks</title>
97-<p>Your bookmarks are listed in the sidebar of the file manager. You can add, remove, or rename bookmarks.</p>
98+<p>In the file manager you can add bookmarks in the sidebar in order to navigate quickly to a folder.
99+Click on a bookmark to navigate to the associated folder. You can add, remove, or rename bookmarks:</p>
100
101 <steps>
102 <title>Add a bookmark:</title>
103@@ -32,6 +33,10 @@
104 (If the option is greyed out then the location has already been bookmarked.) The bookmark is added in the sidebar.</p></item>
105 </steps>
106
107+ <note>
108+ <p>You can also add a bookmark by dragging a folder over to the sidebar and dropping it on <gui>New bookmark</gui>.</p>
109+ </note>
110+
111 <steps>
112 <title>Remove a bookmark:</title>
113 <item><p>Right-click on the bookmark in the sidebar and select <gui>Remove</gui> from the menu.</p></item>

Subscribers

People subscribed via source and target branches