Bug 1182424 - Part 3 - Update the docs. r=gfritzsche a=sledru
authorAlessio Placitelli <alessio.placitelli@gmail.com>
Fri, 10 Jul 2015 08:29:00 +0200
changeset 275329 6141fafa90698b22dac98b93384441dfe664735d
parent 275328 fe0afe28c07c5135d8dcc8457819f858d19ce435
child 275330 73a8176437a06cace6a31f186bb41825aac0d1b8
push id863
push userraliiev@mozilla.com
push dateMon, 03 Aug 2015 13:22:43 +0000
treeherdermozilla-release@f6321b14228d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgfritzsche, sledru
bugs1182424
milestone40.0
Bug 1182424 - Part 3 - Update the docs. r=gfritzsche a=sledru
toolkit/components/telemetry/docs/preferences.rst
--- a/toolkit/components/telemetry/docs/preferences.rst
+++ b/toolkit/components/telemetry/docs/preferences.rst
@@ -8,16 +8,21 @@ Sending only happens on official builds 
 
 ``toolkit.telemetry.unified``
 
   This controls whether unified behavior is enabled. If true:
 
   * Telemetry is always enabled and recording *base* data.
   * Telemetry will send additional ``main`` pings.
 
+``toolkit.telemetry.unifiedIsOptIn``
+
+  When true, we enable the Telemetry system only for people that opted into Telemetry, even if unified Telemetry is enabled.
+  Defaults to false & requires a restart.
+
 ``toolkit.telemetry.enabled``
 
   If ``unified`` is off, this controls whether the Telemetry module is enabled.
   If ``unified`` is on, this controls whether to record *extended* data.
   This preference is controlled through the `Preferences` dialog.
 
 ``datareporting.healthreport.uploadEnabled``