Ubuntu Documentation

Merge lp:~clissold345/ubuntu-docs/file-search-update into lp:~ubuntu-core-doc/ubuntu-docs/trunk2017-07-10

  1. file-search-update
  2. Merge into trunk2017-07-10
Proposed by Chris Perry
Status: Merged
Merged at revision: 603
Proposed branch: lp:~clissold345/ubuntu-docs/file-search-update
Merge into: lp:~ubuntu-core-doc/ubuntu-docs/trunk2017-07-10
Diff against target: 123 lines (+36/-46)
2 files modified
ubuntu-help/C/files-search.page (+35/-46)
ubuntu-help/Makefile.am (+1/-0)
To merge this branch: bzr merge lp:~clissold345/ubuntu-docs/file-search-update
Reviewer Review Type Date Requested Status
Doug Smythies Approve
Review via email: mp+319379@code.launchpad.net

Description of the change

I've checked the changes against 17.04 (I did sudo apt dist-upgrade earlier today). There doesn't seem to be a way of saving searches now, so I've deleted that bit.

I've tried to cover basic searches in a sensible way but I haven't attempted to cover all the details.

As usual I prefer steps in a procedure to have the form "Do such and such" or "If condition do such and such".

To post a comment you must log in.
lp:~clissold345/ubuntu-docs/file-search-update updated
603. By Chris Perry

File search update

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

Oops I forgot to update Makefile.am. Output of local commit is now:

Committing to: /home/chris/ubuntu-docs/
modified ubuntu-help/Makefile.am
modified ubuntu-help/C/files-search.page
added ubuntu-help/C/figures/system-search.png
Committed revision 603.

Revision history for this message
Doug Smythies (dsmythies) wrote :

Looks good. Note: I did not actually compile the docs.

review: Approve
Revision history for this message
Doug Smythies (dsmythies) wrote :

Oh, I forgot, I would probably have left the link, <link xref="files-browse">, in place. It is not clear to me why to delete it.

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

Hi Doug, thanks for reviewing this.

Regarding the old step 1. I didn't like it. The original writer linked to a page that (in the second paragraph) tells the user how to open the file manager! I don't think that's very helpful!

I'll push the change in five minutes.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'ubuntu-help/C/figures/system-search.png'
2Binary files ubuntu-help/C/figures/system-search.png 1970-01-01 00:00:00 +0000 and ubuntu-help/C/figures/system-search.png 2017-03-08 22:11:19 +0000 differ
3=== modified file 'ubuntu-help/C/files-search.page'
4--- ubuntu-help/C/files-search.page 2016-12-17 09:12:38 +0000
5+++ ubuntu-help/C/files-search.page 2017-03-08 22:11:19 +0000
6@@ -9,8 +9,7 @@
7 <revision pkgversion="3.6.0" version="0.2" date="2012-09-25" status="review"/>
8 <revision version="14.10" date="2014-09-14" status="review"/>
9
10- <desc>Locate files based on file name and type. Save your searches for
11- later use.</desc>
12+ <desc>Search for files or folders.</desc>
13 <credit type="author">
14 <name>GNOME Documentation Project</name>
15 <email>gnome-doc-list@gnome.org</email>
16@@ -26,11 +25,13 @@
17 <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
18 </info>
19
20- <title>Search for files</title>
21+ <title>Search for files or folders</title>
22
23- <p>You can search for files based on their name or file type directly
24- within the file manager. You can even save common searches, and they
25- will appear as special folders in your home folder.</p>
26+ <p>You can search for:</p>
27+ <list type="disc">
28+ <item><p>Files based on name or file type, and</p></item>
29+ <item><p>Folders based on name.</p></item>
30+ </list>
31
32 <links type="topic" style="linklist">
33 <title>Other search applications</title>
34@@ -40,49 +41,37 @@
35
36 <steps>
37 <title>Search</title>
38- <item><p><link xref="files-browse">Open the file manager</link></p></item>
39- <item><p>If you know the files you want are under a particular folder, go
40+ <item><p>Open <app>Files</app> from the <gui>Dash</gui>.</p></item>
41+
42+ <item><p>If you know the files or folders that you want are under a particular folder, navigate
43 to that folder.</p></item>
44- <item><p>Click the magnifying glass in the toolbar, or press
45+
46+ <item><p>Click the magnifying glass
47+ <media type="image" mime="image/png" src="figures/system-search.png">Magnifying glass icon</media>
48+ in the toolbar, or press
49 <keyseq><key>Ctrl</key><key>F</key></keyseq>.</p></item>
50- <item><p>Type a word or words that you know appear in the file name. For
51+
52+ <item><p>In the search box type a word or words that you know appear in the name. For
53 example, if you name all your invoices with the word "Invoice", type
54- <input>invoice</input>. Press <key>Enter</key>. Words are matched regardless
55- of case.</p></item>
56- <item><p>You can narrow your results by location and file type.</p>
57- <list type="disc">
58- <item><p>Click <gui>Home</gui> to restrict the search results to your
59- <file>Home</file> folder, or <gui>All Files</gui> to search
60- everywhere.</p></item>
61- <item><p>Click <key>+</key> and pick a <gui>File Type</gui> from the
62- drop-down list to narrow the search results based on file type. Click the
63- <key>x</key> button to remove this option and widen the search
64- results.</p></item>
65- </list>
66+ <input>invoice</input>. Words are matched regardless of case.</p></item>
67+
68+ <item><p>If you want to restrict your search to files of a particular type, click the
69+ <media type="image" mime="image/png" src="figures/go-down.png">Down arrow icon</media>
70+ button and select a file type from the <gui>What</gui>
71+ drop-down list. Click the <key>x</key> button to remove this restriction.</p>
72+
73+ <p>You can open, copy, delete, or otherwise work with your files and folders from
74+ the search results, just as you would from any folder in the file manager.
75+ </p>
76+
77 </item>
78- <item><p>You can open, copy, delete, or otherwise work with your files from
79- the search results, just as you would from any folder in the file manager.
80- </p></item>
81- <item><p>Click the magnifying glass in the toolbar again to exit the search
82+
83+ <item><p>Click the magnifying glass
84+ <media type="image" mime="image/png" src="figures/system-search.png">Magnifying glass icon</media>
85+ in the toolbar again to exit the search
86 and return to the folder.</p></item>
87- </steps>
88-
89- <p>If you perform certain searches often, you can save them to access them
90- quickly.</p>
91-
92- <steps>
93- <title>Save a search</title>
94- <item><p>Start a search as above.</p></item>
95- <item><p>When you're happy with the search parameters, click <gui>File</gui>
96- in the menu bar and select <gui>Save Search As...</gui>.</p></item>
97- <item><p>Give the search a name and click <gui>Save</gui>. If you like,
98- select a different folder to save the search in. When you view that folder,
99- you will see your saved search as an orange folder icon with a magnifying
100- glass on it.</p></item>
101- </steps>
102-
103- <p>To remove the search file when you are done with it, simply
104- <link xref="files-delete">delete</link> the search as you would any other
105- file. When you delete a saved search, it does not delete the files that the
106- search matched.</p>
107+
108+ </steps>
109+
110+
111 </page>
112
113=== modified file 'ubuntu-help/Makefile.am'
114--- ubuntu-help/Makefile.am 2017-03-05 10:16:56 +0000
115+++ ubuntu-help/Makefile.am 2017-03-08 22:11:19 +0000
116@@ -24,6 +24,7 @@
117 figures/network-offline.svg \
118 figures/printing-select.png \
119 figures/system-devices-panel.svg \
120+ figures/system-search.png \
121 figures/ubuntu-logo.png \
122 figures/ubuntu-mascot-creature.png \
123 figures/unity.png \

Subscribers

People subscribed via source and target branches