From: Michael Kaply <consulting@kaply.com>
Date: Wed, 22 Aug 2018 15:57:04 +0000 (-0700)
Subject: Merge pull request #180 from mozilla/auth_fqdn
X-Git-Tag: v1.2~20
X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/11a18320359fb4e633ca790f8413b5fe57afe5c4?ds=sidebyside;hp=--cc

Merge pull request #180 from mozilla/auth_fqdn

Add support for non FQDN policy - Bugzilla 1471651
---

11a18320359fb4e633ca790f8413b5fe57afe5c4
diff --cc windows/en-US/firefox.adml
index e5f23e6,a78edb3..eca45b3
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@@ -39,8 -40,12 +40,12 @@@ For more information, see https://devel
  If this policy is disabled or not configured, no websites are trusted to use NTLM authentification.
  
  For more information, see https://developer.mozilla.org/en-US/docs/Mozilla/Integrated_authentication.</string>
+       <string id="Authentication_AllowNonFQDN">Allow Non FQDN</string>
+       <string id="Authentication_AllowNonFQDN_Explain">If this policy is enabled, you can always allow SPNEGO or NTLM on non FQDNs (fully qualified domain names).
+ 
+ If this policy is disabled or not configured, NTLM and SPNEGO are not enabled on non FQDNs.</string>
        <string id="BlockAboutAddons">Block Add-ons Manager</string>
 -      <string id="BlockAboutAddons_Explain" >If this policy is enabled, the user can not access the Add-ons Manager or about:addons.
 +      <string id="BlockAboutAddons_Explain" >If this policy is enabled, the user cannot access the Add-ons Manager or about:addons.
  
  If this policy is disabled or not configured, the user can access the Add-ons Manager and about:addons.</string>
        <string id="BlockAboutConfig">Block about:config</string>