Merge lp:~torsten.franz/help-app/help-app into lp:help-app

Proposed by Torsten Franz
Status: Merged
Approved by: Daniel Holbach
Approved revision: 168
Merged at revision: 168
Proposed branch: lp:~torsten.franz/help-app/help-app
Merge into: lp:help-app
Diff against target: 37 lines (+4/-4)
3 files modified
content/pages/scopes.md (+1/-1)
content/pages/settings.md (+1/-1)
content/pages/ui.md (+2/-2)
To merge this branch: bzr merge lp:~torsten.franz/help-app/help-app
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Daniel Holbach (community) Approve
Review via email: mp+274746@code.launchpad.net

Commit message

Fix typos. Thanks Anne. (LP: #1502625).

Description of the change

To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

Thanks a lot.

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
http://91.189.93.70:8080/job/help-app-autolanding/18/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/help-app-vivid-amd64-autolanding/18

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'content/pages/scopes.md'
--- content/pages/scopes.md 2015-03-30 14:18:49 +0000
+++ content/pages/scopes.md 2015-10-16 17:19:54 +0000
@@ -11,4 +11,4 @@
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.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.
1212
13### How do I remove a scope? !!QA13### How do I remove a scope? !!QA
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*.14Swipe up from the bottom edge of the dash to reveal a scopes manager. You can remove a scope 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*.
1515
=== modified file 'content/pages/settings.md'
--- content/pages/settings.md 2015-03-30 14:18:49 +0000
+++ content/pages/settings.md 2015-10-16 17:19:54 +0000
@@ -15,7 +15,7 @@
15Open 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.
1616
17### How do I keep the screen on? !!QA17### How do I keep the screen on? !!QA
18Open the *System Settings* application, and select the *Security & Privacy* option. Select the *Lock Phone* option, and then *Lock when idle*. St18Open the *System Settings* application, and select the *Security & Privacy* option. Select the *Lock Phone* option, and then *Lock when idle*.
1919
20### How do I set up my accounts? !!QA20### How do I set up my accounts? !!QA
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*.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*.
2222
=== modified file 'content/pages/ui.md'
--- content/pages/ui.md 2015-03-30 14:18:49 +0000
+++ content/pages/ui.md 2015-10-16 17:19:54 +0000
@@ -42,8 +42,8 @@
42You can do this to switch back and forth between keyboards in different languages. [Make sure the language you want is activated it in the Settings app](#how-can-i-add-a-new-keyboard-language).42You can do this to switch back and forth between keyboards in different languages. [Make sure the language you want is activated it in the Settings app](#how-can-i-add-a-new-keyboard-language).
4343
44### How can I type Emoji icons? !!QA44### How can I type Emoji icons? !!QA
45[Learn wow to switch between keyboard languages](#how-can-i-switch-between-keyboard-languages) to alternate between the regular keyboard and the Emoji keyboard. Once done with typing Emojis, you can switch back to the regular keyboard.45[Learn how to switch between keyboard languages](#how-can-i-switch-between-keyboard-languages) to alternate between the regular keyboard and the Emoji keyboard. Once done with typing Emojis, you can switch back to the regular keyboard.
46If you can't see the Emoji keyboard, make sure you've [activated it in the Settings app](#how-can-i-add-a-new-keyboard-language).46If you can't see the Emoji keyboard, make sure you've [activated it in the Settings app](#how-can-i-add-a-new-keyboard-language).
4747
48### What is the round circle on the welcome screen for? What does it show? Can I configure it? !!QA48### What is the round circle on the welcome screen for? What does it show? Can I configure it? !!QA
49The round circle is the infographic. It hows you recent phone activity, like the number of messages received or the number of songs played. You can disable it by launching the *Settings* app, navigating to *Security and privacy* and unticking *Stats on Welcome screen*.49The round circle is the infographic. It shows you recent phone activity, like the number of messages received or the number of songs played. You can disable it by launching the *Settings* app, navigating to *Security and privacy* and unticking *Stats on Welcome screen*.

Subscribers

People subscribed via source and target branches