GPII · amb26 · Apr 3, 2018 · Jan 26, 2017 · Mar 1, 2017 · Mar 1, 2017
diff --git a/documentation/BrowserChannel.md b/documentation/BrowserChannel.md
@@ -65,8 +65,8 @@ The workflow between the client and server can be summarised as follows:
 * When the flow manager emits either the _connectionSucceeded_ (after being registered) or the _onSettingsChanged_ (after a user login/logout) signal to the client, it is delivering the current available settings for the client in the following way:
 ```
 {
-    "screenReaderTTSEnabled":false,
-    "highContrastEnabled":true,
+    "screenReaderTTS/enabled":false,
+    "highContrast/enabled":true,
     "invertColours":false,
     "magnifierEnabled":true,
     "magnification":2,

diff --git a/documentation/CanopyMatchMaker.md b/documentation/CanopyMatchMaker.md
@@ -25,13 +25,16 @@ To ensure that several conflicting solutions (e.g. two screenreaders) are not la
 
 The apptology is described in more details here: [Apptology.md](Apptology.md).
 
+## Dispositions
+As described below, the matchmaker will assign a disposition to each solution based on priority and canopy matching. There are three dispositions available: "accept", "reject" and "deactivate". "accept" means that the solution will be accepted (and started, if relevant for that solution). "reject" means we do not do anything to the solution. "deactivate" means that we ensure that the solution is not running (i.e. running stop if required). The latter case is relevant for solutions that are conflicting with other solutions that the user might need.
+
 ## Disposing from prioriy:
 Explicit priorities are declared in the NP sets metadata section and will always be a floating point value of 1024 or more. Implicit priorities are deduced from application specific settings. When a user has application specific settings for a solution a priority of 512 is set for that solution.
 
 Goes through all solutions from high priority to low. If a solution already has a disposition, it is ignored. Else it will be selected (accepted). Any solution with the same type, but a lower priority (or no priority) will be rejected. If there are two or more solutions of the same priority _and_ the same type (even partly), these will be considered a "tie". All lower-priority solutions of this type will still be rejected. The tied solutions will have their current disposition and priority removed and left to be disposed by some other disposal algorithm.
 
 ## Disposing from Canopy
-The Canopy matching strategy is used for deciding how to dispose solutions in case no priorities are available or there is a priority-tie between two applications of the same type. 
+The Canopy matching strategy is used for deciding how to dispose solutions in case no priorities are available or there is a priority-tie between two applications of the same type.
 
 * The canopy approach is based on a vectorial "fitness measure" of a solution plus a lexicographical ordering
 * It is similar to the strategy used in resolving CSS rules.
@@ -45,7 +48,7 @@ The Canopy matching strategy is used for deciding how to dispose solutions in ca
 * Compute capabilities of solution
 * Compute vector of prefix depths for each leaf el path from NP set
 * Sort vector in descending order of fitness ("fitness vector")
-* Rank solutions by fitness using lexicographic ordering 
+* Rank solutions by fitness using lexicographic ordering
 
 *The canopy matching*
 * Compute fitness vectors for each solution and sort in rank order

diff --git a/documentation/FlowManager.md b/documentation/FlowManager.md
@@ -201,7 +201,7 @@ OR if the last login/logout process for <mytoken> finished less than 5 seconds a
         "gpii-default": {
             "name": "Default preferences",
             "preferences": {
-                "http://registry.gpii.net/common/onScreenKeyboardEnabled": true,
+                "http://registry.gpii.net/common/onScreenKeyboard/enabled": true,
                 "http://registry.gpii.net/common/initDelay": 0.120,
                 "http://registry.gpii.net/common/cursorSpeed": 0.850
             }

diff --git a/documentation/MatchMakerFramework.md b/documentation/MatchMakerFramework.md
@@ -148,7 +148,7 @@ The input for these POST requests will be in the following format. Note that it
 
 ### Return payload
 
-The return payload from at call to `/match` should be in the following format:
+The return payload from at call to `/match` should be in the following format. The "active" key expresses whether the application should be set to running. A `true` value means that it should be running, `undefined` means we leave it in its current run state and `false` mean we should actively ensure that it is not running.
 
 ```
 {

diff --git a/documentation/PreferencesServer.md b/documentation/PreferencesServer.md
@@ -33,11 +33,11 @@ Return payload:
         "gpii-default": {
             "name": "Default preferences",
             "preferences": {
-                "http://registry.gpii.net/common/onScreenKeyboardEnabled": true,
+                "http://registry.gpii.net/common/onScreenKeyboard/enabled": true,
                 "http://registry.gpii.net/common/initDelay": 0.120,
                 "http://registry.gpii.net/common/cursorSpeed": 0.850,
                 "http://registry.gpii.net/common/cursorAcceleration": 0.800,
-                "http://registry.gpii.net/common/mouseEmulationEnabled": true,
+                "http://registry.gpii.net/common/mouseEmulation/enabled": true,
                 "http://registry.gpii.net/common/unknown": true,
                 "http://registry.gpii.net/applications/org.alsa-project": {
                     "volume": 14,
@@ -70,7 +70,7 @@ Return payload:
                         "cursorSpeed": 0.85,
                         "cursorAcceleration": 0.8,
                         "-provisional-initDelay": 0.12,
-                        "-provisional-mouseEmulationEnabled": true
+                        "-provisional-mouseEmulation/enabled": true
                     }
                 },
                 "applications": {
@@ -110,11 +110,11 @@ Example POST body:
         "gpii-default": {
             "name": "Default preferences",
             "preferences": {
-                "http://registry.gpii.net/common/onScreenKeyboardEnabled": true,
+                "http://registry.gpii.net/common/onScreenKeyboard/enabled": true,
                 "http://registry.gpii.net/common/initDelay": 0.120,
                 "http://registry.gpii.net/common/cursorSpeed": 0.850,
                 "http://registry.gpii.net/common/cursorAcceleration": 0.800,
-                "http://registry.gpii.net/common/mouseEmulationEnabled": true,
+                "http://registry.gpii.net/common/mouseEmulation/enabled": true,
                 "http://registry.gpii.net/common/unknown": true,
                 "http://registry.gpii.net/applications/org.alsa-project": {
                     "volume": 14,
@@ -138,11 +138,11 @@ Given that the above payload was stored with the token `123e4567-e89b-12d3-a456-
             "gpii-default": {
                 "name": "Default preferences",
                 "preferences": {
-                    "http://registry.gpii.net/common/onScreenKeyboardEnabled": true,
+                    "http://registry.gpii.net/common/onScreenKeyboard/enabled": true,
                     "http://registry.gpii.net/common/initDelay": 0.120,
                     "http://registry.gpii.net/common/cursorSpeed": 0.850,
                     "http://registry.gpii.net/common/cursorAcceleration": 0.800,
-                    "http://registry.gpii.net/common/mouseEmulationEnabled": true,
+                    "http://registry.gpii.net/common/mouseEmulation/enabled": true,
                     "http://registry.gpii.net/common/unknown": true,
                     "http://registry.gpii.net/applications/org.alsa-project": {
                         "volume": 14,

diff --git a/documentation/SolutionsRegistryFormat.md b/documentation/SolutionsRegistryFormat.md
@@ -57,7 +57,6 @@ The `settingsHandlers` block is unique and one of the most important blocks in t
             "presentation.reportHelpBalloons": { ... metadata for setting ... },
             "speech.nonTransformableSetting": { ... metadata for setting ... }
         },
-        "capabilities": [],
         "capabilitiesTransformations": {
             "speech.espeak.pitch": {
                 "transform": {
@@ -146,7 +145,7 @@ Each of these lifecycle blocks allow the same content - which is an array with e
 
 The `update` block works very similarly to the configure, restore, start and stop blocks. It describes what should happen when the configuration needs to be updated (e.g. due to context changes, PCP adjustments, etc).
 
-The format of the `update` block allows for the same entries as the configure, restore, start and stop blocks - that is: arbitrary lifecycle action blocks and `settings.<blockname>`. Unlike for the other lifecycle blocks, the `update` block furthermore allows references to the `start`, `stop` and `configure` blocks. This is one by putting a string with the name of that block. When the system encounters one of these references, the entries of that block will be run.
+The format of the `update` block allows for the same entries as the configure, restore, start and stop blocks - that is: arbitrary lifecycle action blocks and `settings.<blockname>`. Unlike for the other lifecycle blocks, the `update` block furthermore allows references to the `start`, `stop` and `configure` blocks. This is done by putting a string with the name of that block. When the system encounters one of these references, the entries of that block will be run.
 
 **Example block**:
 ```

diff --git a/gpii/node_modules/canopyMatchMaker/src/CanopyMatchMaker.js b/gpii/node_modules/canopyMatchMaker/src/CanopyMatchMaker.js
diff --git a/gpii/node_modules/canopyMatchMaker/src/CanopyMatchMakerUtilities.js b/gpii/node_modules/canopyMatchMaker/src/CanopyMatchMakerUtilities.js
-Original file line number
+Diff line change
@@ Expand Up @@
     ### Return payload
-    The return payload from at call to `/match` should be in the following format:
+    The return payload from at call to `/match` should be in the following format. The "active" key expresses whether the application should be set to running. A `true` value means that it should be running, `undefined` means we leave it in its current run state and `false` mean we should actively ensure that it is not running.
     ```
     {
@@ Expand Down @@