From: Olivier Berger <olivier.berger@it-sudparis.eu>
Date: Wed, 18 Jul 2012 19:24:10 +0000 (+0000)
Subject: Renaming to zz-local.ini
X-Git-Tag: v5_2_rc2~49
X-Git-Url: https://scm.fusionforge.org/anonscm/gitweb?p=fusionforge%2Ffusionforge.git;a=commitdiff_plain;h=e1f21c702916b397e48d45bc5a12f2524e6c0632

Renaming to zz-local.ini
---

diff --git a/.gitattributes b/.gitattributes
index 524ff09a4d..f74af3df3a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -780,7 +780,7 @@ src/etc/config.ini.d/scmhg.ini -text
 src/etc/config.ini.d/scmsvn.ini -text
 src/etc/config.ini.d/svncommitemail.ini -text
 src/etc/config.ini.d/svntracker.ini -text
-src/etc/config.ini.d/zz_my_settings.ini -text
+src/etc/config.ini.d/zz-local.ini -text
 src/etc/httpd.conf-fhs -text
 src/etc/httpd.conf-opt -text
 src/etc/httpd.conf-usrlocal -text
diff --git a/src/debian/README.Debian.tmpl b/src/debian/README.Debian.tmpl
index bee261ef3e..c86726439c 100644
--- a/src/debian/README.Debian.tmpl
+++ b/src/debian/README.Debian.tmpl
@@ -100,7 +100,7 @@ appropriate steps in the database server too.
 Instead of changing the contents of the existing file, you may wish to
 add only your custom local settings which differ from the packaged
 defaults in a dedicated overriding file, for example in the provided
-/etc/fusionforge/config.ini.d/zz_my_settings.ini. This will make it
+/etc/fusionforge/config.ini.d/zz-local.ini. This will make it
 easier to track local customizations.
 
 
diff --git a/src/etc/config.ini.d/defaults.ini b/src/etc/config.ini.d/defaults.ini
index 9b45e717c1..16dcdbffbc 100644
--- a/src/etc/config.ini.d/defaults.ini
+++ b/src/etc/config.ini.d/defaults.ini
@@ -4,7 +4,7 @@
 ; https://fusionforge.org/plugins/mediawiki/wiki/fusionforge/index.php/Configuration#Configuration_variables
 ;
 ; Note : instead of modifying this file, you may wish to place changed
-; settings in an overriding config.ini.d file, like the provided zz_my_settings.ini
+; settings in an overriding config.ini.d file, like the provided zz-local.ini
 
 [core]
 
diff --git a/src/etc/config.ini.d/zz_my_settings.ini b/src/etc/config.ini.d/zz-local.ini
similarity index 83%
rename from src/etc/config.ini.d/zz_my_settings.ini
rename to src/etc/config.ini.d/zz-local.ini
index 03e5852da9..af0b11a87f 100644
--- a/src/etc/config.ini.d/zz_my_settings.ini
+++ b/src/etc/config.ini.d/zz-local.ini
@@ -3,7 +3,7 @@
 ; Instead of changing the defaults.ini, you may copy/paste only the
 ; needed changes into this file
 ;
-; This file is named zz_... so that alphabetical order sortering
+; This file is named zz-local.ini so that alphabetical order sortering
 ;  places is at the end (thus overriding previous settings)
 ;
 
diff --git a/src/packaging/install/common b/src/packaging/install/common
index 5413979f13..920265baa9 100644
--- a/src/packaging/install/common
+++ b/src/packaging/install/common
@@ -1,7 +1,7 @@
 etc/config.ini-fhs                     etc/@PACKAGE@
 etc/config.ini.d/defaults.ini          etc/@PACKAGE@/config.ini.d/
 etc/config.ini.d/debug.ini             etc/@PACKAGE@/config.ini.d/
-etc/config.ini.d/zz_my_settings.ini    etc/@PACKAGE@/config.ini.d/
+etc/config.ini.d/zz-local.ini          etc/@PACKAGE@/config.ini.d/
 deb-specific/cvssh                     bin/
 #
 deb-specific/install-chroot.sh         usr/share/@OLDPACKAGE@/bin/