Merge branch 'master' into Backup

diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
new file mode 100644 (file)
index 0000000..a13a825
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -0,0 +1,45 @@
+name: "Policy templates"
+description: Report a problem with the policy templates
+title: "[bug]: "
+labels: ["bug"]
+assignees: []
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        If this report is about Firefox policy *implementation* or the *policy engine*, you can file it in Bugzilla directly:
+
+        https://bugzilla.mozilla.org/enter_bug.cgi?product=Firefox&component=Enterprise+Policies
+
+  - type: textarea
+    id: description
+    attributes:
+      label: Bug description
+      description: One or two sentences describing the issue.
+    validations:
+      required: true
+
+  - type: textarea
+    id: expected
+    attributes:
+      label: Expected behavior
+      description: What did you expect to see?
+    validations:
+      required: true
+
+  - type: input
+    id: firefox-version
+    attributes:
+      label: Firefox version
+      placeholder: "Firefox 123.0, ESR 115.6"
+    validations:
+      required: false
+
+  - type: input
+    id: os
+    attributes:
+      label: Operating system
+      placeholder: "macOS 15.7.1, Ubuntu 22.04"
+    validations:
+      required: false

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644 (file)
index 0000000..1220de5
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,10 @@
+blank_issues_enabled: false
+
+contact_links:
+  - name: Enterprise Policies
+    url: https://bugzilla.mozilla.org/enter_bug.cgi?product=Firefox&component=Enterprise+Policies
+    about: Bugs and feature requests related to specific policies implemented in Firefox, or to the policy engine itself should go here.
+
+  - name: Ask a question
+    url: https://github.com/mozilla/policy-templates/discussions
+    about: Have a question? Consider starting a discussion.

diff --git a/docs/index.md b/docs/index.md
index f65b8b1ace6697430600e21de07dd5f279edc7c5..5ca4ddc654999677a5834eec555864b60365aec4 100644 (file)
--- a/docs/index.md
+++ b/docs/index.md
@@ -31,6 +31,7 @@ Note: The `policies.json` must use the UTF-8 encoding.
 | **[`BlockAboutProfiles`](#blockaboutprofiles)** | Block access to About Profiles (about:profiles).
 | **[`BlockAboutSupport`](#blockaboutsupport)** | Block access to Troubleshooting Information (about:support).
 | **[`Bookmarks`](#bookmarks)** | Add bookmarks in either the bookmarks toolbar or menu.
+| **[`BrowserDataBackup`](#browserdatabackup)** | Disable backup or restore of profile data.
 | **[`CaptivePortal`](#captiveportal)** | Enable or disable the detection of captive portals.
 | **[`Certificates`](#certificates)** |
 | **[`Certificates -> ImportEnterpriseRoots`](#certificates--importenterpriseroots)** | Trust certificates that have been added to the operating system certificate store by a user or administrator.
@@ -55,7 +56,7 @@ Note: The `policies.json` must use the UTF-8 encoding.
 | **[`DisablePasswordReveal`](#disablepasswordreveal)** | Do not allow passwords to be revealed in saved logins.
 | **[`DisablePocket`](#disablepocket-deprecated)** | Remove Pocket in the Firefox UI.
 | **[`DisablePrivateBrowsing`](#disableprivatebrowsing)** | Remove access to private browsing.
-| **[`DisableProfileImport`](#disableprofileimport)** | Disables the "Import data from another browser" option in the bookmarks window.
+| **[`DisableProfileImport`](#disableprofileimport)** | Remove the ability to import data from other browers.
 | **[`DisableProfileRefresh`](#disableprofilerefresh)** | Disable the Refresh Firefox button on about:support and support.mozilla.org
 | **[`DisableSafeMode`](#disablesafemode)** | Disable safe mode within the browser.
 | **[`DisableSecurityBypass`](#disablesecuritybypass)** | Prevent the user from bypassing security in certain cases.
@@ -317,7 +318,9 @@ Prevent Firefox from being updated beyond the specified version.
 
 You can specify the any version as ```xx.``` and Firefox will be updated with all minor versions, but will not be updated beyond the major version.
 
-You can also specify the version as ```xx.xx``` and Firefox will be updated with all patch versions, but will not be updated beyond the minor version.
+You can also specify the version as ```xx.xx.``` and Firefox will be updated with all patch versions, but will not be updated beyond the minor version.
+
+Note: The value MUST end in a dot(.).
 
 You should specify a version that exists or is guaranteed to exist. If you specify a version that doesn't end up existing, Firefox will update beyond that version.
 
@@ -1000,6 +1003,56 @@ Value (string):
   }
 }
 ```
+
+### BrowserDataBackup
+
+Disable backup or restore of profile data. Backup and restore can be disabled individually. 
+
+Note: The policy can be used to disable backup and restore if it would otherwise be enabled, but cannot be used to force backup or restore to be enabled under conditions where it would not otherwise be (such as a platform on which backup or restore are not yet supported).
+
+**Compatibility:** Firefox 146\
+**CCK2 Equivalent:** N/A\
+**Preferences Affected:** N/A\
+
+#### Windows (GPO)
+```
+Software\Policies\Mozilla\Firefox\BrowserDataBackup\AllowBackup = 0x1 | 0x0
+Software\Policies\Mozilla\Firefox\BrowserDataBackup\AllowRestore = 0x1 | 0x0
+```
+#### Windows (Intune)
+OMA-URI:
+```
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Backup/BrowserDataBackup_AllowBackup
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Backup/BrowserDataBackup_AllowRestore
+```
+Value (string):
+```
+<enabled/> or <disabled/>
+```
+#### macOS
+```
+<dict>
+  <key>BrowserDataBackup/key>
+  <dict>
+    <key>AllowBackup</key>
+    <true/> | <false/>
+    <key>AllowRestore</key>
+    <true/> | <false/>
+  </dict>
+</dict>
+```
+#### policies.json
+```
+{
+  "policies": {
+    "BrowserDataBackup": {
+      "AllowBackup": true | false,
+      "AllowRestore": true | false
+    }
+  }
+}
+```
+
 ### CaptivePortal
 Enable or disable the detection of captive portals.
 
@@ -2322,7 +2375,7 @@ Value (string):
 }
 ```
 ### DisableProfileImport
-Disables the "Import data from another browser" option in the bookmarks window.
+Remove the ability to import data from other browers.
 
 **Compatibility:** Firefox 60, Firefox ESR 60\
 **CCK2 Equivalent:** N/A\
@@ -3579,9 +3632,11 @@ Value (string):
 ### FirefoxSuggest
 Customize Firefox Suggest (US only).
 
+As of Firefox 146, `WebSuggestions` turns off Suggest completely.
+
 **Compatibility:** Firefox 118, Firefox ESR 115.3.
 **CCK2 Equivalent:** N/A\
-**Preferences Affected:** `browser.urlbar.suggest.quicksuggest.nonsponsored`, `browser.urlbar.suggest.quicksuggest.sponsored`, `browser.urlbar.quicksuggest.dataCollection.enabled`
+**Preferences Affected:** `browser.urlbar.suggest.quicksuggest.all`, `browser.urlbar.suggest.quicksuggest.sponsored`, `browser.urlbar.quicksuggest.dataCollection.enabled`
 
 #### Windows (GPO)
 ```
@@ -7143,8 +7198,6 @@ Prevent Firefox from messaging the user in certain situations.
 
 `FirefoxLabs` If false, don't show the "Firefox Labs" section in Preferences. (Firefox 130.0.1)
 
-Note: Firefox Labs is now controlled by Nimbus, our testing platform, so disabling telemetry also disables Firefox Labs.
-
 `Locked` prevents the user from changing user messaging preferences.
 
 **Compatibility:** Firefox 75, Firefox ESR 68.7\

diff --git a/linux/policies.json b/linux/policies.json
index 3813e09b443749f8c6d0ac040fa17f48f8dccddd..e25351de2eb126a5012c41f13ff79c16c76de820 100644 (file)
--- a/linux/policies.json
+++ b/linux/policies.json
@@ -41,7 +41,7 @@
     ],
     "CaptivePortal": true | false,
     "Certificates": {
-      "Install": ["cert1.der", "/home/username/cert2.pem"],
+      "Install": ["cert1.der", "/home/username/cert2.pem"]
     },
     "Containers": {
       "Default": [
@@ -58,12 +58,12 @@
       "Block": ["http://example.edu/"],
       "Locked": true | false,
       "Behavior": "accept" | "reject-foreign" | "reject" | "limit-foreign" | "reject-tracker" | "reject-tracker-and-partition-foreign",
-      "BehaviorPrivateBrowsing": "accept" | "reject-foreign" | "reject" | "limit-foreign" | "reject-tracker" | "reject-tracker-and-partition-foreign",
+      "BehaviorPrivateBrowsing": "accept" | "reject-foreign" | "reject" | "limit-foreign" | "reject-tracker" | "reject-tracker-and-partition-foreign"
     },
     "DefaultDownloadDirectory": "${home}/Downloads",
     "DisableBuiltinPDFViewer": true | false,
     "DisabledCiphers": {
-      "CIPHER_NAME": true | false,
+      "CIPHER_NAME": true | false
     },
     "DisableDeveloperTools": true | false,
     "DisableEncryptedClientHello": true | false,
@@ -87,7 +87,7 @@
     "DisableSystemAddonUpdate": true | false,
     "DisableTelemetry": true | false,
     "DisplayBookmarksToolbar": "always" | "never" | "newtab",
-    "DisplayMenuBar": "always", "never", "default-on", "default-off",
+    "DisplayMenuBar": "always" | "never" | "default-on" | "default-off",
     "DNSOverHTTPS": {
       "Enabled":  true | false,
       "ProviderURL": "URL_TO_ALTERNATE_PROVIDER",
@@ -285,7 +285,7 @@
         "Block": ["https://example.edu"],
         "BlockNewRequests": true | false,
         "Locked": true | false
-      },
+      }
     },
     "PictureInPicture": {
       "Enabled": true | false,
@@ -334,6 +334,7 @@
     "SanitizeOnShutdown": {
       "Cache": true | false,
       "Cookies": true | false,
+      "FormData": true | false,
       "History": true | false,
       "Sessions": true | false,
       "SiteSettings": true | false,
@@ -380,11 +381,11 @@
       "FirefoxLabs": true | false,
       "Locked": true | false
     },
-    "UseSystemPrintDialog": true | false.,
-    "VisualSearchEnabled": true | false.,
+    "UseSystemPrintDialog": true | false,
+    "VisualSearchEnabled": true | false,
     "WebsiteFilter": {
       "Block": ["<all_urls>"],
       "Exceptions": ["http://example.org/*"]
     }
   }
-}
\ No newline at end of file
+}

diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml
index ac22efea5bc5870ef6c63904283ef3ef98fffa1e..0ae3241b1a2aabdbdafa79f6557d6b2e442f3951 100644 (file)
--- a/windows/de-DE/firefox.adml
+++ b/windows/de-DE/firefox.adml
@@ -290,9 +290,9 @@ Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, steht
 
 Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, ist privates Surfen erlaubt.</string>
       <string id="DisableProfileImport">Profil-Import deaktivieren</string>
-      <string id="DisableProfileImport_Explain">Wenn Sie die Richtlinieneinstellung aktivieren, steht die Option "Daten von einen anderen Browser importieren.." in der Bibliothek nicht zur Verfügung.
+      <string id="DisableProfileImport_Explain">Wenn diese Richtlinieneinstellung aktiviert ist, können keine Daten aus anderen Browsern importiert werden.
 
-Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, steht die Option "Daten von einen anderen Browser importieren..." in der Bibliothek zur Verfügung.</string>
+Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert ist, können Daten aus anderen Browsern importiert werden.</string>
       <string id="DisableProfileRefresh">Firefox bereinigen deaktivieren</string>
       <string id="DisableProfileRefresh_Explain">Wenn Sie die Richtlinieneinstellung aktivieren, steht der "Firefox bereinigen..." Button auf der about:support Seite oder auf support.mozilla.org nicht zur Verfügung.
 

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index aeecff8214ff62014a6dc2be38a213aee198c14b..4aac1625d32c6a4518530951815030590c88b182 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -292,9 +292,9 @@ If this policy is disabled or not configured, Pocket is available.</string>
 
 If this policy is disabled or not configured, private browsing is allowed.</string>
       <string id="DisableProfileImport">Disable Profile Import</string>
-      <string id="DisableProfileImport_Explain">If this policy is enabled, the "Import data from another browser" option is not available in the bookmarks window.
+      <string id="DisableProfileImport_Explain">If this policy is enabled, you cannot import data from other browsers.
 
-If this policy is disabled or not configured, the "Import data from another browser" option is available.</string>
+If this policy is disabled or not configured, you can import data from other browsers.</string>
       <string id="DisableProfileRefresh">Disable Profile Refresh</string>
       <string id="DisableProfileRefresh_Explain">If this policy is enabled, the "Refresh Firefox" button is not available on the about:support page or on support.mozilla.org.
 

diff --git a/windows/fr-FR/firefox.adml b/windows/fr-FR/firefox.adml
index aa9704d83292a23f692a6b763736c0d517836fa0..89bfdd95009cf94987fe91a60e1dbf6529bef349 100644 (file)
--- a/windows/fr-FR/firefox.adml
+++ b/windows/fr-FR/firefox.adml
@@ -290,9 +290,9 @@ Si cette stratégie est désactivée ou non configurée, Pocket est disponible.<
 
 Si cette stratégie est désactivée ou non configurée, la navigation privée est autorisée.</string>
       <string id="DisableProfileImport">Désactiver l'importation de profil</string>
-      <string id="DisableProfileImport_Explain">Si cette stratégie est activée, l'option "Importer des données depuis un autre navigateur" n’est pas disponible dans la fenêtre des favoris.
+      <string id="DisableProfileImport_Explain">Si cette stratégie est activée, vous ne pouvez pas importer de données depuis d’autres navigateurs.
 
-Si cette stratégie est désactivée ou non configurée, l'option "Importer des données depuis un autre navigateur" est disponible.</string>
+Si cette stratégie est désactivée ou non configurée, vous pouvez importer des données depuis d’autres navigateurs.</string>
       <string id="DisableProfileRefresh">Désactiver l'actualisation du profil</string>
       <string id="DisableProfileRefresh_Explain">Si cette stratégie est activée, le bouton "Actualiser Firefox" n'est pas disponible sur la page about:support ou sur support.mozilla.org.
 

diff --git a/windows/ru-RU/firefox.adml b/windows/ru-RU/firefox.adml
index eafe6cb43ec13e4e007248921f1ede554f42420c..785148367759865e1e2323930fa1a69093602fbc 100644 (file)
--- a/windows/ru-RU/firefox.adml
+++ b/windows/ru-RU/firefox.adml
@@ -291,9 +291,9 @@
 
 Если эта политика отключена или не настроена, приватный просмотр разрешен.</string>
       <string id="DisableProfileImport">Отключить импорт профиля</string>
-      <string id="DisableProfileImport_Explain">Ð\95Ñ\81ли Ñ\8dÑ\82а полиÑ\82ика вклÑ\8eÑ\87ена, опÑ\86иÑ\8f «Ð\98мпоÑ\80Ñ\82иÑ\80оваÑ\82Ñ\8c даннÑ\8bе из дÑ\80Ñ\83гого бÑ\80аÑ\83зеÑ\80аâ\80¦Â» в окне закладок недоÑ\81Ñ\82Ñ\83пна.
+      <string id="DisableProfileImport_Explain">Ð\95Ñ\81ли Ñ\8dÑ\82а полиÑ\82ика вклÑ\8eÑ\87ена, вÑ\8b не можеÑ\82е импоÑ\80Ñ\82иÑ\80оваÑ\82Ñ\8c даннÑ\8bе из дÑ\80Ñ\83гиÑ\85 бÑ\80аÑ\83зеÑ\80ов.
 
-Если эта политика отключена или не настроена, в окне закладок доступна опция «Импортировать данные из другого браузера…».</string>
+Если эта политика отключена или не настроена, вы можете импортировать данные из других браузеров.</string>
       <string id="DisableProfileRefresh">Отключить обновление профиля</string>
       <string id="DisableProfileRefresh_Explain">Если эта политика включена, кнопка «Обновить Firefox» недоступна на странице about:support или на сайте support.mozilla.org.