diff --git a/ChangeLog b/ChangeLog
index f2e7930..a265066 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
* Support the -statistic option: replace each pixel with corresponding
statistic from the neighborhood.
* Add support for -duplicate option.
+ * Move configuration files from /usr/share and /usr/lib to /etc and /var.
2011-03-18 6.6.8-6 Anthony Thyssen <A.Thyssen@griffith...>
* Replaced Minus and Divide Composition methods with Dst and Src
diff --git a/ImageMagick.spec b/ImageMagick.spec
index 30f905c..10ac526 100644
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -260,7 +260,7 @@
%{_bindir}/[a-z]*
%{_libdir}/%{name}-%{VERSION}
%{_datadir}/%{name}-%{VERSION}
-%{_mandir}/man[145]/[a-z]*
+%{_mandir}/man[145]/[a-zA-Z]*
%{_mandir}/man1/%{name}.*
%exclude %{_libdir}/%{name}-%{VERSION}/modules-Q16/coders/djvu.*
diff --git a/ImageMagick.spec.in b/ImageMagick.spec.in
index cadc8f1..8250714 100644
--- a/ImageMagick.spec.in
+++ b/ImageMagick.spec.in
@@ -260,7 +260,7 @@
%{_bindir}/[a-z]*
%{_libdir}/%{name}-%{VERSION}
%{_datadir}/%{name}-%{VERSION}
-%{_mandir}/man[145]/[a-z]*
+%{_mandir}/man[145]/[a-zA-Z]*
%{_mandir}/man1/%{name}.*
%exclude %{_libdir}/%{name}-%{VERSION}/modules-Q16/coders/djvu.*
diff --git a/config/configure.xml b/config/configure.xml
index 84a5ecb..d849101 100644
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -9,7 +9,7 @@
<configure name="NAME" value="ImageMagick"/>
<configure name="LIB_VERSION" value="0x668"/>
<configure name="LIB_VERSION_NUMBER" value="6,6,8,6"/>
- <configure name="RELEASE_DATE" value="2011-03-19"/>
+ <configure name="RELEASE_DATE" value="2011-03-20"/>
<configure name="CONFIGURE" value="./configure "/>
<configure name="PREFIX" value="/usr/local"/>
<configure name="EXEC-PREFIX" value="/usr/local"/>
diff --git a/configure b/configure
index a59c1b5..2f7d341 100755
--- a/configure
+++ b/configure
@@ -30375,15 +30375,15 @@
-# Subdirectory under lib to place ImageMagick configuration files
-CONFIGURE_RELATIVE_PATH="${LIBRARY_RELATIVE_PATH}/config"
+# Subdirectory to place ImageMagick configuration files
+CONFIGURE_RELATIVE_PATH="${LIBRARY_RELATIVE_PATH}"
cat >>confdefs.h <<_ACEOF
#define CONFIGURE_RELATIVE_PATH "$CONFIGURE_RELATIVE_PATH"
_ACEOF
-CONFIGURE_PATH="${LIB_DIR}/${CONFIGURE_RELATIVE_PATH}/"
-DEFINE_CONFIGURE_PATH="${LIB_DIR}/${CONFIGURE_RELATIVE_PATH}/"
+CONFIGURE_PATH="${LOCALSTATE_DIR}/${CONFIGURE_RELATIVE_PATH}/"
+DEFINE_CONFIGURE_PATH="${LOCALSTATE_DIR}/${CONFIGURE_RELATIVE_PATH}/"
case "${build_os}" in
mingw* )
DEFINE_CONFIGURE_PATH=`$WinPathScript "$DEFINE_CONFIGURE_PATH" 1`
@@ -30474,15 +30474,15 @@
-# Subdirectory under share to place ImageMagick configuration files
-SHARE_CONFIGURE_RELATIVE_PATH="${LIBRARY_RELATIVE_PATH}/config"
+# Subdirectory to place ImageMagick configuration files
+SHARE_CONFIGURE_RELATIVE_PATH="${LIBRARY_RELATIVE_PATH}"
cat >>confdefs.h <<_ACEOF
#define SHARE_CONFIGURE_RELATIVE_PATH "$SHARE_CONFIGURE_RELATIVE_PATH"
_ACEOF
-SHARE_CONFIGURE_PATH="${DATA_DIR}/${SHARE_CONFIGURE_RELATIVE_PATH}"
-DEFINE_SHARE_CONFIGURE_PATH="${DATA_DIR}/${SHARE_CONFIGURE_RELATIVE_PATH}/"
+SHARE_CONFIGURE_PATH="${SYSCONF_DIR}/${SHARE_CONFIGURE_RELATIVE_PATH}"
+DEFINE_SHARE_CONFIGURE_PATH="${SYSCONF_DIR}/${SHARE_CONFIGURE_RELATIVE_PATH}/"
case "${build_os}" in
mingw* )
DEFINE_SHARE_CONFIGURE_PATH=`$WinPathScript "$DEFINE_SHARE_CONFIGURE_PATH" 1`
diff --git a/configure.ac b/configure.ac
index a11db17..2aa59e6 100755
--- a/configure.ac
+++ b/configure.ac
@@ -2706,11 +2706,11 @@
AC_DEFINE_UNQUOTED(LIBRARY_PATH,"$DEFINE_LIBRARY_PATH",Directory where architecture-dependent files live.)
AC_SUBST(LIBRARY_PATH)
-# Subdirectory under lib to place ImageMagick configuration files
-CONFIGURE_RELATIVE_PATH="${LIBRARY_RELATIVE_PATH}/config"
+# Subdirectory to place ImageMagick configuration files
+CONFIGURE_RELATIVE_PATH="${LIBRARY_RELATIVE_PATH}"
AC_DEFINE_UNQUOTED(CONFIGURE_RELATIVE_PATH,"$CONFIGURE_RELATIVE_PATH",Subdirectory of lib where architecture-dependent configuration files live.)
-CONFIGURE_PATH="${LIB_DIR}/${CONFIGURE_RELATIVE_PATH}/"
-DEFINE_CONFIGURE_PATH="${LIB_DIR}/${CONFIGURE_RELATIVE_PATH}/"
+CONFIGURE_PATH="${LOCALSTATE_DIR}/${CONFIGURE_RELATIVE_PATH}/"
+DEFINE_CONFIGURE_PATH="${LOCALSTATE_DIR}/${CONFIGURE_RELATIVE_PATH}/"
case "${build_os}" in
mingw* )
DEFINE_CONFIGURE_PATH=`$WinPathScript "$DEFINE_CONFIGURE_PATH" 1`
@@ -2773,11 +2773,11 @@
AC_DEFINE_UNQUOTED(SHARE_PATH,"$DEFINE_SHARE_PATH",Directory where architecture-independent files live.)
AC_SUBST(SHARE_PATH)
-# Subdirectory under share to place ImageMagick configuration files
-SHARE_CONFIGURE_RELATIVE_PATH="${LIBRARY_RELATIVE_PATH}/config"
+# Subdirectory to place ImageMagick configuration files
+SHARE_CONFIGURE_RELATIVE_PATH="${LIBRARY_RELATIVE_PATH}"
AC_DEFINE_UNQUOTED(SHARE_CONFIGURE_RELATIVE_PATH,"$SHARE_CONFIGURE_RELATIVE_PATH",Subdirectory of lib where architecture-independent configuration files live.)
-SHARE_CONFIGURE_PATH="${DATA_DIR}/${SHARE_CONFIGURE_RELATIVE_PATH}"
-DEFINE_SHARE_CONFIGURE_PATH="${DATA_DIR}/${SHARE_CONFIGURE_RELATIVE_PATH}/"
+SHARE_CONFIGURE_PATH="${SYSCONF_DIR}/${SHARE_CONFIGURE_RELATIVE_PATH}"
+DEFINE_SHARE_CONFIGURE_PATH="${SYSCONF_DIR}/${SHARE_CONFIGURE_RELATIVE_PATH}/"
case "${build_os}" in
mingw* )
DEFINE_SHARE_CONFIGURE_PATH=`$WinPathScript "$DEFINE_SHARE_CONFIGURE_PATH" 1`
diff --git a/magick/magick-config.h b/magick/magick-config.h
index 11f38da..df11fbf 100644
--- a/magick/magick-config.h
+++ b/magick/magick-config.h
@@ -44,13 +44,13 @@
/* Directory where architecture-dependent configuration files live. */
#ifndef MAGICKCORE_CONFIGURE_PATH
-#define MAGICKCORE_CONFIGURE_PATH "/usr/local/lib/ImageMagick-6.6.8/config/"
+#define MAGICKCORE_CONFIGURE_PATH "/usr/local/var/ImageMagick-6.6.8/"
#endif
/* Subdirectory of lib where architecture-dependent configuration files live.
*/
#ifndef MAGICKCORE_CONFIGURE_RELATIVE_PATH
-#define MAGICKCORE_CONFIGURE_RELATIVE_PATH "ImageMagick-6.6.8/config"
+#define MAGICKCORE_CONFIGURE_RELATIVE_PATH "ImageMagick-6.6.8"
#endif
/* Define if you have DJVU library */
@@ -1236,13 +1236,13 @@
/* Directory where architecture-independent configuration files live. */
#ifndef MAGICKCORE_SHARE_CONFIGURE_PATH
-#define MAGICKCORE_SHARE_CONFIGURE_PATH "/usr/local/share/ImageMagick-6.6.8/config/"
+#define MAGICKCORE_SHARE_CONFIGURE_PATH "/usr/local/etc/ImageMagick-6.6.8/"
#endif
/* Subdirectory of lib where architecture-independent configuration files
live. */
#ifndef MAGICKCORE_SHARE_CONFIGURE_RELATIVE_PATH
-#define MAGICKCORE_SHARE_CONFIGURE_RELATIVE_PATH "ImageMagick-6.6.8/config"
+#define MAGICKCORE_SHARE_CONFIGURE_RELATIVE_PATH "ImageMagick-6.6.8"
#endif
/* Directory where architecture-independent files live. */
diff --git a/magick/version.h b/magick/version.h
index ad05683..f0691ae 100644
--- a/magick/version.h
+++ b/magick/version.h
@@ -33,7 +33,7 @@
#define MagickLibAddendum "-6"
#define MagickLibInterface 4
#define MagickLibMinInterface 4
-#define MagickReleaseDate "2011-03-19"
+#define MagickReleaseDate "2011-03-20"
#define MagickChangeDate "20110314"
#define MagickAuthoritativeURL "http://www.imagemagick.org"
#if defined(MAGICKCORE_OPENMP_SUPPORT)
diff --git a/utilities/convert.1 b/utilities/convert.1
index e98f6ea..88ca58b 100644
--- a/utilities/convert.1
+++ b/utilities/convert.1
@@ -249,6 +249,8 @@
Image Stack Operators:
\-clone index clone an image
\-delete index delete the image from the image sequence
+ \-duplicate index count
+ duplicate an image one or more times
\-insert index insert last image into the image sequence
\-swap indexes swap two images in the image sequence
diff --git a/utilities/mogrify.1 b/utilities/mogrify.1
index 7448638..4c6e0cf 100644
--- a/utilities/mogrify.1
+++ b/utilities/mogrify.1
@@ -249,7 +249,6 @@
\-write filename write images to this file
Image Stack Operators:
- \-clone index clone an image
\-delete index delete the image from the image sequence
\-insert index insert last image into the image sequence
\-swap indexes swap two images in the image sequence
diff --git a/utilities/montage.1 b/utilities/montage.1
index 051bdb4..12fd068 100644
--- a/utilities/montage.1
+++ b/utilities/montage.1
@@ -108,6 +108,14 @@
Image Sequence Operators:
\-coalesce merge a sequence of images
+Image Stack Operators:
+ \-clone index clone an image
+ \-delete index delete the image from the image sequence
+ \-duplicate index count
+ duplicate an image one or more times
+ \-insert index insert last image into the image sequence
+ \-swap indexes swap two images in the image sequence
+
Miscellaneous Options:
\-debug events display copious debugging information
\-help print program options