Merge lp:~dholbach/snappy/markdown-doc-fixes into lp:~snappy-dev/snappy/snappy-moved-to-github

Proposed by Daniel Holbach on 2015-04-22
Status: Merged
Approved by: John Lenton on 2015-04-22
Approved revision: 416
Merged at revision: 416
Proposed branch: lp:~dholbach/snappy/markdown-doc-fixes
Merge into: lp:~snappy-dev/snappy/snappy-moved-to-github
Diff against target: 153 lines (+52/-42)
2 files modified
docs/config.md (+46/-37)
docs/frameworks.md (+6/-5)
To merge this branch: bzr merge lp:~dholbach/snappy/markdown-doc-fixes
Reviewer Review Type Date Requested Status
Sergio Schvezov 2015-04-22 Approve on 2015-04-22
Review via email: mp+257080@code.launchpad.net

Commit Message

- fix markdown syntax: use of <pre> for stdout messages or demonstration of file syntax, fix items of unordered list
 - fix typos: "as follow" → "as follows", "empy" → "empty"

To post a comment you must log in.
review: Approve
Snappy Tarmac (snappydevtarmac) wrote :

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'docs/config.md'
2--- docs/config.md 2015-02-17 14:07:45 +0000
3+++ docs/config.md 2015-04-22 13:18:45 +0000
4@@ -9,13 +9,13 @@
5
6 We plan to support a schema file for the yaml as well to make e.g. web
7 based editing of the config simpler. The format of the configuration
8-is as follow:
9-
10-config:
11- packagename:
12- key: value
13- another-pkg:
14- key: value
15+is as follows:
16+
17+ config:
18+ packagename:
19+ key: value
20+ another-pkg:
21+ key: value
22
23 The application provides a configuration handler in
24 meta/hooks/config. This configuration handler must provide reading new
25@@ -25,9 +25,9 @@
26 The package config hook must return exitcode 0 and return valid yaml
27 of the form:
28
29-config:
30- packagename:
31- key: value
32+ config:
33+ packagename:
34+ key: value
35
36 on stdout.
37
38@@ -36,8 +36,8 @@
39 success/failure of get/set the configuration. The current key/value
40 pairs are suppprted right now:
41
42- - error: optional error string
43- - warning: optional warning string
44+ - error: optional error string
45+ - warning: optional warning string
46
47 Some key/value pairs in the configuration are fixed and all
48 applications. E.g. all applications that listen to a port must support
49@@ -53,37 +53,46 @@
50 Examples:
51 ---------
52
53-Example to set config:
54-
55- snappy calls meta/hooks/config and sends the following over stdin:
56- config:
57- ubuntu-core:
58- timezone: Europe/Berlin
59+Example to set config.
60+
61+snappy calls meta/hooks/config and sends the following over stdin:
62+
63+ config:
64+ ubuntu-core:
65+ timezone: Europe/Berlin
66+
67 The meta/hooks/config sends the following back:
68- config:
69- ubuntu-core:
70- timezone: Europe/Berlin
71+
72+ config:
73+ ubuntu-core:
74+ timezone: Europe/Berlin
75
76 Example to get a config:
77
78-snappy calls meta/hooks/config with empy input
79-The meta/hooks/config sends the following back:
80- config:
81- ubuntu-core:
82- timezone: Europe/Berlin
83- status:
84- ubuntu-core:
85- ok: true
86+snappy calls meta/hooks/config with empty input. The meta/hooks/config sends
87+the following back:
88+
89+ config:
90+ ubuntu-core:
91+ timezone: Europe/Berlin
92+ status:
93+ ubuntu-core:
94+ ok: true
95
96 Example to set a non-existing config:
97- snappy -> meta/hooks/config
98- config:
99- ubuntu-core:
100- tea-in-the-morning: false
101- meta/hooks/config exit with status 10 and message:
102- status:
103- ubuntu-core:
104- error: Unknown config option "tea-in-the-morning"
105+
106+snappy -> meta/hooks/config
107+
108+ config:
109+ ubuntu-core:
110+ tea-in-the-morning: false
111+
112+meta/hooks/config exit with status 10 and message:
113+
114+ status:
115+ ubuntu-core:
116+ error: Unknown config option "tea-in-the-morning"
117+
118 [snappy fails the install of the app]
119
120
121
122=== modified file 'docs/frameworks.md'
123--- docs/frameworks.md 2015-03-31 19:54:51 +0000
124+++ docs/frameworks.md 2015-04-22 13:18:45 +0000
125@@ -1,6 +1,6 @@
126 # Frameworks
127 ## Definition
128-Frameworks are a direct extension of the Ubuntu Core. As such Frameworks have
129+Frameworks are a direct extension of the Ubuntu Core. As such frameworks have
130 the following attributes:
131
132 * Frameworks exist primarily to provide mediation of shared resources (eg,
133@@ -35,7 +35,7 @@
134 * used as a method to bypass app isolation
135 * able to be forked (a user may of course always sideload a modified framework)
136
137-Note: snappy frameworks are somewhat different from the Ubuntu for Phones
138+*Note:* snappy frameworks are somewhat different from the Ubuntu for Phones
139 [click frameworks](https://wiki.ubuntu.com/Click/Frameworks) and are more
140 flexible. Most importantly, click frameworks for Ubuntu for Phones map to a
141 particular release and are contracts between the platform (OS) and apps. Snappy
142@@ -233,8 +233,9 @@
143 * if we implement this, how should we declare `bar-srv` access to `bar-srv` is
144 restricted in this manner?
145 * should we allow users the ability to to use the `binaries` with the appended
146- package name? Eg:
147- $ baz.foo --version
148- 1.1.235
149+ package name? Eg::
150+
151+ $ baz.foo --version
152+ 1.1.235
153 * ...
154

Subscribers

People subscribed via source and target branches