diff --git a/index.html b/index.html
index d46133d..2b92050 100644
--- a/index.html
+++ b/index.html
@@ -1,13 +1,13 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
- "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html version="-//W3C//DTD XHTML 1.1//EN"
- xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.w3.org/1999/xhtml
- http://www.w3.org/MarkUp/SCHEMA/xhtml11.xsd">
-<head>
- <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
- <meta name="google-site-verification" content="MxsMq6bdLOx0KSuz1MY6yG9ZTIJ7_7DVRfl5NCAT5Yg"/>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html version="-//W3C//DTD XHTML 1.1//EN"
+ xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.w3.org/1999/xhtml
+ http://www.w3.org/MarkUp/SCHEMA/xhtml11.xsd">
+<head>
+ <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
+ <meta name="google-site-verification" content="_bMOCDpkx9ZAzBwb2kF3PRHbfUUdFj2uO8Jd1AXArz4"/>
<title>ImageMagick: Convert, Edit, Or Compose Bitmap Images</title>
<meta http-equiv="content-language" content="en-US"/>
<meta http-equiv="content-type" content="text/html; charset=utf-8"/>
@@ -27,66 +27,77 @@
<meta name="distribution" content="Global"/>
<link rel="icon" href="images/wand.png"/>
<link rel="shortcut icon" href="images/wand.ico" type="images/x-icon"/>
- <link rel="canonical" href="index.html" />
- <link rel="meta" type="application/rdf+xml" title="ICI" href="http://imagemagick.org/ici.rdf"/>
-
- <!-- Add jQuery library -->
- <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7/jquery.min.js"></script>
-
- <!-- Add mousewheel plugin (this is optional) -->
- <script type="text/javascript" src="http://www.imagemagick.org/fancybox/lib/jquery.mousewheel-3.0.6.pack.js"></script>
-
- <!-- Add fancyBox -->
- <link rel="stylesheet" href="http://www.imagemagick.org/fancybox/source/jquery.fancybox.css?v=2.0.6" type="text/css" media="screen" />
- <script type="text/javascript" src="http://www.imagemagick.org/fancybox/source/jquery.fancybox.pack.js?v=2.0.6"></script>
-
- <!-- Optionally add helpers - button, thumbnail and/or media -->
- <link rel="stylesheet" href="http://www.imagemagick.org/fancybox/source/helpers/jquery.fancybox-buttons.css?v=1.0.2" type="text/css" media="screen" />
- <script type="text/javascript" src="http://www.imagemagick.org/fancybox/source/helpers/jquery.fancybox-buttons.js?v=1.0.2"></script>
- <script type="text/javascript" src="http://www.imagemagick.org/fancybox/source/helpers/jquery.fancybox-media.js?v=1.0.0"></script>
-
- <link rel="stylesheet" href="http://www.imagemagick.org/fancybox/source/helpers/jquery.fancybox-thumbs.css?v=2.0.6" type="text/css" media="screen" />
- <script type="text/javascript" src="http://www.imagemagick.org/fancybox/source/helpers/jquery.fancybox-thumbs.js?v=2.0.6"></script>
-
- <script type="text/javascript">
- $(document).ready(function() {
- $(".fancybox").fancybox();
- });
- </script>
-
- <!-- ImageMagick style -->
- <style type="text/css" media="all">
- @import url("www/magick.css");
- </style>
-</head>
-
-<body id="www-imagemagick-org">
-<div class="titlebar">
-<div style="margin: 17px auto; float: left;">
- <script type="text/javascript">
- <!--
- google_ad_client = "pub-3129977114552745";
- google_ad_slot = "5439289906";
- google_ad_width = 728;
- google_ad_height = 90;
- //-->
- </script>
- <script type="text/javascript"
- src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
- </script>
-</div>
-<a href="discourse-server">
- <img src="images/logo.jpg"
- alt="ImageMagick Logo"
- style="width: 123px; height: 118px; border: 0px; float: right;" /></a>
-<a href="index.html">
- <img src="images/sprite.jpg"
- alt="ImageMagick Sprite"
- style="width: 114px; height: 118px; border: 0px; float: right;" /></a>
-</div>
-
-<div class="westbar">
-
+ <link rel="canonical" href="index.html" />
+ <link rel="meta" type="application/rdf+xml" title="ICI" href="http://imagemagick.org/ici.rdf"/>
+
+ <!-- Add jQuery library -->
+ <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7/jquery.min.js"></script>
+
+ <!-- Add mousewheel plugin (this is optional) -->
+ <script type="text/javascript" src="http://www.imagemagick.org/fancybox/lib/jquery.mousewheel-3.0.6.pack.js"></script>
+
+ <!-- Add fancyBox -->
+ <link rel="stylesheet" href="http://www.imagemagick.org/fancybox/source/jquery.fancybox.css?v=2.0.6" type="text/css" media="screen" />
+ <script type="text/javascript" src="http://www.imagemagick.org/fancybox/source/jquery.fancybox.pack.js?v=2.0.6"></script>
+
+ <!-- Optionally add helpers - button, thumbnail and/or media -->
+ <link rel="stylesheet" href="http://www.imagemagick.org/fancybox/source/helpers/jquery.fancybox-buttons.css?v=1.0.2" type="text/css" media="screen" />
+ <script type="text/javascript" src="http://www.imagemagick.org/fancybox/source/helpers/jquery.fancybox-buttons.js?v=1.0.2"></script>
+ <script type="text/javascript" src="http://www.imagemagick.org/fancybox/source/helpers/jquery.fancybox-media.js?v=1.0.0"></script>
+
+ <link rel="stylesheet" href="http://www.imagemagick.org/fancybox/source/helpers/jquery.fancybox-thumbs.css?v=2.0.6" type="text/css" media="screen" />
+ <script type="text/javascript" src="http://www.imagemagick.org/fancybox/source/helpers/jquery.fancybox-thumbs.js?v=2.0.6"></script>
+
+ <script type="text/javascript">
+ $(document).ready(function() {
+ $(".fancybox").fancybox();
+ });
+ </script>
+
+ <!-- ImageMagick style -->
+ <style type="text/css" media="all">
+ @import url("www/magick.css");
+ </style>
+</head>
+
+<body id="www-imagemagick-org">
+
+<script>
+ (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+ (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+ m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+ })(window,document,'offline-script','//127.0.0.1/analytics.js','ga');
+
+ ga('create', 'UA-40133312-1', 'imagemagick.org');
+ ga('send', 'pageview');
+</script>
+
+<div class="titlebar">
+<div style="margin: 17px auto; float: left;">
+ <script type="text/javascript">
+ <!--
+ google_ad_client = "pub-3129977114552745";
+ google_ad_slot = "5439289906";
+ google_ad_width = 728;
+ google_ad_height = 90;
+ //-->
+ </script>
+ <script type="text/javascript"
+ src="http://127.0.0.1/pagead/show_ads.js">
+ </script>
+</div>
+<a href="discourse-server">
+ <img src="images/logo.jpg"
+ alt="ImageMagick Logo"
+ style="width: 123px; height: 118px; border: 0px; float: right;" /></a>
+<a href="index.html">
+ <img src="images/sprite.jpg"
+ alt="ImageMagick Sprite"
+ style="width: 114px; height: 118px; border: 0px; float: right;" /></a>
+</div>
+
+<div class="westbar">
+
<div class="menu">
<a title="About ImageMagick" href="index.html">About ImageMagick</a>
</div>
@@ -105,7 +116,7 @@
<div class="sub">
<a title="Binary Release: Windows" href="www/binary-releases.html#windows">Windows</a>
</div>
-<div class="sep"></div>
+<div class="sep"></div>
<div class="menu">
<a title="Command-line Tools" href="www/command-line-tools.html">Command-line Tools</a>
</div>
@@ -133,7 +144,7 @@
<div class="sub">
<a title="Program Interface: Magick++" href="www/magick++.html">Magick++</a>
</div>
-<div class="sep"></div>
+<div class="sep"></div>
<div class="menu">
<a title="Install from Source" href="www/install-source.html">Install from Source</a>
</div>
@@ -152,79 +163,65 @@
<div class="menu">
<a title="Download" href="www/download.html">Download</a>
</div>
-<div class="sep"></div>
+<div class="sep"></div>
<div class="menu">
- <a title="Search" href="http://www.imagemagick.org/script/search.php">Search</a>
+ <a title="Search" href="http://www.imagemagick.org/http://www.imagemagick.org/http://www.imagemagick.org/http://www.imagemagick.org/script/search.php">Search</a>
</div>
-<div class="sep"></div>
+<div class="sep"></div>
<div class="menu">
<a title="Site Map" href="www/sitemap.html">Site Map</a>
</div>
<div class="sub">
<a title="Site Map: Links" href="www/links.html">Links</a>
</div>
-<div class="sep"></div>
+<div class="sep"></div>
<div class="menu">
- <a rel="follow" title="Sponsors" href="www/sponsors.html">Sponsors:</a>
+ <a title="Support ImageMagick Development" href="www/support.html">Support ImageMagick Development</a>
+</div>
+</div>
- <a href="http://www.networkredux.com"> <img src="images/networkredux.png" width="140" height="31" alt="[sponsor]" style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" /></a>
- <a href="http://www.dinodirect.com/ipads-tablets/"> <img src="images/dino-direct.jpg" width="140" height="90" alt="[sponsor]" style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" /></a><!-- 201305010150 mickey@163... -->
-<div class="sponsbox">
-<div class="sponsor">
- <a rel="follow" title="China Travel" href="http://www.chinatravel.com/">China Travel</a><!-- 2013060100150 anjela / shivpay -->
+<div class="eastbar">
+ <script type="text/javascript">
+ /* <![CDATA[ */
+ (function() {
+ var po = document.createElement('offline-script'), t = document.getElementsByTagName('offline-script')[0];
+ po.type = 'text/javascript';
+ po.async = true;
+ po.src = 'http://api.flattr.com/js/0.6/load.js?mode=auto';
+ var script = document.getElementsByTagName('offline-script')[0];
+ script.parentNode.insertBefore(po, script);
+ })();
+ /* ]]> */
+ </script>
+ <div> <a class="FlattrButton" style="display:none;" rev="flattr;button:compact;" href="index.html"></a></div>
+ <noscript>
+ <a href="http://flattr.com/thing/947300/Convert-Edit-And-Compose-Images" target="_blank">
+ <img src="http://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" width="93" height="20" border="0" /></a>
+ </noscript>
+ <div class="g-plusone" id="gplusone"></div>
+ <script type="text/javascript">
+ /* <![CDATA[ */
+ window.___gcfg = {
+ lang: 'en-US'
+ };
+
+ (function() {
+ var po = document.createElement('offline-script');
+ po.type = 'text/javascript';
+ po.async = true;
+ po.src = 'https://127.0.0.1/js/plusone.js';
+ var script = document.getElementsByTagName('offline-script')[0];
+ script.parentNode.insertBefore(po, script);
+ })();
+ var gplusone = document.getElementById("gplusone");
+ gplusone.setAttribute("data-size","medium");
+ gplusone.setAttribute("data-count","true");
+ /* ]]> */
+ </script>
</div>
-<div class="sponsor">
- <a rel="follow" title="China Reisen" href="http://www.chinarundreisen.com/">China Reisen</a><!-- 2013060100150 anjela / shivpay -->
-</div>
-<div class="sponsor">
- <a rel="follow" title="Android Tablet PC" href="http://www.dhgate.com/wholesale+tablet+pc.html">Android Tablet PC</a><!-- 2013060100300 anjela / upendra -->
-</div>
-<div class="sponsor">
- <a rel="follow" title="Cheap Web Host Provider" href="http://cheapwebhostingprovider.com">Cheap Web Host Provider</a><!-- 2013170100150 affiliatelabel...-->
-</div>
-<div class="sponsor">
- <a rel="follow" title="Android Tablet" href="http://www.dinodirect.com/ipads-tablets/">Android Tablet</a><!-- 201305010120 mickey@163... -->
-</div>
-<div class="sponsor">
- <a rel="follow" title="Druckerei" href="http://www.druck-expert.com">Druckerei</a><!-- 201406010450 info@druck... -->
-</div>
-<div class="sponsor">
- <a rel="follow" title="Werbebanner" href="http://www.druck-expert.com/Werbebanner-Werbeplane-Geruestbanner,category,8552.html">Werbebanner</a><!-- 201406010450 info@druck... -->
-</div>
-<div class="sponsor">
- <a rel="follow" title="Notebook Reparatur" href="http://www.notebook-reparaturen-berlin.de">Notebook Reparatur</a><!-- 2014060100300 atlas-multimedia-->
-</div>
-<div class="sponsor">
- <a rel="follow" title="Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2013060100030 atlas-multimedia-->
-</div>
-</div>
-</div>
-</div>
-
-<div class="eastbar">
- <div class="g-plusone" id="gplusone"></div>
- <script type="text/javascript">
- window.___gcfg = {
- lang: 'en-US'
- };
-
- (function() {
- var po = document.createElement('offline-script');
- po.type = 'text/javascript';
- po.async = true;
- po.src = 'https://apis.google.com/js/plusone.js';
- var script = document.getElementsByTagName('offline-script')[0];
- script.parentNode.insertBefore(po, script);
- })();
- var gplusone = document.getElementById("gplusone");
- gplusone.setAttribute("data-size","medium");
- gplusone.setAttribute("data-count","false");
- </script>
- <a href="http://flattr.com/thing/947300/Convert-Edit-And-Compose-Images"><img src="http://api.flattr.com/button/flattr-badge-large.png" alt="Click to flattr ImageMagick" title="Click to flattr ImageMagick" width="93" height="20" /></a>
-</div>
-
-<div class="main">
-
+
+<div class="main">
+
<h1>Convert, Edit, and Compose Images</h1>
<p class="navigation-index">[<a href="index.html#features">Features and Capabilities</a> • <a href="index.html#news">ImageMagick News</a> • <a href="index.html#books">Books About ImageMagick</a> • <a href="index.html#community">User Community</a>]</p>
@@ -236,10 +233,11 @@
<p>ImageMagick is free software delivered as a ready-to-run binary distribution or as source code that you may freely use, copy, modify, and distribute in both open and proprietary applications. It is distributed under the Apache 2.0 <a href="www/license.html" rel="license">license</a>, approved by the <a href="http://www.opensource.org/">OSI</a> and recommended for use by the <a href="http://www.osscc.net/">OSSCC</a>.</p>
-<p>The ImageMagick development process ensures a stable API and ABI. Before each ImageMagick release, we perform a comprehensive security assessment that includes <a href="http://www.valgrind.org">memory and thread</a> error detection to prevent security vulnerabilities.</p>
+<p>The ImageMagick development process ensures a stable API and ABI. Before each ImageMagick release, we perform a comprehensive security assessment that includes <a href="https://code.google.com/p/address-sanitizer/">memory error</a> and <a href="https://code.google.com/p/data-race-test/wiki/ThreadSanitizer">thread data race</a> detection to prevent security vulnerabilities.</p>
-<p>The current release is ImageMagick 7.0.0-0.</p>
+<p>The current release is ImageMagick 7.0.0-0 available from <a href="download">http://www.imagemagick.org/download</a>. It runs on <a href="http://www.imagemagick.org/download/linux">Linux</a>, <a href="http://www.imagemagick.org/download/binaries">Windows</a>, <a href="http://www.imagemagick.org/download/binaries">Mac Os X</a>, <a href="http://www.imagemagick.org/download/iOS">iOS</a>, Android OS, and others.</p>
+<p>The official ImageMagick web site is <a href="index.html">http://www.imagemagick.org</a>.</p>
</div>
<div class="siz-mod-head">
@@ -298,33 +296,23 @@
<div class="doc-section">
<p>To join the ImageMagick user community, try the <a href="discourse-server">discourse server</a>. You can review questions or comments (with informed responses) posed by ImageMagick users or ask your own questions.</p>
</div>
-
-</div>
-
-<div id="linkbar">
- <span id="linkbar-west"> </span>
- <span id="linkbar-center">
- <a href="discourse-server">Discourse Server</a> •
- <a href="http://www.imagemagick.org/MagickStudio/scripts/MagickStudio.cgi">Studio</a> •
- <a href="http://jqmagick.imagemagick.org/">JqMagick</a>
- </span>
- <span id="linkbar-east"> </span>
- </div>
- <div class="footer">
- <span id="footer-west">© 1999-2013 ImageMagick Studio LLC</span>
- <span id="footer-east"> <a href="www/contact.html">Contact the Wizards</a></span>
- </div>
- <div style="clear: both; margin: 0; width: 100%; "></div>
- <script type="text/javascript">
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', 'UA-17690367-1']);
- _gaq.push(['_trackPageview']);
-
- (function() {
- var ga = document.createElement('offline-script'); ga.type = 'text/javascript'; ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
- var s = document.getElementsByTagName('offline-script')[0]; s.parentNode.insertBefore(ga, s);
- })();
- </script>
-</body>
-</html>
+
+</div>
+
+<div id="linkbar">
+ <span id="linkbar-west"> </span>
+
+ <span id="linkbar-center">
+ <a href="discourse-server">Discourse Server</a> •
+ <a href="http://www.imagemagick.org/MagickStudio/scripts/MagickStudio.cgi">Studio</a> •
+ <a href="http://jqmagick.imagemagick.org/">JqMagick</a>
+ </span>
+ <span id="linkbar-east"> </span>
+ </div>
+ <div class="footer">
+ <span id="footer-west">© 1999-2013 ImageMagick Studio LLC</span>
+ <span id="footer-east"> <a href="www/contact.html">Contact the Wizards</a></span>
+ </div>
+ <div style="clear: both; margin: 0; width: 100%; "></div>
+</body>
+</html>