[debian-edu-commits] debian-edu/ 02/07: firefox-networked-prefs.js: Fix configuration folder in comment.

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch jessie
in repository debian-edu-config.

commit 8f79f304f1404ec9caebaaa85c84a5b3a7a8e14c
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Jul 7 12:20:11 2016 +0200

    firefox-networked-prefs.js: Fix configuration folder in comment.
    
    (cherry picked from commit 7c91443b83d1c5d52405ad0898e607556d870eb3)
    
    Conflicts (resolved by Mike Gabriel):
    	debian/changelog
---
 debian/changelog                                   | 1 +
 share/debian-edu-config/firefox-networked-prefs.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 57f565d..65aee5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ debian-edu-config (1.818+deb8u2) UNRELEASED; urgency=medium
     /usr/share/firefox/defaults/.
   * Rename cf.firefox to cf.firefox-esr and make sure it operated on
    /etc/firefox-esr.
+  * firefox-networked-prefs.js: Fix configuration folder in comment.
 
  -- Holger Levsen <holger at debian.org>  Tue, 31 May 2016 11:23:33 +0200
 
diff --git a/share/debian-edu-config/firefox-networked-prefs.js b/share/debian-edu-config/firefox-networked-prefs.js
index 521f389..ac44e80 100644
--- a/share/debian-edu-config/firefox-networked-prefs.js
+++ b/share/debian-edu-config/firefox-networked-prefs.js
@@ -1,5 +1,5 @@
 // Force proxy usage.  Only for networked clients. Enabled using cfengine
-// by symlinking this file to /etc/firefox/debian-edu-networked.js
+// by symlinking this file to /etc/firefox-esr/debian-edu-networked.js
 
 // Enable automatic proxy setting Configure Proxy settings in firefox,
 // using "Web Access Protocol Discovery" (WAPD).  See

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git