X-Git-Url: https://git.p6c8.net/policy-templates.git/blobdiff_plain/d20073037094c5fb6fff7b9930a642b6651303c4..95d70cbdf19c77f6513fb80d88bbf6afc8553075:/windows/en-US/firefox.adml?ds=inline diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml index 3b3ac8d..b463070 100644 --- a/windows/en-US/firefox.adml +++ b/windows/en-US/firefox.adml @@ -1,4 +1,4 @@ - + @@ -173,7 +173,7 @@ If this policy is disabled or not configured, no extensions are locked. If this policy is enabled or not configured, Firefox will offer to save website logins and passwords. If this policy is disabled, firefox will not offer to save website logins and passwords. - If this policy is enabled, pop-up windows are always allowed for the URLS indicated. If a top level domain is specified (http://example.org), pop-up windows are allowed for all subdomains as well. + If this policy is enabled, pop-up windows are always allowed for the origins indicated. If a top level domain is specified (http://example.org), pop-up windows are allowed for all subdomains as well. If this policy is disabled or not configured, the default pop-up policy is followed. Allow pop-ups from websites @@ -184,17 +184,17 @@ If this policy is not configured or enabled, popups are not allowed from website If this policy is enabled pop-up preferences cannot be changed by the user. If this policy is disabled or not configured, the user can change their pop-up preferences. - If this policy is enabled, add-ons are always allowed for the URLS indicated unless add-on install is disabled. If a top level domain is specified (http://example.org), add-ons are allowed for all subdomains as well. + If this policy is enabled, add-ons are always allowed for the origins indicated unless add-on install is disabled. If a top level domain is specified (http://example.org), add-ons are allowed for all subdomains as well. If this policy is disabled or not configured, the default add-on policy is followed. Allow add-on installs from websites If this policy is disabled, add-ons cannot be installed. If this policy is not configured or enabled, add-ons can be installed. - If this policy is enabled, cookies are always allowed for the URLS indicated. If a top level domain is specified (http://example.org), cookies are allowed for all subdomains as well. + If this policy is enabled, cookies are always allowed for the origins indicated. If a top level domain is specified (http://example.org), cookies are allowed for all subdomains as well. If this policy is disabled or not configured, the default cookie policy is followed. - If this policy is enabled, cookies are blocked for the URLS indicated. If a top level domain is specified (http://example.org), cookies are blocked from all subdomains as well. + If this policy is enabled, cookies are blocked for the origins indicated. If a top level domain is specified (http://example.org), cookies are blocked from all subdomains as well. If this policy is disabled or not configured, cookies are not blocked by default. Accept cookies from websites @@ -216,10 +216,10 @@ This setting is ignored if this policy is disabled or not configured or if cooki If this policy is enabled cookie preferences cannot be changed by the user. If this policy is disabled or not configured, the user can change their cookie preferences. - If this policy is enabled, Flash is activated by default for the URLS indicated unless Flash is completely disabled. If a top level domain is specified (http://example.org), Flash is allowed for all subdomains as well. + If this policy is enabled, Flash is activated by default for the origins indicated unless Flash is completely disabled. If a top level domain is specified (http://example.org), Flash is allowed for all subdomains as well. If this policy is disabled or not configured, the default Flash policy is followed. - If this policy is enabled, Flash is blocked for the URLS indicated. If a top level domain is specified (http://example.org), Flas is blocked from all subdomains as well. + If this policy is enabled, Flash is blocked for the origins indicated. If a top level domain is specified (http://example.org), Flas is blocked from all subdomains as well. If this policy is disabled or not configured, the default Flash policy is followed. Activate Flash on websites @@ -252,11 +252,118 @@ If this policy is disabled or not configured, no websites are blocked. If this policy is enabled, and the website filter is enabled, you can specify match patterns for sites you do not want to block. The match patterns are documented at https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Match_patterns. Only http/https accesses are supported at the moment. There is a 1000 entry limit.", If this policy is disabled or not configured, there are no exceptions to the website filter. - Bookmark One - Bookmark Two - Bookmark Three - Bookmark Four - Bookmark Five + Bookmark One + Bookmark Two + Bookmark Three + Bookmark Four + Bookmark Five + Bookmark Six + Bookmark Seven + Bookmark Eight + Bookmark Nine + Bookmark Ten + Bookmark Eleven + Bookmark Twelve + Bookmark Thirteen + Bookmark Fourteen + Bookmark Fifteen + Bookmark Sixteen + Bookmark Seventeen + Bookmark Eighteen + Bookmark Nineteen + Bookmark Twenty + Bookmark Twenty-one + Bookmark Twenty-two + Bookmark Twenty-three + Bookmark Twenty-four + Bookmark Twenty-five + Bookmark Twenty-six + Bookmark Twenty-seven + Bookmark Twenty-eight + Bookmark Twenty-nine + Bookmark Thirty + Bookmark Thirty-one + Bookmark Thirty-two + Bookmark Thirty-three + Bookmark Thirty-four + Bookmark Thirty-five + Bookmark Thirty-six +<<<<<<< HEAD +<<<<<<< HEAD + Bookmark Thirty-seven + Bookmark Thirty-eight + Bookmark Thirty-nine + Bookmark Forty + Bookmark Forty-one + Bookmark Forty-two + Bookmark Forty-three + Bookmark Forty-four + Bookmark Forty-five + Bookmark Forty-six + Bookmark Forty-seven + Bookmark Forty-eight + Bookmark Forty-nine + Bookmark Fifty + Bookmark Fifty-one + Bookmark Fifty-two + Bookmark Fifty-three + Bookmark Fifty-four + Bookmark Fifty-five + Bookmark Fifty-six + Bookmark Fifty-seven + Bookmark Fifty-eight + Bookmark Fifty-nine + Bookmark Sixty + Bookmark Sixty-one + Bookmark Sixty-two + Bookmark Sixty-three + Bookmark Sixty-four + Bookmark Sixty-five + Bookmark Sixty-six + Bookmark Sixty-seven + Bookmark Sixty-eight + Bookmark Sixty-nine + Bookmark Seventy + Bookmark Seventy-one + Bookmark Seventy-two + Bookmark Seventy-three + Bookmark Seventy-four + Bookmark Seventy-five + Bookmark Seventy-six + Bookmark Seventy-seven + Bookmark Seventy-eight + Bookmark Seventy-nine + Bookmark Eighty + Bookmark Eighty-one + Bookmark Eighty-two + Bookmark Eighty-three + Bookmark Eighty-four + Bookmark Eighty-five + Bookmark Eighty-six + Bookmark Eighty-seven + Bookmark Eighty-eight + Bookmark Eighty-nine +======= +======= +>>>>>>> parent of 8c70d63... Added even more bookmarks + Bookmark Thirty-seven + Bookmark Thirty-eight + Bookmark Thirty-nine + Bookmark Forty + Bookmark Forty-one + Bookmark Forty-two + Bookmark Forty-three + Bookmark Forty-four + Bookmark Forty-five + Bookmark Forty-six + Bookmark Forty-seven + Bookmark Forty-eight + Bookmark Forty-nine + Bookmark Fifty +<<<<<<< HEAD +>>>>>>> parent of 8c70d63... Added even more bookmarks +======= +>>>>>>> parent of 8c70d63... Added even more bookmarks If this policy is enabled, you can configure a bookmark be added to Firefox. Due to a bug, you must select the location. Note that you must specify the bookmarks in order. If this policy is not configured or disabled, a new bookmark is not added.