(no commit message)

diff --git a/ImageMagick.spec b/ImageMagick.spec
index fc12d1029cd7ebb9d5ecd45589de312667c63261..2f4aaa7b4045a1c1d03e1d452c42f6e9e3dfff6c 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -2,8 +2,8 @@
 %global Patchlevel  0
 
 Name:           ImageMagick
-Version:        %{VERSION}
-Release:        %{Patchlevel}
+Version:        %{VERSION}.%{Patchlevel}
+Release:        3%{?dist}
 Summary:        Use ImageMagick to convert, edit, or compose bitmap images in a variety of formats.  In addition resize, rotate, shear, distort and transform images.
 Group:          Applications/Multimedia
 License:        http://www.imagemagick.org/script/license.php
@@ -73,12 +73,6 @@ APIs, you need to install ImageMagick-devel as well as ImageMagick.
 You do not need to install it if you just want to use ImageMagick,
 however.
 
-
-%package doc
-Summary: ImageMagick HTML documentation
-Group: Documentation
-
-
 %package djvu
 Summary: DjVu plugin for ImageMagick
 Group: Applications/Multimedia
@@ -89,6 +83,10 @@ This packages contains a plugin for ImageMagick which makes it possible to
 save and load DjvU files from ImageMagick and libMagickCore using applications.
 
 
+%package doc
+Summary: ImageMagick HTML documentation
+Group: Documentation
+
 %description doc
 ImageMagick documentation, this package contains usage (for the
 commandline tools) and API (for the libraries) documentation in HTML format.
@@ -180,7 +178,7 @@ make
 rm -rf %{buildroot}
 
 make install DESTDIR=%{buildroot} INSTALL="install -p"
-cp -a www/source %{buildroot}%{_datadir}/doc/%{name}
+cp -a www/source %{buildroot}%{_datadir}/doc/%{name}-%{VERSION}
 rm %{buildroot}%{_libdir}/*.la
 
 # fix weird perl Magick.so permissions
@@ -251,8 +249,8 @@ rm -rf %{buildroot}
 %doc README.txt LICENSE NOTICE AUTHORS.txt NEWS.txt
 %{_libdir}/libMagickCore.so*
 %{_libdir}/libMagickWand.so*
-%{_libdir}/%{name}-%{VERSION}
 %{_bindir}/[a-z]*
+%{_libdir}/%{name}-%{VERSION}
 %{_sysconfdir}/%{name}
 %{_libdir}/%{name}-%{VERSION}
 %{_datadir}/%{name}-%{VERSION}
@@ -282,7 +280,7 @@ rm -rf %{buildroot}
 
 %files doc
 %defattr(-,root,root,-)
-%doc %{_datadir}/doc/%{name}
+%doc %{_datadir}/doc/%{name}-%{VERSION}
 %doc LICENSE
 
 %files c++

diff --git a/ImageMagick.spec.in b/ImageMagick.spec.in
index 6fabafb7f2bdef10b19aa03863eae77758e1f4c7..1f717280ee126b1d1d4a5be89aa2323fea218707 100644 (file)
--- a/ImageMagick.spec.in
+++ b/ImageMagick.spec.in
@@ -2,8 +2,8 @@
 %global Patchlevel  @PACKAGE_RELEASE@
 
 Name:           @PACKAGE_NAME@
-Version:        %{VERSION}
-Release:        %{Patchlevel}
+Version:        %{VERSION}.%{Patchlevel}
+Release:        3%{?dist}
 Summary:        Use ImageMagick to convert, edit, or compose bitmap images in a variety of formats.  In addition resize, rotate, shear, distort and transform images.
 Group:          Applications/Multimedia
 License:        http://www.imagemagick.org/script/license.php
@@ -73,12 +73,6 @@ APIs, you need to install ImageMagick-devel as well as ImageMagick.
 You do not need to install it if you just want to use ImageMagick,
 however.
 
-
-%package doc
-Summary: ImageMagick HTML documentation
-Group: Documentation
-
-
 %package djvu
 Summary: DjVu plugin for ImageMagick
 Group: Applications/Multimedia
@@ -89,6 +83,10 @@ This packages contains a plugin for ImageMagick which makes it possible to
 save and load DjvU files from ImageMagick and libMagickCore using applications.
 
 
+%package doc
+Summary: ImageMagick HTML documentation
+Group: Documentation
+
 %description doc
 ImageMagick documentation, this package contains usage (for the
 commandline tools) and API (for the libraries) documentation in HTML format.
@@ -180,7 +178,7 @@ make
 rm -rf %{buildroot}
 
 make install DESTDIR=%{buildroot} INSTALL="install -p"
-cp -a www/source %{buildroot}%{_datadir}/doc/%{name}
+cp -a www/source %{buildroot}%{_datadir}/doc/%{name}-%{VERSION}
 rm %{buildroot}%{_libdir}/*.la
 
 # fix weird perl Magick.so permissions
@@ -251,8 +249,8 @@ rm -rf %{buildroot}
 %doc README.txt LICENSE NOTICE AUTHORS.txt NEWS.txt
 %{_libdir}/libMagickCore.so*
 %{_libdir}/libMagickWand.so*
-%{_libdir}/%{name}-%{VERSION}
 %{_bindir}/[a-z]*
+%{_libdir}/%{name}-%{VERSION}
 %{_sysconfdir}/%{name}
 %{_libdir}/%{name}-%{VERSION}
 %{_datadir}/%{name}-%{VERSION}
@@ -282,7 +280,7 @@ rm -rf %{buildroot}
 
 %files doc
 %defattr(-,root,root,-)
-%doc %{_datadir}/doc/%{name}
+%doc %{_datadir}/doc/%{name}-%{VERSION}
 %doc LICENSE
 
 %files c++

diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h
index 8bab66c8aaf0a985cd2ec0ead1953b46204bccbf..e8ac116b8f38ee612ed5d524f395d0941f01637b 100644 (file)
--- a/MagickCore/magick-config.h
+++ b/MagickCore/magick-config.h
@@ -60,7 +60,7 @@
 
 /* Directory where ImageMagick documents live. */
 #ifndef MAGICKCORE_DOCUMENTATION_PATH
-#define MAGICKCORE_DOCUMENTATION_PATH "/usr/local/share/doc/ImageMagick//"
+#define MAGICKCORE_DOCUMENTATION_PATH "/usr/local/share/doc/ImageMagick-7.0.0/"
 #endif
 
 /* Define if you have Display Postscript */

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 30bba568f9f17dddd992c06dea2d56a1d984a14f..57932dd4e860fffae89445d20c7fd46ad34d3e18 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,14 +27,14 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2012 ImageMagick Studio LLC"
-#define MagickSVNRevision  "7358"
+#define MagickSVNRevision  "7386"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  7,0,0
 #define MagickLibAddendum  "-0"
 #define MagickLibInterface  7
 #define MagickLibMinInterface  7
-#define MagickReleaseDate  "2012-04-05"
+#define MagickReleaseDate  "2012-04-07"
 #define MagickChangeDate   "20110801"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
@@ -58,7 +58,7 @@ extern "C" {
 #define MagickZeroConfigurationFeature  " "
 #endif
 #define MagickFeatures MagickOpenMPFeature MagickOpenCLFeature MagickHDRIFeature MagickZeroConfigurationFeature
-#define MagickHomeURL  "file:///usr/local/share/doc/ImageMagick//index.html"
+#define MagickHomeURL  "file:///usr/local/share/doc/ImageMagick-7.0.0/index.html"
 #if (MAGICKCORE_QUANTUM_DEPTH == 8)
 #define MagickQuantumDepth  "Q8"
 #define MagickQuantumRange  "255"

diff --git a/PerlMagick/Magick.pm b/PerlMagick/Magick.pm
index 4e8aacb3bd8d819d4fde7e51851e82d6bd64cfd7..988732fb2f924e69d00f5f104b0b1ad5f8518708 100644 (file)
--- a/PerlMagick/Magick.pm
+++ b/PerlMagick/Magick.pm
@@ -123,7 +123,7 @@ It was originally developed to be used by CGI scripts for Web pages.
 
 A web page has been set up for this extension. See:
 
-        file:///usr/local/share/doc/ImageMagick//www/perl-magick.html
+        file:///usr/local/share/doc/ImageMagick-7.0.0/www/perl-magick.html
         http://www.imagemagick.org/script/perl-magick.php
 
 If you have problems, go to

diff --git a/config/ImageMagick.rdf b/config/ImageMagick.rdf
index a9288829ffddd8599375799948a74cad46cf3ff5..26e89a6acd3b061a4c28f79d7d14bf41dbdb2728 100644 (file)
--- a/config/ImageMagick.rdf
+++ b/config/ImageMagick.rdf
@@ -5,7 +5,7 @@
     <name>ImageMagick</name>
     <shortdesc xml:lang="en">ImageMagick: convert, edit, and compose images.</shortdesc>
     <homepage rdf:resource="http://www.imagemagick.org/"/>
-    <created>2012-04-05</created>
+    <created>2012-04-07</created>
 
     <description xml:lang="en">
 ImageMagick® is a software suite to create, edit, compose, or convert bitmap images. It can read and write images in a variety of formats (over 100) including DPX, EXR, GIF, JPEG, JPEG-2000, PDF, PhotoCD, PNG, Postscript, SVG, and TIFF. Use ImageMagick to resize, flip, mirror, rotate, distort, shear and transform images, adjust image colors, apply various special effects, or draw text, lines, polygons, ellipses and Bézier curves.
@@ -57,7 +57,7 @@ Examples of ImageMagick Usage shows how to use ImageMagick from the command-line
     <release>
       <Version>
           <name>stable</name>
-          <created>2012-04-05</created>
+          <created>2012-04-07</created>
           <revision>7.0.0</revision>
           <patch-level>-0</patch-level>
       </Version>

diff --git a/config/configure.xml b/config/configure.xml
index f22d190fd3e7bfc5b7ccfb3dcdd076133079fceb..2db24496c7e83e5f0f38d90b4cf83b6e68f7472b 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -10,15 +10,15 @@
   <configure name="VERSION" value="7.0.0"/>
   <configure name="LIB_VERSION" value="0x700"/>
   <configure name="LIB_VERSION_NUMBER" value="7,0,0,0"/>
-  <configure name="SVN_REVISION" value="7358" />
-  <configure name="RELEASE_DATE" value="2012-04-05"/>
+  <configure name="SVN_REVISION" value="7386" />
+  <configure name="RELEASE_DATE" value="2012-04-07"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>
   <configure name="INCLUDE_PATH" value="/usr/local/include/ImageMagick"/>
   <configure name="CONFIGURE_PATH" value="/usr/local/etc/ImageMagick/"/>
   <configure name="SHARE_PATH" value="/usr/local/share/ImageMagick-7.0.0"/>
-  <configure name="DOCUMENTATION_PATH" value="/usr/local/share/doc/ImageMagick/"/>
+  <configure name="DOCUMENTATION_PATH" value="/usr/local/share/doc/ImageMagick-7.0.0"/>
   <configure name="EXECUTABLE_PATH" value="/usr/local/bin"/>
   <configure name="LIBRARY_PATH" value="/usr/local/lib/ImageMagick-7.0.0"/>
   <configure name="CODER_PATH" value="/usr/local/lib/ImageMagick-7.0.0/modules-Q16/coders"/>

diff --git a/configure b/configure
index 98b37ce79b8c7ad69593cc2f1719446ea33a57f4..8eb3ccc18670567d033fbba2492dd10be28177bd 100755 (executable)
--- a/configure
+++ b/configure
@@ -3621,7 +3621,7 @@ MAGICK_LIBRARY_CURRENT_MIN=`expr $MAGICK_LIBRARY_CURRENT - $MAGICK_LIBRARY_AGE`
 
 MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE
 
-MAGICK_SVN_REVISION=7358
+MAGICK_SVN_REVISION=7386
 
 
 
@@ -4247,7 +4247,7 @@ eval "eval LIBEXEC_DIR=$libexecdir"
 
 eval "eval DATA_DIR=$datadir"
 
-eval "eval DOC_DIR=$docdir"
+eval "eval DOC_DIR=$datadir/doc"
 
 eval "eval SYSCONF_DIR=$sysconfdir"
 
@@ -32646,7 +32646,7 @@ _ACEOF
 
 #
 # Path to ImageMagick documentation files
-DOCUMENTATION_RELATIVE_PATH=""
+DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}-${PACKAGE_VERSION}"
 DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}"
 DEFINE_DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}/"
 case "${build_os}" in

diff --git a/configure.ac b/configure.ac
index 691d26c73a891c304abcf423d8ffb1e46cb70983..498142b0dc39bfca9d6e9f9b2c33139a0fcc6b70 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -189,7 +189,7 @@ eval "eval LIBEXEC_DIR=$libexecdir"
 AC_SUBST(LIBEXEC_DIR)
 eval "eval DATA_DIR=$datadir"
 AC_SUBST(DATA_DIR)
-eval "eval DOC_DIR=$docdir"
+eval "eval DOC_DIR=$datadir/doc"
 AC_SUBST(DOC_DIR)
 eval "eval SYSCONF_DIR=$sysconfdir"
 AC_SUBST(SYSCONF_DIR)
@@ -2976,7 +2976,7 @@ AC_SUBST(FILTER_PATH)
 
 #
 # Path to ImageMagick documentation files
-DOCUMENTATION_RELATIVE_PATH=""
+DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}-${PACKAGE_VERSION}"
 DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}"
 DEFINE_DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}/"
 case "${build_os}" in

diff --git a/utilities/ImageMagick.1 b/utilities/ImageMagick.1
index e2ebf193faaacd03e05f94823c08eb59b8ae2ebb..0c9ba7320271313f3e18a236d04299d6f3364a18 100644 (file)
--- a/utilities/ImageMagick.1
+++ b/utilities/ImageMagick.1
@@ -86,9 +86,9 @@ saves any visible window on an X server and outputs it as an image file. You can
 
 interprets and executes scripts written in the Magick Scripting Language (MSL).
 .PP
-For more information about the ImageMagick, point your browser to file:///usr/local/share/doc/ImageMagick//index.html or http://www.imagemagick.org/.
+For more information about the ImageMagick, point your browser to file:///usr/local/share/doc/ImageMagick-7.0.0/index.html or http://www.imagemagick.org/.
 .SH SEE ALSO
 convert(1), identify(1), composite(1), montage(1), compare(1), display(1), animate(1), import(1), conjure(1), quantize(5), miff(4)
 
 .SH COPYRIGHT
-\fBCopyright (C) 1999-2012 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick//www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2012 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7.0.0/www/license.html or http://www.imagemagick.org/script/license.php\fP

diff --git a/utilities/animate.1 b/utilities/animate.1
index 8a35998f8e519fe00d2157ab46c61b3e029bcdd5..9e93dac3d9dbd05a38c7f96681f8a90d1ae76648 100644 (file)
--- a/utilities/animate.1
+++ b/utilities/animate.1
@@ -7,7 +7,7 @@ animate \- animates an image or image sequence on any X server.
 .SH OVERVIEW
 The \fBanimate\fP program is a member of the ImageMagick(1) suite of tools.  Use it to animate an image or image sequence on any X server.
 
-For more information about the animate command, point your browser to file:///usr/local/share/doc/ImageMagick//www/animate.html or http://www.imagemagick.org/script/animate.php.
+For more information about the animate command, point your browser to file:///usr/local/share/doc/ImageMagick-7.0.0/www/animate.html or http://www.imagemagick.org/script/animate.php.
 .SH DESCRIPTION
 Image Settings:
   \-authenticate value  decrypt image with this password
@@ -93,4 +93,4 @@ ImageMagick(1)
 
 .SH COPYRIGHT
 
-\fBCopyright (C) 1999-2012 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick//www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2012 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7.0.0/www/license.html or http://www.imagemagick.org/script/license.php\fP

diff --git a/utilities/compare.1 b/utilities/compare.1
index a656e1a4170880e2a24aac4a6aa0e1555f99eea8..e934397b95d52763b1f82b5381707d6a2f28b99a 100644 (file)
--- a/utilities/compare.1
+++ b/utilities/compare.1
@@ -7,7 +7,7 @@ compare \- mathematically and visually annotate the difference between an image
 .SH OVERVIEW
 The \fBcompare\fP program is a member of the ImageMagick(1) suite of tools.  Use it to mathematically and visually annotate the difference between an image and its reconstruction.
 
-For more information about the compare command, point your browser to file:///usr/local/share/doc/ImageMagick//www/compare.html or http://www.imagemagick.org/script/compare.php.
+For more information about the compare command, point your browser to file:///usr/local/share/doc/ImageMagick-7.0.0/www/compare.html or http://www.imagemagick.org/script/compare.php.
 .SH DESCRIPTION
 Image Settings:
   \-authenticate value  decrypt image with this password
@@ -66,4 +66,4 @@ ImageMagick(1)
 
 .SH COPYRIGHT
 
-\fBCopyright (C) 1999-2012 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick//www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2012 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7.0.0/www/license.html or http://www.imagemagick.org/script/license.php\fP

diff --git a/utilities/composite.1 b/utilities/composite.1
index 2d81ae49bf58ffaefb230610f95f3b35b9e0f331..2071375bc9b1e0ef85f433f9f0859cf22ee189d0 100644 (file)
--- a/utilities/composite.1
+++ b/utilities/composite.1
@@ -7,7 +7,7 @@ composite \-  overlaps one image over another.
 .SH OVERVIEW
 The \fBcomposite\fP program is a member of the ImageMagick(1) suite of tools.  Use it to overlap one image over another.
 
-For more information about the composite command, point your browser to file:///usr/local/share/doc/ImageMagick//www/composite.html or http://www.imagemagick.org/script/composite.php.
+For more information about the composite command, point your browser to file:///usr/local/share/doc/ImageMagick-7.0.0/www/composite.html or http://www.imagemagick.org/script/composite.php.
 .SH DESCRIPTION
 Image Settings:
   \-affine matrix       affine transform matrix
@@ -103,4 +103,4 @@ ImageMagick(1)
 
 .SH COPYRIGHT
 
-\fBCopyright (C) 1999-2012 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick//www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2012 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7.0.0/www/license.html or http://www.imagemagick.org/script/license.php\fP

diff --git a/utilities/conjure.1 b/utilities/conjure.1
index 06fd4a18b1b6723d6e788cb7aef44e67b59bbbaf..2c2b970e4d64947711ff290d71ce19d41d7943cc 100644 (file)
--- a/utilities/conjure.1
+++ b/utilities/conjure.1
@@ -7,7 +7,7 @@ conjure \- interprets and executes scripts written in the Magick Scripting Langu
 .SH OVERVIEW
 The \fBconjure\fP program is a member of the ImageMagick(1) suite of tools.  Use it to process a Magick Scripting Language (MSL) script. The Magick scripting language (MSL) will primarily benefit those that want to accomplish custom image processing tasks but do not wish to program, or those that do not have access to a Perl interpreter or a compiler.
 
-For more information about the conjure command, point your browser to file:///usr/local/share/doc/ImageMagick//www/conjure.html or http://www.imagemagick.org/script/conjure.php.
+For more information about the conjure command, point your browser to file:///usr/local/share/doc/ImageMagick-7.0.0/www/conjure.html or http://www.imagemagick.org/script/conjure.php.
 .SH DESCRIPTION
 Image Settings:
   \-monitor             monitor progress
@@ -31,4 +31,4 @@ ImageMagick(1)
 
 .SH COPYRIGHT
 
-\fBCopyright (C) 1999-2012 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick//www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2012 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7.0.0/www/license.html or http://www.imagemagick.org/script/license.php\fP

diff --git a/utilities/convert.1 b/utilities/convert.1
index efc2541f20bff3b43d200abae05ce3254a10ecea..b4c59309239bf948d2ed86d4e5262fb661d346a5 100644 (file)
--- a/utilities/convert.1
+++ b/utilities/convert.1
@@ -7,7 +7,7 @@ convert \- convert between image formats as well as resize an image, blur, crop,
 .SH OVERVIEW
 The \fBconvert\fP program is a member of the ImageMagick(1) suite of tools.  Use it to convert between image formats as well as resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more.  
 
-For more information about the convert command, point your browser to file:///usr/local/share/doc/ImageMagick//www/convert.html or http://www.imagemagick.org/script/convert.php.
+For more information about the convert command, point your browser to file:///usr/local/share/doc/ImageMagick-7.0.0/www/convert.html or http://www.imagemagick.org/script/convert.php.
 .SH DESCRIPTION
 Image Settings:
   \-adjoin              join images into a single multi-image file
@@ -277,4 +277,4 @@ By default, the image format of `file' is determined by its magic number.  To sp
 ImageMagick(1)
 
 .SH COPYRIGHT
-\fBCopyright (C) 1999-2012 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick//www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2012 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7.0.0/www/license.html or http://www.imagemagick.org/script/license.php\fP

diff --git a/utilities/display.1 b/utilities/display.1
index 66e1c68f70fd766e5f75960ef925972ea08d3d41..6834472454968ae39c6d23b0067b640546238c47 100644 (file)
--- a/utilities/display.1
+++ b/utilities/display.1
@@ -7,7 +7,7 @@ display \- displays an image or image sequence on any X server.
 .SH OVERVIEW
 The \fBdisplay\fP program is a member of the ImageMagick(1) suite of tools.  Use it to display an image or image sequence on any X server.
 
-For more information about the display command, point your browser to file:///usr/local/share/doc/ImageMagick//www/display.html or http://www.imagemagick.org/script/display.php.
+For more information about the display command, point your browser to file:///usr/local/share/doc/ImageMagick-7.0.0/www/display.html or http://www.imagemagick.org/script/display.php.
 .SH DESCRIPTION
 Image Settings:
   \-antialias           remove pixel-aliasing
@@ -125,4 +125,4 @@ ImageMagick(1)
 
 .SH COPYRIGHT
 
-\fBCopyright (C) 1999-2012 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick//www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2012 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7.0.0/www/license.html or http://www.imagemagick.org/script/license.php\fP

diff --git a/utilities/identify.1 b/utilities/identify.1
index f86339f5c3467c1a1fd19449354be3f9ad7c0527..7645c9a79807e13c7359872a4dbb85246b216471 100644 (file)
--- a/utilities/identify.1
+++ b/utilities/identify.1
@@ -7,7 +7,7 @@ identify \- describes the format and characteristics of one or more image files.
 .SH OVERVIEW
 The \fBidentify\fP program is a member of the ImageMagick(1) suite of tools.  It describes the format and characteristics of one or more image files. It also reports if an image is incomplete or corrupt. The information returned includes the image number, the file name, the width and height of the image, whether the image is colormapped or not, the number of colors in the image (by default off use \fI-define unique=true\fP option), the number of bytes in the image, the format of the image (JPEG, PNM, etc.), and finally the number of seconds it took to read and process the image. Many more attributes are available with the verbose option.
 
-For more information about the identify command, point your browser to file:///usr/local/share/doc/ImageMagick//www/identify.html or http://www.imagemagick.org/script/identify.php.
+For more information about the identify command, point your browser to file:///usr/local/share/doc/ImageMagick-7.0.0/www/identify.html or http://www.imagemagick.org/script/identify.php.
 .SH DESCRIPTION
 Image Settings:
   \-antialias           remove pixel-aliasing
@@ -61,4 +61,4 @@ ImageMagick(1)
 
 .SH COPYRIGHT
 
-\fBCopyright (C) 1999-2012 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick//www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2012 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7.0.0/www/license.html or http://www.imagemagick.org/script/license.php\fP

diff --git a/utilities/import.1 b/utilities/import.1
index 746c1862337b05582ad5c0a63b01e520cf0f70d3..fa63286d664bc5aa2afd089320f0b9824195720f 100644 (file)
--- a/utilities/import.1
+++ b/utilities/import.1
@@ -7,7 +7,7 @@ import \- saves any visible window on an X server and outputs it as an image fil
 .SH OVERVIEW
 The \fBimport\fP program is a member of the ImageMagick(1) suite of tools.  Use it to capture some or all of an X server screen and save the image to a file.
 
-For more information about the import command, point your browser to file:///usr/local/share/doc/ImageMagick//www/import.html or http://www.imagemagick.org/script/import.php.
+For more information about the import command, point your browser to file:///usr/local/share/doc/ImageMagick-7.0.0/www/import.html or http://www.imagemagick.org/script/import.php.
 .SH DESCRIPTION
 Image Settings:
   \-adjoin              join images into a single multi-image file
@@ -94,4 +94,4 @@ ImageMagick(1)
 
 .SH COPYRIGHT
 
-\fBCopyright (C) 1999-2012 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick//www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2012 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7.0.0/www/license.html or http://www.imagemagick.org/script/license.php\fP

diff --git a/utilities/mogrify.1 b/utilities/mogrify.1
index c20c2160042a80653dcf26e882b0e4eca388bae5..eccf6e6a78517d0c826109c237db275d8009373e 100644 (file)
--- a/utilities/mogrify.1
+++ b/utilities/mogrify.1
@@ -7,7 +7,7 @@ mogrify \- resize an image, blur, crop, despeckle, dither, draw on, flip, join,
 .SH OVERVIEW
 The \fBmogrify\fP program is a member of the ImageMagick(1) suite of tools.  Use it to resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more. This tool is similar to convert(1) except the original image file is overwritten with any changes you request.
 
-For more information about the mogrify command, point your browser to file:///usr/local/share/doc/ImageMagick//www/mogrify.html or http://www.imagemagick.org/script/mogrify.php.
+For more information about the mogrify command, point your browser to file:///usr/local/share/doc/ImageMagick-7.0.0/www/mogrify.html or http://www.imagemagick.org/script/mogrify.php.
 .SH DESCRIPTION
 Image Settings:
   \-adjoin              join images into a single multi-image file
@@ -276,4 +276,4 @@ ImageMagick(1)
 
 .SH COPYRIGHT
 
-\fBCopyright (C) 1999-2012 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick//www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2012 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7.0.0/www/license.html or http://www.imagemagick.org/script/license.php\fP

diff --git a/utilities/montage.1 b/utilities/montage.1
index 5ca5408c04a8dfd1bf9bf6491c086cade7fb02da..b45196c653ffbb0bef8ad155c9206c8628d56029 100644 (file)
--- a/utilities/montage.1
+++ b/utilities/montage.1
@@ -7,7 +7,7 @@ montage \- create a composite image by combining several separate images. The im
 .SH OVERVIEW
 The \fBmontage\fP program is a member of the ImageMagick(1) suite of tools.  Use it to create a composite image by combining several separate images. The images are tiled on the composite image optionally adorned with a border, frame, image name, and more.
 
-For more information about the montage command, point your browser to file:///usr/local/share/doc/ImageMagick//www/montage.html or http://www.imagemagick.org/script/montage.php.
+For more information about the montage command, point your browser to file:///usr/local/share/doc/ImageMagick-7.0.0/www/montage.html or http://www.imagemagick.org/script/montage.php.
 .SH DESCRIPTION
 Image Settings:
   \-adjoin              join images into a single multi-image file
@@ -131,4 +131,4 @@ ImageMagick(1)
 
 .SH COPYRIGHT
 
-\fBCopyright (C) 1999-2012 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick//www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2012 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7.0.0/www/license.html or http://www.imagemagick.org/script/license.php\fP

diff --git a/utilities/stream.1 b/utilities/stream.1
index 17a95fd4608146db59efb13f06b4ab2022f1d407..694afe97461af32691035d29df94a9657a62ebf0 100644 (file)
--- a/utilities/stream.1
+++ b/utilities/stream.1
@@ -7,7 +7,7 @@ stream \- a lightweight tool to stream one or more pixel components of the image
 .SH OVERVIEW
 \fBStream\fP is a lightweight tool to stream one or more pixel components of the image or portion of the image to your choice of storage formats.  It writes the pixel components as they are read from the input image a row at a time making \fBstream\fP desirable when working with large images or when you require raw pixel components.
 
-For more information about the stream command, point your browser to file:///usr/local/share/doc/ImageMagick//www/stream.html or http://www.imagemagick.org/script/stream.php.
+For more information about the stream command, point your browser to file:///usr/local/share/doc/ImageMagick-7.0.0/www/stream.html or http://www.imagemagick.org/script/stream.php.
 .SH DESCRIPTION
 Image Settings:
   \-authenticate value  decrypt image with this password
@@ -54,4 +54,4 @@ ImageMagick(1)
 
 .SH COPYRIGHT
 
-\fBCopyright (C) 1999-2012 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick//www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2012 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7.0.0/www/license.html or http://www.imagemagick.org/script/license.php\fP