Merge lp:~dholbach/help-app/explain-automatically-generated-content into lp:~ubuntu-touch-coreapps-drivers/help-app/trunk

Proposed by Daniel Holbach
Status: Merged
Merged at revision: 92
Proposed branch: lp:~dholbach/help-app/explain-automatically-generated-content
Merge into: lp:~ubuntu-touch-coreapps-drivers/help-app/trunk
Diff against target: 31 lines (+13/-8)
1 file modified
HACKING (+13/-8)
To merge this branch: bzr merge lp:~dholbach/help-app/explain-automatically-generated-content
Reviewer Review Type Date Requested Status
Nicholas Skaggs (community) Approve
Review via email: mp+252746@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

Nice! Yes, if it's not under edit-here, don't edit it.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'HACKING'
2--- HACKING 2015-03-10 13:53:09 +0000
3+++ HACKING 2015-03-12 13:31:43 +0000
4@@ -53,14 +53,19 @@
5
6 ├── app ← Everything related to the devices app.
7 │   └── www ← The viewable content of the app.
8-└── edit-here
9-    ├── content
10-    │   └── pages ← Here is the place to edit the content.
11-    ├── po ← Translations.
12-    ├── tests ← Code for automated testing goes here.
13-    └── themes ← Themes files, both templates and css/js.
14-       ├── phone ← Phone/device app theme.
15-       └── web ← Online build (.ubuntu.com) theme.
16+├── edit-here
17+│   ├── content
18+│   │   └── pages ← Here is the place to edit the content.
19+│   ├── po ← Translations.
20+│   ├── tests ← Code for automated testing goes here.
21+│  └── themes ← Themes files, both templates and css/js.
22+│      ├── phone ← Phone/device app theme.
23+│      └── web ← Online build (.ubuntu.com) theme.
24+└── web ← The viewable content of of the online build.
25+
26+Note: Everything in ./app/www and ./web/ is automatically generated.
27+ Edit content in ./edit-here/content/pages/ and edit themes in
28+ ./edit-here/themes/.
29
30
31 Prerequisites

Subscribers

People subscribed via source and target branches