Merge branch 'mozilla:master' into master

[policy-templates.git] / mac / org.mozilla.firefox.plist

diff --git a/mac/org.mozilla.firefox.plist b/mac/org.mozilla.firefox.plist
index b37abd962ca5411927d030b3c72a55ee63c6ed91..f1701f43507343a76496b889c752def570eea57d 100644 (file)
--- a/mac/org.mozilla.firefox.plist
+++ b/mac/org.mozilla.firefox.plist
@@ -320,18 +320,14 @@
                <key>Locked</key>
                <true/>
        </dict>
-       <key>FlashPlugin</key>
+       <key>FirefoxHome</key>
        <dict>
-               <key>Allow</key>
-               <array>
-                       <string>https://www.example.com</string>
-               </array>
-               <key>Block</key>
-               <array>
-                       <string>https://www.example.org</string>
-               </array>
-               <key>Default</key>
+               <key>WebSuggestions</key>
                <true/>
+               <key>SponsoredSuggestions</key>
+               <false/>
+               <key>ImproveSuggest</key>
+               <false/>
                <key>Locked</key>
                <true/>
        </dict>
@@ -586,14 +582,32 @@
                        <string>locked</string>
                </dict>
        </dict>
+       <key>PrintingEnabled</key>
+       <false/>
        <key>Proxy</key>
        <dict>
-               <key>SocksVersion</key>
-               <string>4</string>
                <key>Mode</key>
                <string>manual</string>
                <key>HTTPProxy</key>
                <string>proxy.example.com:80</string>
+               <key>UseHTTPProxyForAllProtocols</key>
+               <true/>
+               <key>SSLProxy</key>
+               <string>proxy.example.com:80</string>
+               <key>FTPProxy</key>
+               <string>proxy.example.com:80</string>
+               <key>SOCKSProxy</key>
+               <string>proxy.example.com:80</string>
+               <key>SocksVersion</key>
+               <string>4</string>
+               <key>Passthrough</key>
+               <string>&lt;local&gt;</string>
+               <key>AutoConfigURL</key>
+               <string>URL_TO_AUTOCONFIG</string>
+               <key>AutoLogin</key>
+               <true/>
+               <key>UseProxyForDNS</key>
+               <true/>
                <key>Locked</key>
                <true/>
        </dict>