diff --git a/appendices/glossary.xml b/appendices/glossary.xml
index ee026e2869..7d511e28ae 100644
--- a/appendices/glossary.xml
+++ b/appendices/glossary.xml
@@ -430,6 +430,9 @@ otherterm="gSMB">SMB
MPEG
Moving Picture Experts Group
+MSL
+Magick Scripting Language
+
MTA
Mail Transport Agent
diff --git a/general.ent b/general.ent
index 2f60f3e613..6240270dc4 100644
--- a/general.ent
+++ b/general.ent
@@ -1,4 +1,4 @@
-
+
@@ -105,7 +105,7 @@
-
+
diff --git a/general/genutils/imagemagick.xml b/general/genutils/imagemagick.xml
index 7f6f94abc7..824185ebf6 100644
--- a/general/genutils/imagemagick.xml
+++ b/general/genutils/imagemagick.xml
@@ -5,12 +5,12 @@
%general-entities;
-
-
-
-
-
-
+
+
+
+
+
+
]>
$LastChangedBy$
$Date$
+
-ImageMagick-&imagemagick-version;-&imagemagick-patch-version;
+<application>ImageMagick</application>-&imagemagick-version;-&imagemagick-patch-version;
+
+ ImageMagick
+
Introduction to <application>ImageMagick</application>
@@ -106,8 +110,11 @@ commands:
sed -i -e 's/\$(LIBLTDL) \$/\$/' Makefile.in &&
./configure --prefix=/usr --with-modules &&
-make &&
-make install
+make
+
+Now, as the root user:
+
+make install
Additional Configure Options
@@ -139,68 +146,148 @@ loadable modules.
Contents
-ImageMagick contains
-animate,
-compare,
-composite,
-conjure,
-convert,
-display,
-identify,
-import,
-Magick-config,
-Magick++-config,
-mogrify,
-montage,
-Wand-config,
-libMagick,
-libMagick++ and
-libWand libraries,
-numerous delegate modules and the
-Image::Magick Perl module.
-
-
+
+ Installed Programs
+ Installed Libraries
+ Installed Directories
-Description
-
-animate
-Animates a sequence of images.
-
-compare
-Compares an image to a reconstructed image.
-
-composite
-Composites various images into the given base image.
-
-conjure
-Processes a Magick Scripting Language (MSL) script to create
-an image.
-
-convert
-Convert image(s) from one format to another.
-
-display
-Display an image.
-
-identify
-Describes the format and characteristics of an image file.
+
+ animate, compare, composite, conjure, convert, display,
+ identify, import, Magick-config, Magick++-config, mogrify,
+ montage and Wand-config
+ libMagick, libMagick++ and libWand
+ None
+
+
-import
-Captures an X window.
-
-Magick-config and Magick++-config
-Get information about the installed versions of
-ImageMagick and Magick++.
-
-mogrify
-Transforms an image.
-
-montage
-Composites various images into a new image.
-
-Wand-config
-Get the options required to use the Wand library.
+
+ Short Descriptions
+
+
+ animate
+
+ animates a sequence of images.
+
+
+
+
+
+
+
+ compare
+
+ compares an image to a reconstructed image.
+
+
+
+
+
+
+
+ composite
+
+ composites various images into the given base image.
+
+
+
+
+
+
+
+ conjure
+
+ processes a MSL script to create an image.
+
+
+
+
+
+
+
+ convert
+
+ converts image(s) from one format to another.
+
+
+
+
+
+
+
+ display
+
+ displays an image.
+
+
+
+
+
+
+
+ identify
+
+ describes the format and characteristics of an image file.
+
+
+
+
+
+
+
+ import
+
+ captures an X window.
+
+
+
+
+
+
+
+ Magick-config and Magick++-config
+
+ show information about the installed versions of
+ ImageMagick and Magick++.
+
+
+
+
+
+
+
+ mogrify
+
+ transforms an image.
+
+
+
+
+
+
+
+ montage
+
+ composites various images into a new image.
+
+
+
+
+
+
+
+ Wand-config
+
+ shows the options required to use the Wand library.
+
+
+
+
+
+
+
+
+
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 376b9b3024..41a3d02d81 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -22,6 +22,9 @@ who wrote what.
+March 16th, 2005 [igor]: Updated to
+ImageMagick-6.2.0-7 contributed by John Gnew.
+
March 15th, 2005 [igor]: Updated to
XFce-4.2.0.
diff --git a/x/wm/xfce.xml b/x/wm/xfce.xml
index e1444169a4..2388aaa986 100644
--- a/x/wm/xfce.xml
+++ b/x/wm/xfce.xml
@@ -22,7 +22,7 @@
XFce-&xfce-version;
- Xfce
+ XFce