Update HTML docs
diff --git a/www/command-line-options.html b/www/command-line-options.html
index d77e07f..b145c78 100644
--- a/www/command-line-options.html
+++ b/www/command-line-options.html
@@ -28,7 +28,7 @@
<link rel="canonical" href="https://www.imagemagick.org/script/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">
+ <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" />
<link rel="stylesheet" href="css/magick.css"/>
</head>
<body>
@@ -1794,7 +1794,10 @@
<tr>
<td>compose:clamp=<var>on|off</var></td>
- <td>set each pixel whose value is below zero to zero and any the pixel whose value is above the quantum range to the quantum range (e.g. 65535) otherwise the pixel value remains unchanged. Define supported in ImageMagick 6.9.1-3 and above.</td>
+ <td>set each pixel whose value is below zero to zero and any the pixel
+ whose value is above the quantum range to the quantum range (e.g. 65535)
+ otherwise the pixel value remains unchanged. Define supported in
+ ImageMagick 6.9.1-3 and above.</td>
</tr>
<tr>
@@ -1804,17 +1807,20 @@
<tr>
<td>connected-components:keep=<var>list-of-ids</var></td>
- <td>Comma and/or hyphenated list of id values to keep in the output. Supported in Imagemagick 6.9.3-0.</td>
+ <td>Comma and/or hyphenated list of id values to keep in the output.
+ Supported in Imagemagick 6.9.3-0.</td>
</tr>
<tr>
<td>connected-components:mean-color=<var>true</var></td>
- <td>Changes the output image from id values to mean color values. Supported in Imagemagick 6.9.2-8.</td>
+ <td>Changes the output image from id values to mean color values. Supported
+ in Imagemagick 6.9.2-8.</td>
</tr>
<tr>
<td>connected-components:remove=<var>list-of-ids</var></td>
- <td>Comma and/or hyphenated list of id values to remove from the output. Supported in Imagemagick 6.9.2-9.</td>
+ <td>Comma and/or hyphenated list of id values to remove from the output.
+ Supported in Imagemagick 6.9.2-9.</td>
</tr>
<tr>
@@ -1932,7 +1938,8 @@
<tr>
<td>jp2:number-resolutions=<var>value</var></td>
- <td>Sets the number of resolutions to encode.Same for JPT, JC2, and J2K</td>
+ <td>Sets the number of resolutions to encode.Same for JPT, JC2, and
+ J2K</td>
</tr>
<tr>
@@ -1950,11 +1957,11 @@
<tr>
<td>jp2:rate=<var>value</var></td>
- <td>Specify the compression factor to use while writing JPEG-2000 files. The
- compression factor is the reciprocal of the compression ratio. The valid
- range is 0.0 to 1.0, with 1.0 indicating lossless compression. If defined,
- this value overrides the -quality setting. A quality setting of 75
- results in a rate value of 0.06641. Same for JPT, JC2, and J2K</td>
+ <td>Specify the compression factor to use while writing JPEG-2000 files.
+ The compression factor is the reciprocal of the compression ratio. The
+ valid range is 0.0 to 1.0, with 1.0 indicating lossless compression. If
+ defined, this value overrides the -quality setting. A quality setting
+ of 75 results in a rate value of 0.06641. Same for JPT, JC2, and J2K</td>
</tr>
<tr>
@@ -1965,7 +1972,7 @@
<tr>
<td>jpeg:block-smoothing=<var>on|off</var></td>
- <td> </td>
+ <td> </td>
</tr>
<tr>
@@ -1993,22 +2000,22 @@
<tr>
<td>jpeg:fancy-upsampling=<var>on|off</var></td>
- <td> </td>
+ <td> </td>
</tr>
<tr>
<td>jpeg:optimize-coding=<var>on|off</var></td>
- <td> </td>
+ <td> </td>
</tr>
<tr>
<td>jpeg:q-table=<var>table</var></td>
- <td> </td>
+ <td> </td>
</tr>
<tr>
<td>jpeg:sampling-factor=<var>sampling-factor-string</var></td>
- <td> </td>
+ <td> </td>
</tr>
<tr>
@@ -2026,12 +2033,12 @@
<tr>
<td>json:limit</td>
- <td> </td>
+ <td> </td>
</tr>
<tr>
<td>json:locate</td>
- <td> </td>
+ <td> </td>
</tr>
<tr>
@@ -2076,27 +2083,36 @@
<tr>
<td>pdf:fit-to-page=<var>true</var></td>
- <td> </td>
+ <td> </td>
</tr>
<tr>
<td>pdf:use-cropbox=<var>true</var></td>
- <td> </td>
+ <td> </td>
</tr>
<tr>
<td>pdf:use-trimbox=<var>true</var></td>
- <td> </td>
+ <td> </td>
</tr>
<tr>
<td>phash:colorspaces=<var>colorspace,colorspace,...</var></td>
- <td>the perceptual hash defaults to the sRGB and HCLp colorspaces. Use this define, you can specify up to six alternative colorspaces.</td>
+ <td>the perceptual hash defaults to the sRGB and HCLp colorspaces. When
+ using this define, you can specify up to six alternative colorspaces. (as
+ of IM 7.0.3-8)</td>
+ </tr>
+
+ <tr>
+ <td>phash:normalize=<var>true</var></td>
+ <td>normalizes the phash metric by dividing by the number of channels
+ specified by <code>-define phash:colorspaces</code> when using compare
+ -metric phash. (as of IM 7.0.3-8)</td>
</tr>
<tr>
<td>png:bit-depth=<var>value</var></td>
- <td> </td>
+ <td> </td>
</tr>
<tr>
@@ -2285,7 +2301,16 @@
<tr>
<td>psd:additional-info=all|selective</td>
- <td>This option should only be used when converting from a PSD file to another PSD file. This should be placed after the image is read. The two options are 'all' and 'selective'. The 'selective' option will preserve all additional information that is not related to the geometry of the image. The 'all' option should only be used when the geometry of the image has not been changed. This option is helpful when transferring non-simple layers, such as adjustment layers from the input PSD file to the output PSD file. If this option is not used, the additional information will not be preserved. This define is available as of Imagemagick version 6.9.5-8.
+ <td>This option should only be used when converting from a PSD file to
+ another PSD file. This should be placed after the image is read. The two
+ options are 'all' and 'selective'. The 'selective' option will preserve
+ all additional information that is not related to the geometry of the
+ image. The 'all' option should only be used when the geometry of the
+ image has not been changed. This option is helpful when transferring
+ non-simple layers, such as adjustment layers from the input PSD file to
+ the output PSD file. If this option is not used, the additional
+ information will not be preserved. This define is available as of
+ Imagemagick version 6.9.5-8.
</td>
</tr>
@@ -2301,7 +2326,11 @@
<tr>
<td>psd:preserve-opacity-mask=true</td>
- <td>This option should only be used when converting from a PSD file to another PSD file. It will preserve the opacity mask of a layer and add it back to the layer when the image is saved. Setting this to 'true' will enable this feature. This define is available as of Imagemagick version 6.9.5-10.
+ <td>This option should only be used when converting from a PSD file to
+ another PSD file. It will preserve the opacity mask of a layer and add it
+ back to the layer when the image is saved. Setting this to 'true' will
+ enable this feature. This define is available as of Imagemagick version
+ 6.9.5-10.
</td>
</tr>
@@ -2322,8 +2351,8 @@
<tr>
<td>quantum:polarity=<var>photometric-interpretation</var></td>
- <td>Set the photometric-interpretation of an image (typically for TIFF image
- file format) to either <code>min-is-black</code> (default) or
+ <td>Set the photometric-interpretation of an image (typically for TIFF
+ image file format) to either <code>min-is-black</code> (default) or
<code>min-is-white</code>.</td>
</tr>
@@ -2346,12 +2375,13 @@
<tr>
<td>tiff:alpha=<var>associated|unassociated|unspecified</var></td>
- <td>Specify the alpha extra samples as associated, unassociated or unspecified </td>
+ <td>Specify the alpha extra samples as associated, unassociated or
+ unspecified </td>
</tr>
<tr>
<td>tiff:endian=<var>msb|lsb</var></td>
- <td> </td>
+ <td> </td>
</tr>
<tr>
@@ -2361,7 +2391,7 @@
<tr>
<td>tiff:fill-order=<var>msb|lsb</var></td>
- <td> </td>
+ <td> </td>
</tr>
<tr>
@@ -2387,12 +2417,12 @@
<tr>
<td>type:features=<var>string</var></td>
- <td> </td>
+ <td> </td>
</tr>
<tr>
<td>type:hinting=<var>off</var></td>
- <td> </td>
+ <td> </td>
</tr>
</table>
@@ -7090,7 +7120,15 @@
<h3 class="magick-header"><a id="smush"></a>-smush <var>offset</var></h3>
</div>
-<p class="magick-description">smush an image sequence together.</p>
+<p class="magick-description">appends an image sequence together ignoring transparency.</p>
+
+<p>Smush is a more flexible version of <a href="command-line-options.html#append">-append</a>, joining the images in the sequence top-to-bottom (<a href="command-line-options.html#smush">-smush</a>) or left-to-right (<a href="command-line-options.html#smush">+smush</a>), with a gap between images according to the specified offset.</p>
+
+<p>If the offset is negative, images will overlap by that amount.</p>
+
+<p><a href="command-line-options.html#smush">-smush</a> respects <a href="command-line-options.html#gravity">-gravity</a>. Any empty space will be filled with the <a href="command-line-options.html#background">-background</a> color.</p>
+
+<p>For zero offset and transparent images, the non-transparent parts of the two images will be aligned as close as possible without overlapping.</p>
<div style="margin: auto;">
<h3 class="magick-header"><a id="snaps"></a>-snaps <var>value</var></h3>
@@ -7993,4 +8031,4 @@
</div>
</body>
</html>
-<!-- Magick Cache 10th November 2016 08:02 -->
\ No newline at end of file
+<!-- Magick Cache 22nd November 2016 07:34 -->
\ No newline at end of file