Merge lp:~dholbach/help-app/1430735-pt4 into lp:~ubuntu-touch-coreapps-drivers/help-app/trunk

Proposed by Daniel Holbach
Status: Merged
Merged at revision: 101
Proposed branch: lp:~dholbach/help-app/1430735-pt4
Merge into: lp:~ubuntu-touch-coreapps-drivers/help-app/trunk
Prerequisite: lp:~dholbach/help-app/1430735-pt3
Diff against target: 301 lines (+62/-54)
8 files modified
edit-here/content/pages/apps.md (+17/-15)
edit-here/content/pages/basic.md (+9/-8)
edit-here/content/pages/index.md (+2/-2)
edit-here/content/pages/scopes.md (+4/-3)
edit-here/content/pages/security.md (+8/-7)
edit-here/content/pages/settings.md (+8/-7)
edit-here/content/pages/store.md (+4/-3)
edit-here/content/pages/ui.md (+10/-9)
To merge this branch: bzr merge lp:~dholbach/help-app/1430735-pt4
Reviewer Review Type Date Requested Status
Nicholas Skaggs (community) Approve
Review via email: mp+253169@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Nicholas Skaggs (nskaggs) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'edit-here/content/images'
2=== added file 'edit-here/content/images/settings.gif'
3Binary files edit-here/content/images/settings.gif 1970-01-01 00:00:00 +0000 and edit-here/content/images/settings.gif 2015-03-17 09:30:58 +0000 differ
4=== modified file 'edit-here/content/pages/apps.md'
5--- edit-here/content/pages/apps.md 2015-03-09 14:59:58 +0000
6+++ edit-here/content/pages/apps.md 2015-03-17 09:30:58 +0000
7@@ -3,63 +3,65 @@
8 *Are you looking for a good way to do X and can't find it in the app
9 store? Want some suggestions to solve a particular problem?*
10
11+[TOC]
12+
13 ## Misc
14
15-### Do you have Spotify?
16+### Do you have Spotify? !!T
17 If you have a Spotify premium account, just install 'CuteSpotify'
18-([video](https://www.youtube.com/watch?v=ea90rwK_VuI)).
19+([video](https://www.youtube.com/watch?v=ea90rwK_VuI)).
20
21-### Do you have Google Authenticator?
22+### Do you have Google Authenticator? !!T
23 Sure, install the 'Authenticator' app from the software store.
24
25 ## Music
26
27-### How do I add music to my device (usb/mtp, scp/rsync, download)?
28+### How do I add music to my device (usb/mtp, scp/rsync, download)? !!T
29 You can add music in multiple ways. If you have pre-existing music files, simply connect your phone to your pc via the usb cable. Next, copy the music you wish to listen to to the *Music* folder. Your music will appear in the music app. Alternatively, you can acquire music directly using the device via a scope, such as grooveshark or by downloading via the browser or another application.
30
31-### What music formats are supported (flac, mp3 etc)?
32+### What music formats are supported (flac, mp3 etc)? !!T
33 The music app supports ogg, flac and mp3 formats.
34
35 ## Contacts
36
37-### How can I sync my Google contacts to my device?
38+### How can I sync my Google contacts to my device? !!T
39 The first time you open the Contacts app you’ll be asked if you want to sync contacts with your Google account. If you have answered “no” but change your mind later, you can do so by going to the Today scope, and setting up your Google account there. After that you can sync your contacts (and, if you want, calendar events as well).
40
41
42 ## Gallery
43
44-### How can I share photos?
45+### How can I share photos? !!T
46 If you've just taken a picture, share it easily by swiping to the left from the right edge inside the camera app. Alternatively, use the gallery app to find the picture. Once loaded, select *Share* from the menu and choose how you wish to share your photo.
47
48-### How can I share video?
49+### How can I share video? !!T
50 If you've just taken a video, share it easily by swiping to the left from the right edge inside the camera app. Alternatively, use the gallery app to find the video. Once loaded, select *Share* from the menu and choose how you wish to share your video.
51
52
53 ## Camera
54
55-### How can I take a picture?
56+### How can I take a picture? !!T
57 Select the camera app from the launcher or app scope. Swipe up from the bottom edge of the phone for additional options. Enjoy taking your picture!
58
59-### How can I crop / rotate a picture?
60+### How can I crop / rotate a picture? !!T
61 Use the gallery app to select your picture. Select the *Edit* button next to the menu. Inside you'll find options to crop and rotate your picture.
62
63-### How can I take video?
64+### How can I take video? !!T
65 Select the camera app from the launcher or app scope. Select the video icon on the bottom of the screen. Swipe up from the bottom edge of the phone for additional options. Enjoy taking your video!
66
67 ## Clock
68
69-### How do I set an alarm?
70+### How do I set an alarm? !!T
71 Alarms are handled by the clock app. To add a new alarm, launch the clock app. Swipe up from the bottom, and tap on the “+” sign. Configure the time, repetition, name and ringtone, and to save it tap on the tick in the up right corner. To modify alarms, just tap on it and change whatever you need. To cancel your changes, you can go back. To save your changes, tap on the tick again.
72 To delete alarms, you can either see the alarm details and select “Delete” or, from the alarms list, swipe right on the alarm you want to delete, and then tap on the bin.
73
74
75 ## HERE Maps
76
77-### How can I get directions?
78+### How can I get directions? !!T
79 Load the HERE maps application from the app scope. Open the menu and select *Directions*. Enter your destination and tap the *Get Directions* button.
80
81-### Can I navigate offline?
82+### Can I navigate offline? !!T
83 Unfortunately navigation requires an active connection.
84
85-### Can I view the map offline?
86+### Can I view the map offline? !!T
87 Yes, although parts of the map may be missing and search is disabled while offline.
88
89=== modified file 'edit-here/content/pages/basic.md'
90--- edit-here/content/pages/basic.md 2015-03-09 14:59:58 +0000
91+++ edit-here/content/pages/basic.md 2015-03-17 09:30:58 +0000
92@@ -2,27 +2,28 @@
93
94 *If you are wondering how to perform basic tasks, look here.*
95
96+[TOC]
97
98-### How do I play music?
99+### How do I play music? !!T
100 The music app let's you play music copied to the device. In addition, [scopes]({filename}scopes.md) such as 7digital and Grooveshark can also play music.
101
102-### How do I play videos?
103+### How do I play videos? !!T
104 The media player application will play videos copied to the device. You will also find applications like youtube that give you streaming options.
105
106-### How do I take photos?
107+### How do I take photos? !!T
108 The included camera application allows you to take photos. If your device has both a front and rear camera, you can toggle which camera to use.
109
110-### How do I record videos?
111+### How do I record videos? !!T
112 The included camera application allows you to take videos. If your device has both a front and rear camera, you can toggle which camera to use.
113
114-### How do I see pictures I’ve taken?
115+### How do I see pictures I’ve taken? !!T
116 If you've just taken a picture, you can see it easily by swiping to the left from the right edge inside the camera app. Alternatively, use the gallery app to find the picture.
117
118-### How can I send a text?
119+### How can I send a text? !!T
120 The default messaging application allows you to send sms as well as mms messages.
121
122-### How do I make a call?
123+### How do I make a call? !!T
124 The default dialer app lets you make calls using a contact or by dialing a number.
125
126-### How do I check recently made/missed calls?
127+### How do I check recently made/missed calls? !!T
128 Swiping up from the bottom edge of the dialer app reveals the recent call list. You can also filter the list to include only missed calls.
129
130=== modified file 'edit-here/content/pages/index.md'
131--- edit-here/content/pages/index.md 2015-03-09 14:59:58 +0000
132+++ edit-here/content/pages/index.md 2015-03-17 09:30:58 +0000
133@@ -7,5 +7,5 @@
134 * Tips and tricks to make you more productive
135 * Links to get in touch with experts and other community members
136
137-[Take me to the FAQ!]({filename}faq.md)
138-[Get in touch]({filename}get-in-touch.md)
139+[Take me to the FAQ!]({filename}faq.md){: .link-cta-ubuntu }
140+[Get in touch]({filename}get-in-touch.md){: .link-cta-ubuntu }
141
142=== modified file 'edit-here/content/pages/scopes.md'
143--- edit-here/content/pages/scopes.md 2015-03-09 14:59:58 +0000
144+++ edit-here/content/pages/scopes.md 2015-03-17 09:30:58 +0000
145@@ -2,12 +2,13 @@
146
147 *Curious about scopes?*
148
149+[TOC]
150
151-### How do favorites work?
152+### How do favorites work? !!T
153 Swipe up from the bottom edge of the dash to reveal a scopes manager. Favorite scopes you wish to appear on your dash by selecting them. Selecting them again will remove the favorite. All favorited scopes will appear on your dash.
154
155-### How do I add new scopes?
156+### How do I add new scopes? !!T
157 Swipe up from the bottom edge of the dash to reveal a scopes manager. You can add new scopes by selecting from the list of non-favorites below your currently favorited scopes. If a scope you'd like isn't listed, click the store button in the upper right to look for it in the ubuntu store.
158
159-### How do I remove a scope?
160+### How do I remove a scope? !!T
161 Swipe up from the bottom edge of the dash to reveal a scopes manager. You can remove a scopes by selecting it from the list of your favorites. This will remove it from your dash. If you'd like to remove it completely, visit the scope page in the ubuntu store and select *Uninstall*.
162
163=== modified file 'edit-here/content/pages/security.md'
164--- edit-here/content/pages/security.md 2015-03-09 14:59:58 +0000
165+++ edit-here/content/pages/security.md 2015-03-17 09:30:58 +0000
166@@ -2,24 +2,25 @@
167
168 *Wondering how to make your phone more secure?*
169
170+[TOC]
171
172-### How do I lock the phone?
173+### How do I lock the phone? !!T
174 Pressing the power button to turn off the phone will lock it. In addition, you can control how long your phone will stay unlocked when idle. You can find this setting under the *System Settings* application. Select *Security & Privacy*, then *Phone Locking* to adjust the *Lock when idle* setting.
175
176-### How do I unlock the phone?
177+### How do I unlock the phone? !!T
178 Swipe the screen to the left or right. Depending on what security you have enabled, you might be required to enter a pin or passcode.
179
180-### How do I unlock the bootloader?
181+### How do I unlock the bootloader? !!T
182 If you are trying to flash a developer image or perform other developer related tasks, see the [developer site](http://developer.ubuntu.com/)
183
184-### How can I change my PIN/Passcode?
185+### How can I change my PIN/Passcode? !!T
186 You can find these setting under the *System Settings* application. Select *Security & Privacy* to adjust the *Lock when idle* setting.
187
188-### Why do I have to type my PIN when using File Manager & Terminal (not default apps)?
189+### Why do I have to type my PIN when using File Manager & Terminal (not default apps)? !!T
190 Since these applications allow for invasive system changes, your pin/passcode is required. This is for your phone security.
191
192-### How can I stop someone using the indicators when the phone is unlocked?
193+### How can I stop someone using the indicators when the phone is unlocked? !!T
194 You can find this setting under the *System Settings* application. Select *Security & Privacy*, then *Phone Locking* to adjust the *When locked, allow* settings. Specifically, toggle off the *Notifications and quick settings* option.
195
196-### I forgot my passworde/security code. How can I unlock the phone?
197+### I forgot my passworde/security code. How can I unlock the phone? !!T
198 TBD
199
200=== modified file 'edit-here/content/pages/settings.md'
201--- edit-here/content/pages/settings.md 2015-03-10 10:56:31 +0000
202+++ edit-here/content/pages/settings.md 2015-03-17 09:30:58 +0000
203@@ -4,23 +4,24 @@
204
205 [TOC]
206
207-### How do I update my system?
208+### How do I update my system? !!T
209 Your device will prompt you when an update is ready. A notification will appear informing you of the new update. If you wish, you can manually check and perform an update yourself. Open the *System Settings* application. Select *Update*, and then click the check for updates button.
210
211-### How do I set the time / language?
212+### How do I set the time / language? !!T
213 Open the *System Settings* application. For the time, check out the *Time & Date* section. For language, select *Language & Text*.
214+![Icon]({filename}/images/settings.gif)
215
216-### How can I change my wallpaper/background?
217+### How can I change my wallpaper/background? !!T
218 Open the *System Settings* application. Select the *Background* option. Press the *Add Image* button and choice your image to set as a background.
219
220-### How do I keep the screen on?
221+### How do I keep the screen on? !!T
222 Open the *System Settings* application, and select the *Security & Privacy* option. Select the *Lock Phone* option, and then *Lock when idle*. St
223
224-### How do I set up my accounts?
225+### How do I set up my accounts? !!T
226 You can set up some of your accounts from the scopes. Today scope allows you to configure your Google and Fitbit account, while the Pictures scope lets you configure your flickr, Facebook and Instagram account. You can manage all your accounts (including social media, email, etc) from the *System Settings* app, under *Personal*, *Accounts*.
227
228-### How do I configure my notifications?
229+### How do I configure my notifications? !!T
230 If you’re receiving too many notifications of your activity or want to change it for whatever reason, you can do so by going to the *System Settings* and selecting *Notifications*. From here you can toggle on/off notifications from any application on your device.
231
232-### How do I change the ringtone for calls and texts?
233+### How do I change the ringtone for calls and texts? !!T
234 You can change you ringtone for calls and texts to something new. Open the *System Settings* application, then select *Sound*. Under *Phone Calls* you will find your current ringtone. Tap it to open a page of ringtones to select from.
235
236=== modified file 'edit-here/content/pages/store.md'
237--- edit-here/content/pages/store.md 2015-03-09 14:59:58 +0000
238+++ edit-here/content/pages/store.md 2015-03-17 09:30:58 +0000
239@@ -2,12 +2,13 @@
240
241 *Curious about the application store?*
242
243+[TOC]
244
245-### How do I find and install new applications?
246+### How do I find and install new applications? !!T
247 From the Apps scope, you can either tap on the “search” icon on the right and start searching by name, or you can go all the way down in the scope and tap on the Ubuntu Store icon.
248
249-### How can I browse the app store from my PC?
250+### How can I browse the app store from my PC? !!T
251 At the moment, the app store is not able to be browsed from your pc.
252
253-### How do I remove applications?
254+### How do I remove applications? !!T
255 Search for the application you wish to remove inside the store. Open it and press the *Uninstall* button to remove the application.
256
257=== modified file 'edit-here/content/pages/ui.md'
258--- edit-here/content/pages/ui.md 2015-03-09 14:59:58 +0000
259+++ edit-here/content/pages/ui.md 2015-03-17 09:30:58 +0000
260@@ -2,31 +2,32 @@
261
262 *Are you confused about the dash, scopes, swiping? You've come to the right place!*
263
264+[TOC]
265
266-### What is the dash?
267+### What is the dash? !!T
268 The dash contains a list of applications installed on the device, along with presenting the scopes and store. The dash is the first thing you see when booting the phone. You can switch to it again at any time by swiping left from the right screen edge.
269
270-### What is the launcher?
271+### What is the launcher? !!T
272 The launcher allows you to easily launch new applications. You can access the launcher at any time by swiping right from the left screen edge.
273
274-### What are the indicators?
275+### What are the indicators? !!T
276 Indicators convey quick useful information about your device, like the time, data connection, location, sound, and notifications. You can access the indicators at any time by swiping down from the top screen edge.
277
278-### How do I switch applications?
279+### How do I switch applications? !!T
280 To switch applications, slide your finger left from the right edge of the screen. If you slide quickly you will cycle through each application. However, if you slide more slowly, an application switcher will appear allowing you to select the application you wish to switch to, including the
281 dash.
282
283-### How do I close applications?
284+### How do I close applications? !!T
285 To close an application, slide your finger *slowly* left from the right edge of the screen. An application switcher will appear. Place your finger on the application preview you wish to close and swipe up or down. The application will disappear.
286
287-### How can I copy and paste?
288+### How can I copy and paste? !!T
289 For text that can be copied and pasted, press and hold the text in question. A menu will appear allowing you to cut, copy and paste.
290
291-### What are the small characters on the keyboard and how can I select them?
292+### What are the small characters on the keyboard and how can I select them? !!T
293 Tapping and hold a character on the keyboard brings up a menu allowing you to select secondary characters. This allows you to select things like numbers and accented characters. Give it a try!
294
295-### The keyboard behaves funny. What can I do about it?
296+### The keyboard behaves funny. What can I do about it? !!T
297 From the Settings app, you can go to Keyboard and try unsetting the autocompletion feature, and/or the auto capitalize option. This way, you'll still receive suggestions on the words you're writing, while having full control of the input.
298
299-### What is the round circle for? What does it show? Can I configure it?
300+### What is the round circle for? What does it show? Can I configure it? !!T
301 The round circle is the infographic. It hows you recent phone activity, like the number of messages received or the number of songs played.

Subscribers

People subscribed via source and target branches