diff --git a/www/composite.html b/www/composite.html
index ae098b2..4be3e1e 100644
--- a/www/composite.html
+++ b/www/composite.html
@@ -1,7 +1,7 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" dir="ltr">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<meta name="verify-v1" content="g222frIIxcQTrvDR3NBRUSKP3AnMNoqxOkIniCEkV7U="/>
@@ -10,7 +10,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta http-equiv="Reply-to" content="magick-users@imagemagick.org"/>
<meta name="Application-name" content="ImageMagick"/>
- <meta name="Description" content="ImageMagick is a software suite to create, edit, or compose bitmap images in a variety of formats. Use ImageMagick to scale, rotate, shear, distort and transform images."/>
+ <meta name="Description" content="ImageMagick is a software suite to create, edit, compose, or convert bitmap images in a variety of formats. Use ImageMagick to scale, rotate, shear, distort and transform images."/>
<meta name="Application-url" content="http://www.imagemagick.org"/>
<meta name="Generator" content="PHP"/>
<meta name="Keywords" content="command-line, tools:, composite, ImageMagick, ImageMagic, MagickCore, MagickWand, PerlMagick, Magick++, RMagick, PythonMagick, JMagick, TclMagick, Image, Magick, Magic, Wand, ImageMagickObject, Swiss, Army, Knife, Image, Processing"/>
@@ -22,12 +22,25 @@
<meta name="Resource-type" content="document"/>
<meta name="Copyright" content="Copyright (c) 1999-2011 ImageMagick Studio LLC"/>
<meta name="Distribution" content="Global"/>
- <link rel="icon" href="../images/wand.png" sizes="32x32"/>
+ <link rel="icon" href="../images/wand.png"/>
<link rel="shortcut icon" href="../images/wand.ico" type="images/x-icon"/>
<link rel="meta" type="application/rdf+xml" title="ICI" href="http://imagemagick.org/ici.rdf"/>
<style type="text/css" media="all">
@import url("../www/magick.css");
</style>
+ <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4/jquery.min.js"></script>
+ <script type="text/javascript" src="../fancybox/jquery.fancybox-1.3.4.pack.js"></script>
+ <link rel="stylesheet" type="text/css" href="../fancybox/jquery.fancybox-1.3.4.css" media="screen" />
+ <script type="text/javascript">
+ $(document).ready(function() {
+ $("a[href$=.jpg],a[href$=.png],a[href$=.gif]").fancybox({
+ 'transitionIn' : 'elastic',
+ 'transitionOut' : 'elastic',
+ 'overlayShow' : false,
+ 'opacity' : true
+ });
+ });
+ </script>
</head>
<body id="www-imagemagick-org">
@@ -90,7 +103,7 @@
<a title="Program Interface: PerlMagick" href="../www/perl-magick.html">PerlMagick</a>
</div>
<div class="sub">
- <a title="Program Interface: Magick++" href="../Magick++/">Magick++</a>
+ <a title="Program Interface: Magick++" href="../www/magick++.html">Magick++</a>
</div>
<div class="sep"></div>
<div class="menu">
@@ -128,7 +141,7 @@
<div class="sponsbox">
<div class="sponsor">
- <a title="Sponsor: alaTest.com" href="http://alatest.com">alaTest.com</a><!-- 20110801000300 -->
+ <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011040100025 atlas.multimedia-->
</div>
<div class="sponsor">
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
@@ -139,15 +152,6 @@
<div class="sponsor">
<a title="Sponsor: Flyer drucken" href="http://www.online-druck.biz">Flyer drucken</a><!-- 201109010900 Floeter-->
</div>
-<div class="sponsor">
- <a title="Sponsor: Webdesign Agentur" href="http://www.ventzke-partner.de">Webdesign Agentur</a><!-- 201101010480 invendio.de-->
-</div>
-<div class="sponsor">
- <a title="Sponsor: LVM Versicherung" href="http://www.neu-reich.de">LVM Versicherung</a><!-- 201101010480 -->
-</div>
-<div class="sponsor">
- <a title="Sponsor: Diamonds are a Girls Best Friend" href="http://www.schmuck.org">Diamonds are a Girls Best Friend</a><!-- 201101010600 Peterssen-->
-</div>
</div>
</div>
</div>
@@ -168,13 +172,13 @@
<div class="main">
-<h1>ImageMagick Composite Command-line Utility</h1>
+<h1>ImageMagick Composite Command-line Tool</h1>
<p class="navigation-index">[<a href="#usage">Example Usage</a> • <a href="#options">Option Summary</a>]</p>
<p>Use the <kbd>composite</kbd> program to overlap one image over another. See <a href="../www/command-line-processing.html">Command Line Processing</a> for advice on how to structure your <kbd>composite</kbd> command or see below for example usages of the command.</p>
<div style="margin: auto;">
- <h2><a name="usage"></a>Example Usage</h2>
+ <h2><a id="usage"></a>Example Usage</h2>
</div>
<p>We list a few examples of the <kbd>composite</kbd> command here to illustrate its usefulness and ease of use. To get started, lets overlay a smiley face over a rose:</p>
@@ -208,7 +212,7 @@
<p>You can find additional examples of using <kbd>composite</kbd> in <a href="http://www.imagemagick.org/Usage/">Examples of ImageMagick Usage</a>. You can find out more about them and the mathematics by looking at <a href="http://www.w3.org/TR/SVG12/rendering.html">SVG Alpha Compositing</a></p>
<div style="margin: auto;">
- <h2><a name="options"></a>Option Summary</h2>
+ <h2><a id="options"></a>Option Summary</h2>
</div>
<p>The <kbd>composite</kbd> command recognizes these options. Click on an option to get more details about how that option works.</p>