Ubuntu Documentation

Merge lp:~evfool/ubuntu-docs/instruction-fixes into lp:ubuntu-docs/oneiric

  1. instruction-fixes
  2. Merge into oneiric
Proposed by Robert Roth
Status: Merged
Merged at revision: 58
Proposed branch: lp:~evfool/ubuntu-docs/instruction-fixes
Merge into: lp:ubuntu-docs/oneiric
Diff against target: 65 lines (+7/-8)
4 files modified
ubuntu-help/C/clock-more-info.page (+2/-2)
ubuntu-help/C/shell-windows-states.page (+1/-1)
ubuntu-help/C/unity-introduction.page (+2/-2)
ubuntu-help/C/unity-launcher-change-size.page (+2/-3)
To merge this branch: bzr merge lp:~evfool/ubuntu-docs/instruction-fixes
Reviewer Review Type Date Requested Status
Matthew East (community) Approve
Review via email: mp+79466@code.launchpad.net

Description of the change

This branch contains the following fixes:
* Removes unnecessary and adds missing punctuation marks, as reported in bug #874754.
* Fixes System Settings section pointers for Time&Date and Language Support, as reported in bug #868153
* Contains updated instructions to starting CCSM (as it's not possible from System Settings anymore, the new instructions point to using the dash to start CCSM) to fix bug #869547
* Typo fixed: minizize changed to minimize (bug #876257)

To post a comment you must log in.
lp:~evfool/ubuntu-docs/instruction-fixes updated
61. By Robert Roth

Fix typo in window states page (LP: #876257)

Revision history for this message
Matthew East (mdke) wrote :

Nice work, 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/clock-more-info.page'
2--- ubuntu-help/C/clock-more-info.page 2011-05-03 07:30:10 +0000
3+++ ubuntu-help/C/clock-more-info.page 2011-10-17 11:32:23 +0000
4@@ -25,7 +25,7 @@
5 <note><p>You can also turn the clock off entirely by unchecking <gui>Show a clock
6 in the menu bar</gui>.</p>
7 <p>If you later change your mind, you can get the clock back by clicking the icon in
8-the top right of the panel and selecting <gui>System Settings</gui>. In the Personal
9+the top right of the panel and selecting <gui>System Settings</gui>. In the System
10 section, click <gui>Time &amp; Date</gui>.</p></note>
11
12 <section id="change-date-format">
13@@ -34,7 +34,7 @@
14
15 <steps>
16 <item><p>Click the icon at the very right of the panel and select <gui>System Settings</gui>.</p></item>
17- <item><p>In the System section, click <gui>Language Support</gui>.</p></item>
18+ <item><p>In the Personal section, click <gui>Language Support</gui>.</p></item>
19 <item><p>Switch to the <gui>Regional Formats</gui> tab.</p></item>
20 <item><p>Select your preferred location in the dropdown list.</p></item>
21 <item><p>You will need to log out and log back in for this change to take effect.</p></item>
22
23=== modified file 'ubuntu-help/C/shell-windows-states.page'
24--- ubuntu-help/C/shell-windows-states.page 2011-09-09 04:50:46 +0000
25+++ ubuntu-help/C/shell-windows-states.page 2011-10-17 11:32:23 +0000
26@@ -46,7 +46,7 @@
27 of the screen. Otherwise, the minimize button will appear at the top of the application window.
28 </p>
29 <note>
30- <p>When you minizize an application, the application window 'disappears' into the <gui>launcher</gui>.
31+ <p>When you minimize an application, the application window 'disappears' into the <gui>launcher</gui>.
32 The application can be retrieved by opening the <gui>launcher</gui> and clicking on that
33 application's icon, or by pressing <keyseq><key>Alt</key><key>tab</key></keyseq> to cycle through your
34 open applications.
35
36=== modified file 'ubuntu-help/C/unity-introduction.page'
37--- ubuntu-help/C/unity-introduction.page 2011-10-05 20:42:53 +0000
38+++ ubuntu-help/C/unity-introduction.page 2011-10-17 11:32:23 +0000
39@@ -66,8 +66,8 @@
40 <p>The Unity Dash</p>
41 </media>
42
43-<p>The <em>Dash</em> is designed to make it easier to find, open and use applications
44-files, and music. For example, if you type the word, "document" in to the <em>Search Bar</em>,
45+<p>The <em>Dash</em> is designed to make it easier to find, open and use applications,
46+files, and music. For example, if you type the word "document" into the <em>Search Bar</em>,
47 the Dash will show you applications that help you write and edit documents. It will also show you
48 relevant folders and documents that you have been working on recently.</p>
49
50
51=== modified file 'ubuntu-help/C/unity-launcher-change-size.page'
52--- ubuntu-help/C/unity-launcher-change-size.page 2011-08-13 08:33:53 +0000
53+++ ubuntu-help/C/unity-launcher-change-size.page 2011-10-17 11:32:23 +0000
54@@ -27,9 +27,8 @@
55 <p>If you need assistance with installing the application, consult the <link xref="addremove-install">
56 software installation help</link>, or review the <link href="ghelp:software-center">Ubuntu Software Center
57 Manual</link>.</p></item>
58- <item><p>After you have installed the program, click the power icon at the very right of the
59- <gui>panel</gui> and select <gui>System Settings</gui>.</p></item>
60- <item><p>In the Personal section, click <gui>CompizConfig Settings Manager</gui>.</p></item>
61+ <item><p>After you have installed the program, open <link xref="unity-introduction#the-dash">the Dash</link>.</p></item>
62+ <item><p>Search for <app>CompizConfig Settings Manager</app>, then click its icon from the results to start it.</p></item>
63 <item><p>In the <gui>Desktop</gui> section of the <app>CompizConfig Settings Manager</app>, click
64 <gui>Ubuntu Unity Plugin</gui>, and select the <gui>Experimental</gui> tab.</p></item>
65 <item><p>Move the <gui>Launcher icon size</gui> slider to increase or decrease the size of the

Subscribers

People subscribed via source and target branches

to status/vote changes: