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
=== added directory 'edit-here/content/images'
=== added file 'edit-here/content/images/settings.gif'
0Binary 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 differ0Binary 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
=== modified file 'edit-here/content/pages/apps.md'
--- edit-here/content/pages/apps.md 2015-03-09 14:59:58 +0000
+++ edit-here/content/pages/apps.md 2015-03-17 09:30:58 +0000
@@ -3,63 +3,65 @@
3*Are you looking for a good way to do X and can't find it in the app3*Are you looking for a good way to do X and can't find it in the app
4store? Want some suggestions to solve a particular problem?*4store? Want some suggestions to solve a particular problem?*
55
6[TOC]
7
6## Misc8## Misc
79
8### Do you have Spotify?10### Do you have Spotify? !!T
9If you have a Spotify premium account, just install 'CuteSpotify'11If you have a Spotify premium account, just install 'CuteSpotify'
10([video](https://www.youtube.com/watch?v=ea90rwK_VuI)).12([video](https://www.youtube.com/watch?v=ea90rwK_VuI)).
1113
12### Do you have Google Authenticator?14### Do you have Google Authenticator? !!T
13Sure, install the 'Authenticator' app from the software store.15Sure, install the 'Authenticator' app from the software store.
1416
15## Music17## Music
1618
17### How do I add music to my device (usb/mtp, scp/rsync, download)?19### How do I add music to my device (usb/mtp, scp/rsync, download)? !!T
18You 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.20You 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.
1921
20### What music formats are supported (flac, mp3 etc)?22### What music formats are supported (flac, mp3 etc)? !!T
21The music app supports ogg, flac and mp3 formats.23The music app supports ogg, flac and mp3 formats.
2224
23## Contacts25## Contacts
2426
25### How can I sync my Google contacts to my device?27### How can I sync my Google contacts to my device? !!T
26The 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).28The 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).
2729
2830
29## Gallery31## Gallery
3032
31### How can I share photos?33### How can I share photos? !!T
32If 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.34If 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.
3335
34### How can I share video?36### How can I share video? !!T
35If 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.37If 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.
3638
3739
38## Camera40## Camera
3941
40### How can I take a picture?42### How can I take a picture? !!T
41Select 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!43Select 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!
4244
43### How can I crop / rotate a picture?45### How can I crop / rotate a picture? !!T
44Use 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.46Use 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.
4547
46### How can I take video?48### How can I take video? !!T
47Select 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!49Select 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!
4850
49## Clock51## Clock
5052
51### How do I set an alarm?53### How do I set an alarm? !!T
52Alarms 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.54Alarms 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.
53To 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.55To 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.
5456
5557
56## HERE Maps58## HERE Maps
5759
58### How can I get directions?60### How can I get directions? !!T
59Load the HERE maps application from the app scope. Open the menu and select *Directions*. Enter your destination and tap the *Get Directions* button.61Load the HERE maps application from the app scope. Open the menu and select *Directions*. Enter your destination and tap the *Get Directions* button.
6062
61### Can I navigate offline?63### Can I navigate offline? !!T
62Unfortunately navigation requires an active connection.64Unfortunately navigation requires an active connection.
6365
64### Can I view the map offline?66### Can I view the map offline? !!T
65Yes, although parts of the map may be missing and search is disabled while offline.67Yes, although parts of the map may be missing and search is disabled while offline.
6668
=== modified file 'edit-here/content/pages/basic.md'
--- edit-here/content/pages/basic.md 2015-03-09 14:59:58 +0000
+++ edit-here/content/pages/basic.md 2015-03-17 09:30:58 +0000
@@ -2,27 +2,28 @@
22
3*If you are wondering how to perform basic tasks, look here.*3*If you are wondering how to perform basic tasks, look here.*
44
5[TOC]
56
6### How do I play music?7### How do I play music? !!T
7The 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.8The 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.
89
9### How do I play videos?10### How do I play videos? !!T
10The media player application will play videos copied to the device. You will also find applications like youtube that give you streaming options.11The media player application will play videos copied to the device. You will also find applications like youtube that give you streaming options.
1112
12### How do I take photos?13### How do I take photos? !!T
13The 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.14The 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.
1415
15### How do I record videos?16### How do I record videos? !!T
16The 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.17The 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.
1718
18### How do I see pictures I’ve taken?19### How do I see pictures I’ve taken? !!T
19If 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.20If 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.
2021
21### How can I send a text?22### How can I send a text? !!T
22The default messaging application allows you to send sms as well as mms messages.23The default messaging application allows you to send sms as well as mms messages.
2324
24### How do I make a call?25### How do I make a call? !!T
25The default dialer app lets you make calls using a contact or by dialing a number.26The default dialer app lets you make calls using a contact or by dialing a number.
2627
27### How do I check recently made/missed calls?28### How do I check recently made/missed calls? !!T
28Swiping 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.29Swiping 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.
2930
=== modified file 'edit-here/content/pages/index.md'
--- edit-here/content/pages/index.md 2015-03-09 14:59:58 +0000
+++ edit-here/content/pages/index.md 2015-03-17 09:30:58 +0000
@@ -7,5 +7,5 @@
7 * Tips and tricks to make you more productive7 * Tips and tricks to make you more productive
8 * Links to get in touch with experts and other community members8 * Links to get in touch with experts and other community members
99
10[Take me to the FAQ!]({filename}faq.md) 10[Take me to the FAQ!]({filename}faq.md){: .link-cta-ubuntu }
11[Get in touch]({filename}get-in-touch.md) 11[Get in touch]({filename}get-in-touch.md){: .link-cta-ubuntu }
1212
=== modified file 'edit-here/content/pages/scopes.md'
--- edit-here/content/pages/scopes.md 2015-03-09 14:59:58 +0000
+++ edit-here/content/pages/scopes.md 2015-03-17 09:30:58 +0000
@@ -2,12 +2,13 @@
22
3*Curious about scopes?*3*Curious about scopes?*
44
5[TOC]
56
6### How do favorites work?7### How do favorites work? !!T
7Swipe 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.8Swipe 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.
89
9### How do I add new scopes?10### How do I add new scopes? !!T
10Swipe 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.11Swipe 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.
1112
12### How do I remove a scope?13### How do I remove a scope? !!T
13Swipe 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*.14Swipe 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*.
1415
=== modified file 'edit-here/content/pages/security.md'
--- edit-here/content/pages/security.md 2015-03-09 14:59:58 +0000
+++ edit-here/content/pages/security.md 2015-03-17 09:30:58 +0000
@@ -2,24 +2,25 @@
22
3*Wondering how to make your phone more secure?*3*Wondering how to make your phone more secure?*
44
5[TOC]
56
6### How do I lock the phone?7### How do I lock the phone? !!T
7Pressing 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.8Pressing 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.
89
9### How do I unlock the phone?10### How do I unlock the phone? !!T
10Swipe the screen to the left or right. Depending on what security you have enabled, you might be required to enter a pin or passcode.11Swipe the screen to the left or right. Depending on what security you have enabled, you might be required to enter a pin or passcode.
1112
12### How do I unlock the bootloader?13### How do I unlock the bootloader? !!T
13If you are trying to flash a developer image or perform other developer related tasks, see the [developer site](http://developer.ubuntu.com/)14If you are trying to flash a developer image or perform other developer related tasks, see the [developer site](http://developer.ubuntu.com/)
1415
15### How can I change my PIN/Passcode?16### How can I change my PIN/Passcode? !!T
16You can find these setting under the *System Settings* application. Select *Security & Privacy* to adjust the *Lock when idle* setting.17You can find these setting under the *System Settings* application. Select *Security & Privacy* to adjust the *Lock when idle* setting.
1718
18### Why do I have to type my PIN when using File Manager & Terminal (not default apps)?19### Why do I have to type my PIN when using File Manager & Terminal (not default apps)? !!T
19Since these applications allow for invasive system changes, your pin/passcode is required. This is for your phone security.20Since these applications allow for invasive system changes, your pin/passcode is required. This is for your phone security.
2021
21### How can I stop someone using the indicators when the phone is unlocked?22### How can I stop someone using the indicators when the phone is unlocked? !!T
22You 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.23You 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.
2324
24### I forgot my passworde/security code. How can I unlock the phone?25### I forgot my passworde/security code. How can I unlock the phone? !!T
25TBD26TBD
2627
=== modified file 'edit-here/content/pages/settings.md'
--- edit-here/content/pages/settings.md 2015-03-10 10:56:31 +0000
+++ edit-here/content/pages/settings.md 2015-03-17 09:30:58 +0000
@@ -4,23 +4,24 @@
44
5[TOC]5[TOC]
66
7### How do I update my system?7### How do I update my system? !!T
8Your 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.8Your 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.
99
10### How do I set the time / language?10### How do I set the time / language? !!T
11Open the *System Settings* application. For the time, check out the *Time & Date* section. For language, select *Language & Text*.11Open the *System Settings* application. For the time, check out the *Time & Date* section. For language, select *Language & Text*.
12![Icon]({filename}/images/settings.gif)
1213
13### How can I change my wallpaper/background?14### How can I change my wallpaper/background? !!T
14Open the *System Settings* application. Select the *Background* option. Press the *Add Image* button and choice your image to set as a background.15Open the *System Settings* application. Select the *Background* option. Press the *Add Image* button and choice your image to set as a background.
1516
16### How do I keep the screen on?17### How do I keep the screen on? !!T
17Open the *System Settings* application, and select the *Security & Privacy* option. Select the *Lock Phone* option, and then *Lock when idle*. St 18Open the *System Settings* application, and select the *Security & Privacy* option. Select the *Lock Phone* option, and then *Lock when idle*. St
1819
19### How do I set up my accounts?20### How do I set up my accounts? !!T
20You 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*.21You 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*.
2122
22### How do I configure my notifications?23### How do I configure my notifications? !!T
23If 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.24If 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.
2425
25### How do I change the ringtone for calls and texts?26### How do I change the ringtone for calls and texts? !!T
26You 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.27You 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.
2728
=== modified file 'edit-here/content/pages/store.md'
--- edit-here/content/pages/store.md 2015-03-09 14:59:58 +0000
+++ edit-here/content/pages/store.md 2015-03-17 09:30:58 +0000
@@ -2,12 +2,13 @@
22
3*Curious about the application store?*3*Curious about the application store?*
44
5[TOC]
56
6### How do I find and install new applications?7### How do I find and install new applications? !!T
7From 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.8From 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.
89
9### How can I browse the app store from my PC?10### How can I browse the app store from my PC? !!T
10At the moment, the app store is not able to be browsed from your pc.11At the moment, the app store is not able to be browsed from your pc.
1112
12### How do I remove applications?13### How do I remove applications? !!T
13Search for the application you wish to remove inside the store. Open it and press the *Uninstall* button to remove the application.14Search for the application you wish to remove inside the store. Open it and press the *Uninstall* button to remove the application.
1415
=== modified file 'edit-here/content/pages/ui.md'
--- edit-here/content/pages/ui.md 2015-03-09 14:59:58 +0000
+++ edit-here/content/pages/ui.md 2015-03-17 09:30:58 +0000
@@ -2,31 +2,32 @@
22
3*Are you confused about the dash, scopes, swiping? You've come to the right place!*3*Are you confused about the dash, scopes, swiping? You've come to the right place!*
44
5[TOC]
56
6### What is the dash?7### What is the dash? !!T
7The 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.8The 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.
89
9### What is the launcher?10### What is the launcher? !!T
10The launcher allows you to easily launch new applications. You can access the launcher at any time by swiping right from the left screen edge.11The launcher allows you to easily launch new applications. You can access the launcher at any time by swiping right from the left screen edge.
1112
12### What are the indicators?13### What are the indicators? !!T
13Indicators 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.14Indicators 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.
1415
15### How do I switch applications?16### How do I switch applications? !!T
16To 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 the17To 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
17dash.18dash.
1819
19### How do I close applications?20### How do I close applications? !!T
20To 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.21To 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.
2122
22### How can I copy and paste?23### How can I copy and paste? !!T
23For 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.24For 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.
2425
25### What are the small characters on the keyboard and how can I select them?26### What are the small characters on the keyboard and how can I select them? !!T
26Tapping 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!27Tapping 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!
2728
28### The keyboard behaves funny. What can I do about it?29### The keyboard behaves funny. What can I do about it? !!T
29From 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.30From 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.
3031
31### What is the round circle for? What does it show? Can I configure it?32### What is the round circle for? What does it show? Can I configure it? !!T
32The round circle is the infographic. It hows you recent phone activity, like the number of messages received or the number of songs played.33The 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