Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(33)

Side by Side Diff: components/onc/docs/onc_spec.html

Issue 366273002: Update onc_spec.html to match implementation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comment. Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chromeos/network/onc/onc_validator.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <!DOCTYPE html> 1 <!DOCTYPE html>
2 <html> 2 <html>
3 <head> 3 <head>
4 <meta charset="utf-8"> 4 <meta charset="utf-8">
5 <link rel="stylesheet" href="onc_spec.css" > 5 <link rel="stylesheet" href="onc_spec.css" >
6 <script src="onc_spec.js"></script> 6 <script src="onc_spec.js"></script>
7 <title>Open Network Configuration Format</title> 7 <title>Open Network Configuration Format</title>
8 </head> 8 </head>
9 <body> 9 <body>
10 10
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 is <span class="value">UnencryptedConfiguration</span>, the top level JSON 182 is <span class="value">UnencryptedConfiguration</span>, the top level JSON
183 has the <span class="type">UnencryptedConfiguration</span> 183 has the <span class="type">UnencryptedConfiguration</span>
184 type. <span class="type">UnencryptedConfiguration</span> type contains the 184 type. <span class="type">UnencryptedConfiguration</span> type contains the
185 following: 185 following:
186 </p> 186 </p>
187 187
188 <dl class="field_list"> 188 <dl class="field_list">
189 <dt class="field">Type</dt> 189 <dt class="field">Type</dt>
190 <dd> 190 <dd>
191 <span class="field_meta"> 191 <span class="field_meta">
192 (required) 192 (optional, defaults to <span class="value">UnencryptedConfiguration
193 </span>)
193 <span class="type">string</span> 194 <span class="type">string</span>
194 </span> 195 </span>
195 Must be <span class="value">UnencryptedConfiguration</span>. 196 Must be <span class="value">UnencryptedConfiguration</span>.
196 </dd> 197 </dd>
197 198
198 <dt class="field">NetworkConfigurations</dt> 199 <dt class="field">NetworkConfigurations</dt>
199 <dd> 200 <dd>
200 <span class="field_meta"> 201 <span class="field_meta">
201 (optional) 202 (optional)
202 <span class="type">array of NetworkConfiguration</span> 203 <span class="type">array of NetworkConfiguration</span>
203 </span> 204 </span>
204 Describes Wi-Fi, Ethernet, VPN, and wireless connections. 205 Describes Wi-Fi, Ethernet, VPN, and wireless connections.
205 </dd> 206 </dd>
206 207
207 <dt class="field">Certificates</dt> 208 <dt class="field">Certificates</dt>
208 <dd> 209 <dd>
209 <span class="field_meta"> 210 <span class="field_meta">
210 (optional) 211 (optional)
211 <span class="type">array of Certificate</span> 212 <span class="type">array of Certificate</span>
212 </span> 213 </span>
213 Contains certificates stored in X.509 or PKCS#12 format. 214 Contains certificates stored in X.509 or PKCS#12 format.
214 </dd> 215 </dd>
215 </dl> 216 </dl>
216 217
217 Besides the field <span class="field">Type</span>, at least one other field 218 At least one actual configuration field
218 (<span class="field">NetworkConfigurations</span> or 219 (<span class="field">NetworkConfigurations</span> or
219 <span class="field">Certificates</span>) should be present. 220 <span class="field">Certificates</span>) should be present, however it should
221 not be considered an error if no such field is present.
220 222
221 <section> 223 <section>
222 <h1>Network Configuration</h1> 224 <h1>Network Configuration</h1>
223 <p> 225 <p>
224 Field <span class="field">NetworkConfigurations</span> is an array 226 Field <span class="field">NetworkConfigurations</span> is an array
225 of <span class="type">NetworkConfiguration</span> typed 227 of <span class="type">NetworkConfiguration</span> typed
226 objects. The <span class="type">NetworkConfiguration</span> type contains 228 objects. The <span class="type">NetworkConfiguration</span> type contains
227 the following: 229 the following:
228 </p> 230 </p>
229 231
(...skipping 2079 matching lines...) Expand 10 before | Expand all | Expand 10 after
2309 is transmitted or saved to disk should be secure. On client device, when 2311 is transmitted or saved to disk should be secure. On client device, when
2310 user names for connections that are user-specific are persisted to disk, 2312 user names for connections that are user-specific are persisted to disk,
2311 they should be stored in a location that is encrypted. Users can also opt in 2313 they should be stored in a location that is encrypted. Users can also opt in
2312 these cases to not save their user credentials in the config file and will 2314 these cases to not save their user credentials in the config file and will
2313 instead be prompted when they are needed. 2315 instead be prompted when they are needed.
2314 </p> 2316 </p>
2315 </section> 2317 </section>
2316 </section> 2318 </section>
2317 </body> 2319 </body>
2318 </html> 2320 </html>
OLDNEW
« no previous file with comments | « chromeos/network/onc/onc_validator.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698