← Back to branch summary

~dholbach/help-app/pelican-backport

« back to all changes in this revision

Viewing changes to edit-here/content/pages/faq.md

  • Committer: Daniel Holbach
  • Date: 2015-03-06 08:40:27 UTC
  • mfrom: (71.1.10 moar-ceontent)
  • Revision ID: daniel.holbach@canonical.com-20150306084027-tj3b9og794xokvu0
merge lp:~nskaggs/help-app/moar-ceontent - resolve conflicts in edit-here/po by unapplying changes and running generate-pot/generate-translations

Show diffs side-by-side

added added

removed removed

Lines of Context:
edit-here/content/pages/faq.md
3
3
We divided the questions up into categories, so you can spot yours more
4
4
easily. Here we go:
5
5
 
6
 
  * [User Interface]({filename}ui.md)
7
 
  * [Settings]({filename}settings.md)
8
 
  * [Store]({filename}store.md)
9
 
  * [Apps]({filename}apps.md)
10
 
  * [Scopes]({filename}scopes.md)
11
 
  * [Security]({filename}security.md)
 
6
---
12
7
 
 
8
### [First Day Tasks]({filename}basic.md)
 
9
### [User Interface]({filename}ui.md)
 
10
### [Settings]({filename}settings.md)
 
11
### [Store]({filename}store.md)
 
12
### [Apps]({filename}apps.md)
 
13
### [Scopes]({filename}scopes.md)
 
14
### [Security]({filename}security.md)