From: anthony <anthony@git.imagemagick.org>
Date: Mon, 19 Mar 2012 05:22:12 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~6016
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=79da703aad0042a6efa1097b77b043c5a3113e40;p=imagemagick

---

diff --git a/utilities/ImageMagick.1 b/utilities/ImageMagick.1
index e67b78ed5..e2ebf193f 100644
--- a/utilities/ImageMagick.1
+++ b/utilities/ImageMagick.1
@@ -2,7 +2,8 @@
 .SH NAME
 ImageMagick \- is a free software suite for the creation, modification and display of bitmap images.
 .SH SYNOPSIS
-\fBconvert\fP \fIinput-file\fP [\fIoptions\fP] \fIoutput-file\fP
+\fBmagick\fP [\fIoptions\fP|\fIinput-file\fP]... \fIoutput-file\fP
+\fBmagick-script\fP \fIscript-file\fP [\fIscript-arguments\fP]...
 .SH OVERVIEW
 
 ImageMagick\[rg], is a software suite to create, edit, and compose bitmap images. It can read, convert and write images in a variety of formats (about 100) including GIF, JPEG, JPEG-2000, PNG, PDF, PhotoCD, TIFF, and DPX. Use ImageMagick to translate, flip, mirror, rotate, scale, shear and transform images, adjust image colors, apply various special effects, or draw text, lines, polygons, ellipses and B\\['e]zier curves.
@@ -21,18 +22,36 @@ uainted with ImageMagick, start at the top of the list, the convert program, and
  use ImageMagick utilities to convert, compose, or edit images from the command-
 line.
 .TP
-.B convert
+.B magick
+
+Read images into memory, and perform operations on those images, and write
+then out to either the same of some other image file format.
 
-convert between image formats as well as resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more.
+The "-script" option can be switch from processing command line options,
+to reading options from a file or pipeline.
 .TP
-.B identify
+.B magick-script
 
-describes the format and characteristics of one or more image files.
+As "magick" command but with an implied "-script" option. Allows it to be used
+in special "#!/usr/bin/env magick-script" scripts that will search for the
+"magick-script" command anywhere along the users command path, rather than in
+a hardcorded command location.
+
+.TP
+.B convert
+
+Backwards compatiblity for ImageMagick version 6 "convert". Essentually an
+alias to a restrictive form of the "magick" command, which should be used
+instead.
 .TP
 .B mogrify
 
 resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more. Mogrify overwrites the original image file, whereas, convert writes to a different image file.
 .TP
+.B identify
+
+describes the format and characteristics of one or more image files.
+.TP
 .B composite
 
 overlaps one image over another.
diff --git a/utilities/ImageMagick.1.in b/utilities/ImageMagick.1.in
index e23aaec07..cbfb4b1e9 100644
--- a/utilities/ImageMagick.1.in
+++ b/utilities/ImageMagick.1.in
@@ -2,7 +2,8 @@
 .SH NAME
 ImageMagick \- is a free software suite for the creation, modification and display of bitmap images.
 .SH SYNOPSIS
-\fBconvert\fP \fIinput-file\fP [\fIoptions\fP] \fIoutput-file\fP
+\fBmagick\fP [\fIoptions\fP|\fIinput-file\fP]... \fIoutput-file\fP
+\fBmagick-script\fP \fIscript-file\fP [\fIscript-arguments\fP]...
 .SH OVERVIEW
 
 ImageMagick\[rg], is a software suite to create, edit, and compose bitmap images. It can read, convert and write images in a variety of formats (about 100) including GIF, JPEG, JPEG-2000, PNG, PDF, PhotoCD, TIFF, and DPX. Use ImageMagick to translate, flip, mirror, rotate, scale, shear and transform images, adjust image colors, apply various special effects, or draw text, lines, polygons, ellipses and B\\['e]zier curves.
@@ -21,18 +22,36 @@ uainted with ImageMagick, start at the top of the list, the convert program, and
  use ImageMagick utilities to convert, compose, or edit images from the command-
 line.
 .TP
-.B convert
+.B magick
+
+Read images into memory, and perform operations on those images, and write
+then out to either the same of some other image file format.
 
-convert between image formats as well as resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more.
+The "-script" option can be switch from processing command line options,
+to reading options from a file or pipeline.
 .TP
-.B identify
+.B magick-script
 
-describes the format and characteristics of one or more image files.
+As "magick" command but with an implied "-script" option. Allows it to be used
+in special "#!/usr/bin/env magick-script" scripts that will search for the
+"magick-script" command anywhere along the users command path, rather than in
+a hardcorded command location.
+
+.TP
+.B convert
+
+Backwards compatiblity for ImageMagick version 6 "convert". Essentually an
+alias to a restrictive form of the "magick" command, which should be used
+instead.
 .TP
 .B mogrify
 
 resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more. Mogrify overwrites the original image file, whereas, convert writes to a different image file.
 .TP
+.B identify
+
+describes the format and characteristics of one or more image files.
+.TP
 .B composite
 
 overlaps one image over another.