(no commit message)

[imagemagick] / www / composite.html
diff --git a/www/composite.html b/www/composite.html

index 2c7c8048e108c2079fc53e3c54975768dfae28f8..c72879bee77f527401c0e236735e06e6b7af86c4 100644 (file)
--- a/www/composite.html
+++ b/www/composite.html
@@ -3,6 +3,7 @@
      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">\r
  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">\r
  <head>\r
+  <meta http-equiv="Content-Type" value="application/xhtml+xml" />\r
    <meta name="verify-v1" content="g222frIIxcQTrvDR3NBRUSKP3AnMNoqxOkIniCEkV7U=" />\r
    <link rel="meta" type="application/rdf+xml" title="ICI" href="http://imagemagick.org/ici.rdf" />\r
    <style type="text/css" media="screen,projection"><!--\r
@@ -22,7 +23,7 @@
    <meta name="Author" content="ImageMagick Studio LLC"/>
    <meta name="Revisit-after" content="2 DAYS"/>
    <meta name="Resource-type" content="document"/>
-  <meta name="Copyright" content="Copyright (c) 1999-2009 ImageMagick Studio LLC"/>
+  <meta name="Copyright" content="Copyright (c) 1999-2010 ImageMagick Studio LLC"/>
    <meta name="Distribution" content="Global"/>
  </head>\r
  \r
@@ -124,22 +125,25 @@
  
  <div class="sponsbox">
  <div  class="sponsor">
-   <a href="http://www.buerodruck.de/stempel-service/index.html">Stempel bestellen</a><!-- 200910000035+ -->
+   <a href="http://www.abi-stoff.de/abizeitung/" title="Abibuch">Abizeitung</a><!-- 20101101000200 -->
  </div>
  <div  class="sponsor">
-  <a href="http://www.online-kredit-index.de">Kredit</a><!-- 201003010120 Buchhorn -->
+  <a href="http://www.tomsgutscheine.de">Tom's Gutscheine</a><!-- 201005010360 invendio.de-->
  </div>
  <div  class="sponsor">
-  <a href="http://www.print24.de/">Druckerei</a><!-- 201009010720 -->
+  <a href="http://www.online-kredit-index.de">Kredit</a><!-- 201006010120 Buchhorn -->
+</div>
+<div  class="sponsor">
+  <a href="http://www.blumenversender.com">Blumenversand</a><!-- 201005010120 -->
  </div>
  <div  class="sponsor">
-   <a href="http://www.goyax.de">Börse</a><!-- 201001000240 Gewiese digital-finance.de -->
+  <a href="http://www.print24.de/">Druckerei</a><!-- 201009010720 -->
  </div>
  <div  class="sponsor">
-   <a href="http://www.allesdruck.de">Druckerei Online</a><!-- 201012001200 allesdruck.de-->
+   <a href="http://www.goyax.de">Börse</a><!-- 201004010240 Gewiese digital-finance.de -->
  </div>
  <div  class="sponsor">
-  <a href="http://www.blumenversender.com">Blumenversand</a><!-- 200911010120 -->
+   <a href="http://www.allesdruck.de">Druckerei Online</a><!-- 201012011200 allesdruck.de-->
  </div>
  <div  class="sponsor">
    <a href="http://www.who-sells-it.com/">Free Catalogs</a><!-- 201002010000 -->
@@ -176,7 +180,7 @@
  <p>You can create three-dimensional effect with the <em>Atop</em>:</p>
  
  <p class='crt'><span class="crtprompt"> $magick&gt; </span><span class='crtin'>convert -size 70x70 xc:none -fill red -draw 'circle 35,35 10,30' red-circle.png</span><span class='crtout'></span><span class="crtprompt"> $magick&gt; </span><span class='crtin'>convert -size 70x70 xc:none -draw 'circle 35,35 35,20' -negate \ <br/>
-  -channel A -gaussian 0x8 white-highlight.png</span><span class='crtout'></span><span class="crtprompt"> $magick&gt; </span><span class='crtin'>composite -compose atop -geometry -13-17 white-highlight.png red-circle.png red-ball.png</span></p>
+  -channel A -gaussian-blur 0x8 white-highlight.png</span><span class='crtout'></span><span class="crtprompt"> $magick&gt; </span><span class='crtin'>composite -compose atop -geometry -13-17 white-highlight.png red-circle.png red-ball.png</span></p>
  
  <div class="image">
  <p>
@@ -407,7 +411,7 @@ transparent, extract, background, or shape the alpha channel</td>
  
    <tr>
      <td valign="top"><a href="../www/command-line-options.html#negate">-negate</a></td>
-    <td valign="top">replace every pixel with its complementary color </td>
+    <td valign="top">replace each pixel with its complementary color </td>
    </tr>
  
    <tr>
@@ -599,13 +603,12 @@ transparent, extract, background, or shape the alpha channel</td>
   <!--    <span id="linkbar-west">&nbsp;</span>  -->\r
      <span id="linkbar-center">\r
        <a href="http://www.imagemagick.org/discourse-server/">Discourse Server</a> &bull;\r
-      <a href="../www/mailing-list.html">Mailing Lists</a> &bull;\r
-    <a href="http://www.imagemagick.org/MagickStudio/scripts/MagickStudio.cgi">Studio</a>\r
+    <a href="http://studio.webbyland.com/ImageMagick/MagickStudio/scripts/MagickStudio.cgi">Studio</a>\r
      </span>\r
      <span id="linkbar-east">&nbsp;</span>\r
    </div>\r
    <div class="footer">\r
-    <span id="footer-west">&copy; 1999-2009 ImageMagick Studio LLC</span>\r
+    <span id="footer-west">&copy; 1999-2010 ImageMagick Studio LLC</span>\r
      <span id="footer-east"> <a href="http://www.imagemagick.org/script/contact.php">Contact the Wizards</a></span>\r
    </div>\r
    <div style="clear: both; margin: 0; width: 100%; "></div>\r