| Index: chrome/common/extensions/docs/static/preferences.html
|
| diff --git a/chrome/common/extensions/docs/static/preferences.html b/chrome/common/extensions/docs/static/preferences.html
|
| index 2fb5c8bbf99487c14ba5e10a9a2edd1fc9b6c495..db40f998f3978e57e93f60fa93892da0417e18ea 100644
|
| --- a/chrome/common/extensions/docs/static/preferences.html
|
| +++ b/chrome/common/extensions/docs/static/preferences.html
|
| @@ -3,31 +3,30 @@
|
| <!-- BEGIN AUTHORED CONTENT -->
|
| <p id="classSummary">
|
| The <code>chrome.preferences</code> module contains a prototype for giving other
|
| -modules access to manage preferences stored by Chrome. This prototype is used
|
| -for example for <a
|
| +modules access to manage Chrome's preferences. This prototype is used for
|
| +example for <a
|
| href="proxy.html#property-settings"><code>chrome.proxy.settings</code></a>.
|
| </p>
|
|
|
| -<h2 id="description">Overview</h2>
|
| +<h2 id="description">Functions</h2>
|
|
|
| <p>
|
| -The preferences API provides a common set of functions
|
| +The preferences API provides a commen set of functions
|
| (<code>getEffective()</code>, <code>set()</code>, and <code>clear()</code>) as
|
| well as an event publisher (<code>onChangeEffective</code>) for various
|
| preferences in Chrome. The <a href="proxy.html#overview-examples">proxy settings
|
| examples</a> demonstrate how these functions are intended to be used.
|
| </p>
|
|
|
| -<!--
|
| <h2 id="lifecycle">Life cycle of preferences</h2>
|
|
|
| <p>
|
| The life cycle of preferences depends on whether they are set for regular or
|
| -incognito profiles. </p>
|
| --->
|
| +incognito profiles. Currently, preferences can only be set for regular profiles.
|
| +</p>
|
|
|
| <p>
|
| -Currently, preferences can only be set for regular profiles. Once set, they
|
| +Preferences for <em>regular profiles</em> are persisted to disk. Once set, they
|
| remain in place until they are cleared by the governing extension, or the
|
| governing extension is disabled or uninstalled.
|
| </p>
|
| @@ -40,7 +39,7 @@ layers that may influence the effective preferences, in increasing order of
|
| precedence.
|
| <ol>
|
| <li>System preferences provided by the operating system</li>
|
| - <li>Command-line parameters</li>
|
| + <li>Command line parameters</li>
|
| <li>Preferences set by extensions</li>
|
| <li>Policies</li>
|
| </ol>
|
| @@ -74,9 +73,8 @@ preferences for regular windows <b>(R)</b> and preferences for incognito windows
|
| -->
|
|
|
| <p>
|
| -If two or more extensions want to set the same preference to different values,
|
| -the extension installed most recently takes precedence over the other
|
| -extensions.
|
| +If two extensions want to set the same preference to different values, the
|
| +extension installed last takes precedence over the other extensions.
|
| <!-- If the
|
| extension installed last sets only <b>(I)</b>, the preference of regular windows
|
| can be defined by previously installed extensions. -->
|
|
|