Update documentation

diff --git a/www/ImageMagickObject.html b/www/ImageMagickObject.html
index 5dd943a686ab8e0bd39d481cf7d1856ecbeca037..843f5e8cbbd1d7cfaf7500d4abfc2d77216920ca 100644 (file)
--- a/www/ImageMagickObject.html
+++ b/www/ImageMagickObject.html
@@ -130,4 +130,4 @@ regsvr32 /u /s ImageMagickObject.dll
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:14 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 15:22 -->
\ No newline at end of file

diff --git a/www/advanced-unix-installation.html b/www/advanced-unix-installation.html
index cd436579fb43ba083d387627a9be7b69d72bca6a..414d563342e495966c8ffb2b852437de1948a0d6 100644 (file)
--- a/www/advanced-unix-installation.html
+++ b/www/advanced-unix-installation.html
@@ -637,4 +637,4 @@ identify -list format
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:14 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 14:33 -->
\ No newline at end of file

diff --git a/www/advanced-windows-installation.html b/www/advanced-windows-installation.html
index cf6f99c8cde8c5980dde6b692986e67bec8dbfeb..0a08f64dc9400dc5515bbc3040d4a97f7d58fa10 100644 (file)
--- a/www/advanced-windows-installation.html
+++ b/www/advanced-windows-installation.html
@@ -401,4 +401,4 @@ _MAGICKMOD_
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:14 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 14:01 -->
\ No newline at end of file

diff --git a/www/animate.html b/www/animate.html
index 700aff9e23327979804b1a9d0da1b49b87041cf6..cc1b0e994f6cbe137b963e06b3a3405d6bc93b0e 100644 (file)
--- a/www/animate.html
+++ b/www/animate.html
@@ -532,4 +532,4 @@ transparent, extract, background, or shape the alpha channel</td>
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:14 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 14:13 -->
\ No newline at end of file

diff --git a/www/api.html b/www/api.html
index 6e5bd770ea166386e017369ad76315c2567e25ac..471e756ca1d7d27a3c98a1497fd2a54cf327426b 100644 (file)
--- a/www/api.html
+++ b/www/api.html
@@ -137,6 +137,7 @@
 <dd><a href="http://wand-py.org/">Wand</a> is a ctypes-based ImagedMagick binding library for Python.</dd>
 <dd><a href="https://www.imagemagick.org/download/python/">PythonMagick</a> is an object-oriented Python interface to ImageMagick.</dd>
 <dd><a href="http://www.assembla.com/wiki/show/pythonmagickwand">PythonMagickWand</a> is an object-oriented Python interface to MagickWand based on ctypes.</dd>
+<dd><a href="http://siptoolbox.sourceforge.net/">Scilab Image Processing</a> toolbox utilizes ImageMagick to do imaging tasks such as filtering, blurring, edge detection, thresholding, histogram manipulation, segmentation, mathematical morphology, color image processing, etc..</dd>
 
   <dt><a id="realbasic"></a>REALbasic</dt>
 
@@ -184,4 +185,4 @@
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:13 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 13:55 -->
\ No newline at end of file

diff --git a/www/architecture.html b/www/architecture.html
index 739fbe96b8c0380adc2c27693dc01aec601fdbd7..2ae4a991d74de321e877b0a3f28e476cc3ea5fc6 100644 (file)
--- a/www/architecture.html
+++ b/www/architecture.html
@@ -1423,4 +1423,4 @@ ModuleExport size_t analyzeImage(Image **images,const int argc,const char **argv
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:14 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 14:12 -->
\ No newline at end of file

diff --git a/www/binary-releases.html b/www/binary-releases.html
index 2060ae58f8a48dc30afd8df388f161f31565c26c..3203afc7ce7e0746726f6feca1fc057e19c0d576 100644 (file)
--- a/www/binary-releases.html
+++ b/www/binary-releases.html
@@ -83,9 +83,9 @@
   </tr>
 
   <tr>
-      <td>ImageMagick-libs7.0.3-8.x86_64.rpm</td>
-      <td><a href= "https://www.imagemagick.org/download/linux/CentOS/x86_64/ImageMagick-libs7.0.3-8.x86_64.rpm">download</a></td>
-    <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/linux/CentOS/x86_64/ImageMagick-libs7.0.3-8.x86_64.rpm">download</a></td>
+      <td>ImageMagick-libs-7.0.3-8.x86_64.rpm</td>
+      <td><a href= "https://www.imagemagick.org/download/linux/CentOS/x86_64/ImageMagick-libs-7.0.3-8.x86_64.rpm">download</a></td>
+    <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/linux/CentOS/x86_64/ImageMagick-libs-7.0.3-8.x86_64.rpm">download</a></td>
     <td>Redhat / CentOS 7.1 x86_64 RPM</td>
   </tr>
 
@@ -123,7 +123,7 @@
 <p>ImageMagick RPM's are self-installing.  Simply type the following command and you're ready to start using ImageMagick:</p>
 
 <pre><span class="crtprompt"> </span><span class='crtin'>rpm -Uvh ImageMagick-7.0.3-8.x86_64.rpm</span></pre><p>You'll need the libraries as well:</p>
-<pre><span class="crtprompt"> </span><span class='crtin'>rpm -Uvh ImageMagick-libs7.0.3-8.x86_64.rpm</span></pre>
+<pre><span class="crtprompt"> </span><span class='crtin'>rpm -Uvh ImageMagick-libs-7.0.3-8.x86_64.rpm</span></pre>
 <p>For other systems, create (or choose) a directory to install the package into and change to that directory, for example:</p>
 
 <pre>
@@ -464,4 +464,4 @@ objShell.Exec("magick ""e:/myimages/image.png"" ""e:/myimages/image.jpg""")
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:13 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 13:54 -->
\ No newline at end of file

diff --git a/www/changelog.html b/www/changelog.html
index 68b277c53f09b8f620adcac0cf4847058c28f2fd..30b72e7e6852b349906bc623800a27e15bec6c10 100644 (file)
--- a/www/changelog.html
+++ b/www/changelog.html
@@ -269,4 +269,4 @@
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:13 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 13:54 -->
\ No newline at end of file

diff --git a/www/cipher.html b/www/cipher.html
index e90c978c8a60f22fef0fc8796a67f2112fb01182..056a58f627a95bc150d58ae5cc4d98ab525c8aac 100644 (file)
--- a/www/cipher.html
+++ b/www/cipher.html
@@ -140,4 +140,4 @@ Examples <a href="https://www.imagemagick.org/Usage/transform/#encipher"
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:14 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 13:56 -->
\ No newline at end of file

diff --git a/www/color-management.html b/www/color-management.html
index bde41b4b896996379a9ccae80d29edb14d873cfe..192b6483e4802387013a71232f384e16b9b52d55 100644 (file)
--- a/www/color-management.html
+++ b/www/color-management.html
@@ -150,4 +150,4 @@ convert myimage_channels_*.png -set colorspace HSL -combine -colorspace RGB -set
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:13 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 14:03 -->
\ No newline at end of file

diff --git a/www/color.html b/www/color.html
index 41827e95913bc9835cb770426ee8477acceacdea..171d15c163cba5008141b1cb059e91c7058ca5c7 100644 (file)
--- a/www/color.html
+++ b/www/color.html
@@ -4951,4 +4951,4 @@ device-cmyk(0.11, 0.48, 0.83, 0.00)
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:14 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 13:57 -->
\ No newline at end of file

diff --git a/www/command-line-options.html b/www/command-line-options.html
index f81a34a99a779c5236d6452810733c6125ce1e1e..5a58849c3a2ac37dd9fdde377c7113b507bd14d1 100644 (file)
--- a/www/command-line-options.html
+++ b/www/command-line-options.html
@@ -25,7 +25,7 @@
   <meta name="distribution" content="Global"/>
   <meta name="magick-serial" content="P131-S030410-R485315270133-P82224-A6668-G1245-1"/>
   <meta name="google-site-verification" content="_bMOCDpkx9ZAzBwb2kF3PRHbfUUdFj2uO8Jd1AXArz4" />
-  <link rel="canonical" href="https://www.imagemagick.org/script/command-line-options.html"/>
+  <link rel="canonical" href="command-line-options.html?"/>
   <link rel="icon" href="../images/wand.png"/>
   <link rel="shortcut icon" href="../images/wand.ico"/>
   <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Roboto:900,400,400italic,700,700italic,300,300italic|Open+Sans:300italic,400italic,700italic,300,400,600,700" />
@@ -8034,4 +8034,4 @@ but with strict boolean masking. </p>
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:13 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 13:54 -->
\ No newline at end of file

diff --git a/www/command-line-processing.html b/www/command-line-processing.html
index a76381b505dc8860081fb3a44cd29dc1d9338790..aa8742014e989773e500240e512b83cfece9ade3 100644 (file)
--- a/www/command-line-processing.html
+++ b/www/command-line-processing.html
@@ -685,4 +685,4 @@ convert -define stream:buffer-size=0 logo: gif:- | display gif:-
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:12 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 13:55 -->
\ No newline at end of file

diff --git a/www/command-line-tools.html b/www/command-line-tools.html
index a3b006e9540fa6e06e5aee64dba5b73246ccec3e..6bcbeb89a5410d727c7d0c9c53114ab421135aa8 100644 (file)
--- a/www/command-line-tools.html
+++ b/www/command-line-tools.html
@@ -100,4 +100,4 @@
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:12 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 13:55 -->
\ No newline at end of file

diff --git a/www/compare.html b/www/compare.html
index 6e365dee52becfb504b5dd0365108a130dd00558..059c8382938275df166877deacb50a90c4ecc25e 100644 (file)
--- a/www/compare.html
+++ b/www/compare.html
@@ -238,6 +238,11 @@ transparent, extract, background, or shape the alpha channel</td>
     <td>measure differences between images with this metric</td>
   </tr>
 
+  <tr>
+    <td><a href="command-line-options.html#negate">-negate</a></td>
+    <td>replace each pixel with its complementary color </td>
+  </tr>
+
   <tr>
     <td><a href="command-line-options.html#profile">-profile <var>filename</var></a></td>
     <td>add, delete, or apply an image profile</td>
@@ -355,4 +360,4 @@ transparent, extract, background, or shape the alpha channel</td>
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:13 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 14:08 -->
\ No newline at end of file

diff --git a/www/compose.html b/www/compose.html
index a49e8d1458c5bbb7cc73eed373a679a5314a82c4..daa0760131c1f58fcd7887c59894fa7f1cdce61c 100644 (file)
--- a/www/compose.html
+++ b/www/compose.html
@@ -644,4 +644,4 @@ href="https://www.imagemagick.org/script/command-line-options.html#list">-list c
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:14 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 13:58 -->
\ No newline at end of file

diff --git a/www/composite.html b/www/composite.html
index 4b5ef5cfc69ce6409b1040b48a8279729ebb82a0..67704130f6537174427ca9ca89d491cac84b224c 100644 (file)
--- a/www/composite.html
+++ b/www/composite.html
@@ -526,4 +526,4 @@ transparent, extract, background, or shape the alpha channel</td>
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:14 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 13:55 -->
\ No newline at end of file

diff --git a/www/conjure.html b/www/conjure.html
index 2516e5992005fa8314a3638054dc33b80a513a5b..4cc5e815d1cb3f4946412107a0c257e19dd7fc4e 100644 (file)
--- a/www/conjure.html
+++ b/www/conjure.html
@@ -1138,4 +1138,4 @@ fill="color name", channel="All, Default, Alpha, Black, Blue, CMYK, Cyan, Gray,
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:14 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 15:14 -->
\ No newline at end of file

diff --git a/www/connected-components.html b/www/connected-components.html
index f1e784fa569ce3bdf16aed08f74a4364e0a03ecf..47d216731190aa48ca62ad5f44af6873c3b348f2 100644 (file)
--- a/www/connected-components.html
+++ b/www/connected-components.html
@@ -25,7 +25,7 @@
   <meta name="distribution" content="Global"/>
   <meta name="magick-serial" content="P131-S030410-R485315270133-P82224-A6668-G1245-1"/>
   <meta name="google-site-verification" content="_bMOCDpkx9ZAzBwb2kF3PRHbfUUdFj2uO8Jd1AXArz4" />
-  <link rel="canonical" href="https://www.imagemagick.org/script/connected-components.html"/>
+  <link rel="canonical" href="https://www.imagemagick.org/script/../www/connected-components.html"/>
   <link rel="icon" href="../images/wand.png"/>
   <link rel="shortcut icon" href="../images/wand.ico"/>
   <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Roboto:900,400,400italic,700,700italic,300,300italic|Open+Sans:300italic,400italic,700italic,300,400,600,700" />
@@ -121,4 +121,4 @@ Objects (id: bounding-box centroid area mean-color):
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:14 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 14:43 -->
\ No newline at end of file

diff --git a/www/convert.html b/www/convert.html
index ce0d9640ca02e507adf1ac31c59640a8973a6aa4..f0ba204a4d7abd30d70e2af6651ba96b512763f2 100644 (file)
--- a/www/convert.html
+++ b/www/convert.html
@@ -1322,4 +1322,4 @@ transparent, extract, background, or shape the alpha channel</td>
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:13 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 13:55 -->
\ No newline at end of file

diff --git a/www/display.html b/www/display.html
index 2ee81dc5f4ca800b49c03130dfb8ca2158db63c8..a050a1b8af33bc4e40f39696b62e7bcfdb8f2ebf 100644 (file)
--- a/www/display.html
+++ b/www/display.html
@@ -569,4 +569,4 @@ transparent, extract, background, or shape the alpha channel</td>
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:14 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 14:03 -->
\ No newline at end of file

diff --git a/www/distribute-pixel-cache.html b/www/distribute-pixel-cache.html
index 8046168595c01041a995dea8f7d349e08bebe282..4ad8c7b3c2c8eb354fa05413212356535c14f7cd 100644 (file)
--- a/www/distribute-pixel-cache.html
+++ b/www/distribute-pixel-cache.html
@@ -25,7 +25,7 @@
   <meta name="distribution" content="Global"/>
   <meta name="magick-serial" content="P131-S030410-R485315270133-P82224-A6668-G1245-1"/>
   <meta name="google-site-verification" content="_bMOCDpkx9ZAzBwb2kF3PRHbfUUdFj2uO8Jd1AXArz4" />
-  <link rel="canonical" href="https://www.imagemagick.org/script/distribute-pixel-cache.html"/>
+  <link rel="canonical" href="https://www.imagemagick.org/script/../www/distribute-pixel-cache.html"/>
   <link rel="icon" href="../images/wand.png"/>
   <link rel="shortcut icon" href="../images/wand.ico"/>
   <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Roboto:900,400,400italic,700,700italic,300,300italic|Open+Sans:300italic,400italic,700italic,300,400,600,700" />
@@ -89,4 +89,4 @@ convert -limit memory 1GiB -limit map 2GiB -limit disk 4GiB \
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:14 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 14:43 -->
\ No newline at end of file

diff --git a/www/download.html b/www/download.html
index fdba9c1ee8c6ccff4f5c4a0f7108c588cda63bde..dac0444edc8806f80c899ef6f2f90c3f2058852c 100644 (file)
--- a/www/download.html
+++ b/www/download.html
@@ -115,4 +115,4 @@
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:14 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 14:15 -->
\ No newline at end of file

diff --git a/www/escape.html b/www/escape.html
index 237dec954bf95eb85756abf7eb709f04b3ec0ed4..e3ab20e7236432506f657ad05735da175026cb42 100644 (file)
--- a/www/escape.html
+++ b/www/escape.html
@@ -887,4 +887,4 @@ Post ObjectData Descriptor Record
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:14 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 14:01 -->
\ No newline at end of file

diff --git a/www/examples.html b/www/examples.html
index d79373c039e92c804e2c2908380d915049220365..2d1de4e60fef7f1a90aeb639e47646d75ec23698 100644 (file)
--- a/www/examples.html
+++ b/www/examples.html
@@ -80,4 +80,4 @@
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:13 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 13:55 -->
\ No newline at end of file

diff --git a/www/exception.html b/www/exception.html
index 15d8865b2cc85cd77783aab7b3a660cd8b0e10a7..fa9f5aba0d49bf155315e0d0b9282e4bb1d1a1dc 100644 (file)
--- a/www/exception.html
+++ b/www/exception.html
@@ -269,4 +269,4 @@
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:14 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 13:55 -->
\ No newline at end of file

diff --git a/www/export.html b/www/export.html
index 50bdfe099477a4a94f0bef621553e528c797c92f..112a171a8b174616dedb6d491630d690decca4c4 100644 (file)
--- a/www/export.html
+++ b/www/export.html
@@ -80,4 +80,4 @@
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:14 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 14:08 -->
\ No newline at end of file

diff --git a/www/formats.html b/www/formats.html
index 5060bfe2aa74cb4223c58e0fa9f2571a2fd2fdd0..78bd7a9f8432efa38fffd7f9fa70982bf88ecfba 100644 (file)
--- a/www/formats.html
+++ b/www/formats.html
@@ -1932,4 +1932,4 @@ convert \( -size 15x15 canvas:black canvas:white -append \) \
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:12 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 14:00 -->
\ No newline at end of file

diff --git a/www/fx.html b/www/fx.html
index 50409456026e5b5e60bfb60c469da84347366620..3fd2a61cc5f9dde16938d805f3aa38906a05a315 100644 (file)
--- a/www/fx.html
+++ b/www/fx.html
@@ -25,7 +25,7 @@
   <meta name="distribution" content="Global"/>
   <meta name="magick-serial" content="P131-S030410-R485315270133-P82224-A6668-G1245-1"/>
   <meta name="google-site-verification" content="_bMOCDpkx9ZAzBwb2kF3PRHbfUUdFj2uO8Jd1AXArz4" />
-  <link rel="canonical" href="https://www.imagemagick.org/script/fx.html"/>
+  <link rel="canonical" href="https://www.imagemagick.org/script/../www/fx.html"/>
   <link rel="icon" href="../images/wand.png"/>
   <link rel="shortcut icon" href="../images/wand.ico"/>
   <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Roboto:900,400,400italic,700,700italic,300,300italic|Open+Sans:300italic,400italic,700italic,300,400,600,700" />
@@ -420,4 +420,4 @@ convert rose: -duplicate 29 -virtual-pixel Gray -distort SRT '%[fx:360.0*t/n]' \
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:14 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 14:43 -->
\ No newline at end of file

diff --git a/www/gradient.html b/www/gradient.html
index 105566e0825ab036afbbd4ed5705b10f0002c6df..2a68b5a78490126fb899f4c3f7ec947abaae7cd0 100644 (file)
--- a/www/gradient.html
+++ b/www/gradient.html
@@ -241,4 +241,4 @@ convert -size 256x256 -define gradient:radii=128,64 -define gradient:angle=45 ra
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:14 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 14:02 -->
\ No newline at end of file

diff --git a/www/high-dynamic-range.html b/www/high-dynamic-range.html
index 26ed7c652146fa9cdf5e1319df31bf8e81e01a8e..5211088f150d5f172052eb522ba28d74de546c09 100644 (file)
--- a/www/high-dynamic-range.html
+++ b/www/high-dynamic-range.html
@@ -107,4 +107,4 @@ Features: HDRI
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:13 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 14:10 -->
\ No newline at end of file

diff --git a/www/history.html b/www/history.html
index 7ccf6cab50d8b534341e732694c7f6afe3ca904a..cee123f109b65bb160b27fad68f9a5ab37db3c72 100644 (file)
--- a/www/history.html
+++ b/www/history.html
@@ -97,4 +97,4 @@ I swear by my life and my love of it that I will never live for the sake of anot
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:14 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 18:34 -->
\ No newline at end of file

diff --git a/www/identify.html b/www/identify.html
index f35525f186b30d855b02a7dd00164b12a43feed4..e4da27dc9d40c857de3924cd2a258fd1082a99d5 100644 (file)
--- a/www/identify.html
+++ b/www/identify.html
@@ -433,4 +433,4 @@ transparent, extract, background, or shape the alpha channel</td>
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:14 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 14:02 -->
\ No newline at end of file

diff --git a/www/import.html b/www/import.html
index ccf189db882d88fa694f0aa1bc61aba5b074c441..e87f1667f8baa5784f9e01a4faf6474cb057df9e 100644 (file)
--- a/www/import.html
+++ b/www/import.html
@@ -427,4 +427,4 @@ import -window root screen.ps
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:14 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 14:58 -->
\ No newline at end of file

diff --git a/www/index.html b/www/index.html
index 972c7a02bce820a531f54cbb1b4ba8cb6649955f..bf0dd4aa9f78122a7c11df2f590adef1d9ebb56d 100644 (file)
--- a/www/index.html
+++ b/www/index.html
@@ -239,4 +239,4 @@ Use ImageMagick<sup><a href="http://tarr.uspto.gov/servlet/tarr?regser=serial&am
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:12 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 13:54 -->
\ No newline at end of file

diff --git a/www/install-source.html b/www/install-source.html
index a4f2dc06599b8032ebf3c861db82bc0c06245d24..67d2248e6968cfbb444ad82346e20a8e5e36a959 100644 (file)
--- a/www/install-source.html
+++ b/www/install-source.html
@@ -25,7 +25,7 @@
   <meta name="distribution" content="Global"/>
   <meta name="magick-serial" content="P131-S030410-R485315270133-P82224-A6668-G1245-1"/>
   <meta name="google-site-verification" content="_bMOCDpkx9ZAzBwb2kF3PRHbfUUdFj2uO8Jd1AXArz4" />
-  <link rel="canonical" href="https://www.imagemagick.org/script/install-source.html"/>
+  <link rel="canonical" href="install-source.html?imagemagick=43kpg22qdj2craeks4qnbcnj11#windows"/>
   <link rel="icon" href="../images/wand.png"/>
   <link rel="shortcut icon" href="../images/wand.ico"/>
   <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Roboto:900,400,400italic,700,700italic,300,300italic|Open+Sans:300italic,400italic,700italic,300,400,600,700" />
@@ -162,4 +162,4 @@ validate
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:13 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 14:04 -->
\ No newline at end of file

diff --git a/www/jp2.html b/www/jp2.html
index 733428628ebc33623973f3c0bd3ec406e7f66975..4085ded5fa4bdeb77594a4fc13a8f5456958dec7 100644 (file)
--- a/www/jp2.html
+++ b/www/jp2.html
@@ -164,4 +164,4 @@ convert wizard.png -resize 4096x2160! -depth 12 wizard.jp2
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:14 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 14:28 -->
\ No newline at end of file

diff --git a/www/license.html b/www/license.html
index 084e8473a3083429b97bd8fe22bf87b7fd2aef3d..d6e2e9a041a98e53f1641057c799c1826d7d60cd 100644 (file)
--- a/www/license.html
+++ b/www/license.html
@@ -203,4 +203,4 @@
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:14 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 14:20 -->
\ No newline at end of file

diff --git a/www/links.html b/www/links.html
index 0be12cfe07c196e553160f871f287bce010688de..02d95b0d969c5c4d153af73d00df713b538fd2c8 100644 (file)
--- a/www/links.html
+++ b/www/links.html
@@ -163,4 +163,4 @@
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:14 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 13:59 -->
\ No newline at end of file

diff --git a/www/magick++.html b/www/magick++.html
index 6213049c0fa908984dd7d3336803e38aee5647da..d8366b7b8cefc516fa6bd17476d725b447f36d29 100644 (file)
--- a/www/magick++.html
+++ b/www/magick++.html
@@ -187,4 +187,4 @@ int main(int argc,char **argv)
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:14 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 14:22 -->
\ No newline at end of file

diff --git a/www/magick-core.html b/www/magick-core.html
index 3d36de6a53f77e34ae90a98e4e536a92ae03df0b..046ecc839f41414623a275ff4169dcaaedca8ece 100644 (file)
--- a/www/magick-core.html
+++ b/www/magick-core.html
@@ -337,4 +337,4 @@ int main(int argc,char **argv)
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:14 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 13:55 -->
\ No newline at end of file

diff --git a/www/magick-script.html b/www/magick-script.html
index bbe55f087502f6a415d03b48875bdc6c7a7c0a3c..ad2f12bc629c846ffffcfe51d0ecc787fd366392 100644 (file)
--- a/www/magick-script.html
+++ b/www/magick-script.html
@@ -1282,4 +1282,4 @@ transparent, extract, background, or shape the alpha channel</td>
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:14 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 15:59 -->
\ No newline at end of file

diff --git a/www/magick-vector-graphics.html b/www/magick-vector-graphics.html
index 15c7d645f25c2afb5fb9faf911295fc1f43c8d2b..0d32f0f70dac3a1376142c4230c1376f0fdf0f98 100644 (file)
--- a/www/magick-vector-graphics.html
+++ b/www/magick-vector-graphics.html
@@ -881,4 +881,4 @@ round</pre></td>
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:14 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 14:26 -->
\ No newline at end of file

diff --git a/www/magick-wand.html b/www/magick-wand.html
index ced4ede36b7bea18789f961eef2fd6a3e8455bcc..d93bb133dc4d42c52b7f8c6f790cb463c2e978ea 100644 (file)
--- a/www/magick-wand.html
+++ b/www/magick-wand.html
@@ -383,4 +383,4 @@ int main(int argc,char **argv)
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:14 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 13:59 -->
\ No newline at end of file

diff --git a/www/magick.html b/www/magick.html
index 2493da7c49eb2db275e3ad123f1df0de2b9d8a18..856976eaac815ae2e19269d0b45332272e5b2f68 100644 (file)
--- a/www/magick.html
+++ b/www/magick.html
@@ -1324,4 +1324,4 @@ transparent, extract, background, or shape the alpha channel</td>
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:14 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 13:56 -->
\ No newline at end of file

diff --git a/www/miff.html b/www/miff.html
index 7ca5a713748357a49eabcf806282cdd060c20c65..adac8c80302923848b0b769385406c16ec4a175e 100644 (file)
--- a/www/miff.html
+++ b/www/miff.html
@@ -245,4 +245,4 @@ or fewer colors in the image, each byte of image data contains an index value. I
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:14 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 13:56 -->
\ No newline at end of file

diff --git a/www/mogrify.html b/www/mogrify.html
index 2b093a3a3b56281e863469aad6bab8d95ec057dd..a1c56b7b8617f3a8435b161f108038050506a59a 100644 (file)
--- a/www/mogrify.html
+++ b/www/mogrify.html
@@ -1297,4 +1297,4 @@ transparent, extract, background, or shape the alpha channel</td>
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:14 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 13:55 -->
\ No newline at end of file

diff --git a/www/montage.html b/www/montage.html
index d7097f3f701d59c6bf7a657ee0d90e09eb066c46..a1132710de77091a5ffa12cb9c30da3c9aaf5e29 100644 (file)
--- a/www/montage.html
+++ b/www/montage.html
@@ -638,4 +638,4 @@ transparent, extract, background, or shape the alpha channel</td>
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:14 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 13:55 -->
\ No newline at end of file

diff --git a/www/motion-picture.html b/www/motion-picture.html
index 1c8680339423cfd8284aabc1b2959b8b3f41ac1b..ff26d2cf752c3b0fa5b2da3fb67ad5e6092ab970 100644 (file)
--- a/www/motion-picture.html
+++ b/www/motion-picture.html
@@ -194,4 +194,4 @@ convert bluebells.dpx -define dpx:television.time.code=10:00:02:15 bluebells-001
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:13 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 14:26 -->
\ No newline at end of file

diff --git a/www/opencl.html b/www/opencl.html
index 57911c94b994ad71b67d9702f07690d5d45fc484..b19bed17e1ac84e5ed1e3df9cb8e37a33e444c25 100644 (file)
--- a/www/opencl.html
+++ b/www/opencl.html
@@ -25,7 +25,7 @@
   <meta name="distribution" content="Global"/>
   <meta name="magick-serial" content="P131-S030410-R485315270133-P82224-A6668-G1245-1"/>
   <meta name="google-site-verification" content="_bMOCDpkx9ZAzBwb2kF3PRHbfUUdFj2uO8Jd1AXArz4" />
-  <link rel="canonical" href="https://www.imagemagick.org/script/opencl.html"/>
+  <link rel="canonical" href="https://www.imagemagick.org/script/../www/opencl.html"/>
   <link rel="icon" href="../images/wand.png"/>
   <link rel="shortcut icon" href="../images/wand.ico"/>
   <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Roboto:900,400,400italic,700,700italic,300,300italic|Open+Sans:300italic,400italic,700italic,300,400,600,700" />
@@ -122,4 +122,4 @@ InitImageMagickOpenCL(MAGICK_OPENCL_DEVICE_SELECT_USER, (void*)(myDevices+2), NU
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:14 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 14:43 -->
\ No newline at end of file

diff --git a/www/openmp.html b/www/openmp.html
index bc41eb9131c9b006d20d2e64f8e209c61709b09a..1782d091d093da78bdbea4caf7d5efb3a8c2d355 100644 (file)
--- a/www/openmp.html
+++ b/www/openmp.html
@@ -101,4 +101,4 @@ Performance[8]: 40i 4.831ips 0.872e 15.680u 0:02.070
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:14 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 14:02 -->
\ No newline at end of file

diff --git a/www/perl-magick.html b/www/perl-magick.html
index 8d360136f0682e95135ba6d3913970fe5ee5ca23..6a19356e8978f9bb63d6cd87ebaac6fe48a354e7 100644 (file)
--- a/www/perl-magick.html
+++ b/www/perl-magick.html
@@ -2605,4 +2605,4 @@ Image::Magick->QuantumDepth
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:14 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 13:54 -->
\ No newline at end of file

diff --git a/www/porting.html b/www/porting.html
index 6b617a08a11a47a129f5608a67f4f1eaca416912..92270314cb8ed28f6e763e76549e3ab2650c0f8a 100644 (file)
--- a/www/porting.html
+++ b/www/porting.html
@@ -658,4 +658,4 @@ example "+annotate", "+resize", "+clut", and "+draw" .</p>
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:14 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 14:04 -->
\ No newline at end of file

diff --git a/www/quantize.html b/www/quantize.html
index de846d2df2c6b7c1b468424e9711f91b533ea1bd..59a90cb859d8cc673acf825420055345879859b8 100644 (file)
--- a/www/quantize.html
+++ b/www/quantize.html
@@ -202,4 +202,4 @@ while number of nodes with (n2 > 0) > required maximum number of colors
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:14 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 14:18 -->
\ No newline at end of file

diff --git a/www/resources.html b/www/resources.html
index 38299ec543be438497b31c64fa45c7d9fc60737d..3dbc3c6f934231065e41041a44d1284c8f95d17a 100644 (file)
--- a/www/resources.html
+++ b/www/resources.html
@@ -383,4 +383,4 @@ $MAGICK_FONT_PATH
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:13 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 13:56 -->
\ No newline at end of file

diff --git a/www/security-policy.html b/www/security-policy.html
index 31b0eb42a0c3ebc53603830faa9a2b1c0bb2b954..789a8cfd8ea695229cb0c3354c6872378dae2dff 100644 (file)
--- a/www/security-policy.html
+++ b/www/security-policy.html
@@ -57,6 +57,9 @@
 </div>
 <div class="container">
 <div class="magick-header">
+<p class="text-center"><a href="security-policy.html#policy">Security Policy </a> • <a href="security-policy.html#other">Other Security Considerations</a></p>
+
+
 <p class="lead magick-description">ImageMagick includes a security policy configuration file, <code>policy.xml</code>. It is useful for limiting the resources consumed by ImageMagick and can help prevent a denial-of-service or other exploits.</p>
 
 <p>As an example, suppose you download an image from the internet and unbeknownst to you its been crafted to generate a 20000 by 20000 pixel image. ImageMagick attempts to allocate enough resources (memory, disk) and your system will likely deny the resource request and exit. However, its also possible that your computer might be temporarily sluggish or unavailable or ImageMagick may abort. To prevent such a scenario, you can set limits in the <code>policy.xml</code> configuration file. You may ask why ImageMagick does not already include reasonable limits? Simply because what is reasonable in your environment, might not be reasonable to someone else. For example, one user has access to a host with 1TB of memory whereas another user is running ImageMagick on an iPhone. By policy, permitting giga-pixel image processing on the large memory host makes sense, not so much for the resource constrained iPhone. If you utilize ImageMagick from a public website, you may want to increase security by preventing usage of the MVG or HTTPS coders. Only you can decide what are reasonable limits taking in consideration your environment. We provide this policy with reasonable limits and encourage you to modify it to suit your local environment:</p>
@@ -147,6 +150,20 @@ Path: [built-in]
 </pre>
 
 <p>For additional details about resource limits and the policy configuration file, read <a href="resources.html">Resources</a> and <a href="architecture.html">Architecture</a>.</p>
+
+<h2 class="magick-header"><a id="other"></a>Other Security Considerations</h2>
+
+<p>If you spot a security flaw in ImageMagick, <a href="https://www.imagemagick.org/script/contact.php">contact us</a> and select Security Issue as the issue.  Alternatively, post your concern to <a href="https://github.com/ImageMagick/ImageMagick/issues">GitHub</a>.  Be sure to include how to reproduce the security flaw and a link to any images needed to reproduce the flaw.</p>
+
+<p>In addition to the security policy, you can make ImageMagick safer by ...</p>
+<ul>
+<li>keeping ImageMagick up-to-date.  The latest releases have fixes for any security flaws we discovered in the past.</li>
+<li>sanitizing any filenames or command line options you pass to ImageMagick.</li>
+<li>running ImageMagick in a sanitized software container such as Docker.</li>
+<li>running ImageMagick as the least-privileged user (e.g. 'nobody').</li>
+<li>explicitly setting the image file type.  For example, use the filename <code>png:image.png</code> rather than <code>image.png</code>.  Without an explicit image type in the filename, ImageMagick guesses the image type.</li>
+</ul>
+
 </div>
   <footer class="magick-footer">
     <p><a href="support.html">Donate</a> •
@@ -167,4 +184,4 @@ Path: [built-in]
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:14 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 14:04 -->
\ No newline at end of file

diff --git a/www/sitemap.html b/www/sitemap.html
index f518092067d1ff8938540d0894291d0f7bc25fef..ac675f98db808ef3b9d0432978e02603c845f9d4 100644 (file)
--- a/www/sitemap.html
+++ b/www/sitemap.html
@@ -25,7 +25,7 @@
   <meta name="distribution" content="Global"/>
   <meta name="magick-serial" content="P131-S030410-R485315270133-P82224-A6668-G1245-1"/>
   <meta name="google-site-verification" content="_bMOCDpkx9ZAzBwb2kF3PRHbfUUdFj2uO8Jd1AXArz4" />
-  <link rel="canonical" href="https://www.imagemagick.org/script/sitemap.html"/>
+  <link rel="canonical" href="https://www.imagemagick.org/script/../www/sitemap.html"/>
   <link rel="icon" href="../images/wand.png"/>
   <link rel="shortcut icon" href="../images/wand.ico"/>
   <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Roboto:900,400,400italic,700,700italic,300,300italic|Open+Sans:300italic,400italic,700italic,300,400,600,700" />
@@ -235,4 +235,4 @@
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:14 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 14:43 -->
\ No newline at end of file

diff --git a/www/stream.html b/www/stream.html
index 6e6ddbbd07dfea811b9ba4bcbba9c4bcefb33e7f..9e1c67a9a5cc7288226fe2b3ab0746e475165cfd 100644 (file)
--- a/www/stream.html
+++ b/www/stream.html
@@ -272,4 +272,4 @@ stream -map i -storage-type double 'image.tif[100x100+30+40]' gray.raw
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:14 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 14:46 -->
\ No newline at end of file

diff --git a/www/subversion.html b/www/subversion.html
index e702cb400d0b9c80b3f4f078851b5c7536b4ca67..386ff608344ae52e5485614689dd264a8d705250 100644 (file)
--- a/www/subversion.html
+++ b/www/subversion.html
@@ -96,4 +96,4 @@ svn update
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:14 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 20:27 -->
\ No newline at end of file

diff --git a/www/support.html b/www/support.html
index 4d147286cb4fc4dbb6f7e1051b34d6dc1947cc5b..0f3676b4ebad0e6921b090c0985e89fd1cb2eb8d 100644 (file)
--- a/www/support.html
+++ b/www/support.html
@@ -155,4 +155,4 @@ USA
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:14 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 14:08 -->
\ No newline at end of file

diff --git a/www/webp.html b/www/webp.html
index 8a5cc7b4e502554eab131b803a09643b7f15bffb..9ca90387cdf0e467a81495aed684669beeebf5bf 100644 (file)
--- a/www/webp.html
+++ b/www/webp.html
@@ -182,4 +182,4 @@ convert wizard.png -quality 50 -define webp:lossless=true wizard.webp
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th November 2016 12:14 -->
\ No newline at end of file
+<!-- Magick Cache 30th November 2016 15:47 -->
\ No newline at end of file