Merge pull request #180 from mozilla/auth_fqdn

Add support for non FQDN policy - Bugzilla 1471651

diff --cc README.md
Simple merge

diff --cc windows/en-US/firefox.adml
index e5f23e61c3826edd57171f71dfa1990735136af2,a78edb349c48cbdfc3ec19b5dc7cd034487de319..eca45b303a33d7333831b1b442f9c2126509fd11
--- 1/windows/en-US/firefox.adml
--- 2/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>

diff --cc windows/firefox.admx
Simple merge