summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorcristy <urban-warrior@git.imagemagick.org>2015-06-06 18:23:08 +0000
committercristy <urban-warrior@git.imagemagick.org>2015-06-06 18:23:08 +0000
commit4fa14339eaad5f0cfb6c8dfe6b905c308031eb85 (patch)
treedef7b1f4da3290ad7d2d07ba6db2f7dab54c45c8 /README.md
parent0d143b185eba0e33494f940e274c43267a11f8ee (diff)
downloadImageMagick-4fa14339eaad5f0cfb6c8dfe6b905c308031eb85.tar.gz
Diffstat (limited to 'README.md')
-rw-r--r--README.md28
1 files changed, 14 insertions, 14 deletions
diff --git a/README.md b/README.md
index ad6fca3a4..aab50bac9 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/ImageMagick/ImageMagick.svg?branch=master)](https://travis-ci.org/ImageMagick/ImageMagick)
+[![Build Status](https://travis-ci.org/ImageMagick/ImageMagick.svg?branch=ImageMagick-6)](https://travis-ci.org/ImageMagick/ImageMagick)
#Introduction to ImageMagick
@@ -23,19 +23,20 @@
and can read, process, or write mega-, giga-, or tera-pixel image sizes.
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 license, approved by the OSI and recommended for use by the OSSCC.
+ or as source code that you may use, copy, modify, and distribute in both open
+ and proprietary applications. It is distributed under the Apache 2.0 license.
The ImageMagick development process ensures a stable API and ABI. Before
each ImageMagick release, we perform a comprehensive security assessment
- that includes memory and thread error detection to prevent security
- vulnerabilities.
+ that includes memory error and thread data race detection to prevent
+ security vulnerabilities.
ImageMagick is available from http://www.imagemagick.org/download to
download. It runs on Linux, Windows, Mac Os X, iOS, Android OS, and others.
- The authoritative ImageMagick web site is http://www.imagemagick.org.
+ The authoritative ImageMagick web site is
+ http://www.imagemagick.org. The authoritative source code repository is
+ http://subversion.imagemagick.org/subversion/ImageMagick/.
#Features and Capabilities
@@ -93,10 +94,9 @@
* ImageMagick on the iPhone: convert, edit, or compose images on your
iPhone.
- Examples of ImageMagick Usage, http://www.imagemagick.org/Usage/, shows how
- to use ImageMagick from the command-line to accomplish any of these tasks and
- much more. Also, see Fred's ImageMagick Scripts,
- http://www.fmwconcepts.com/imagemagick/: a plethora of command-line scripts
- that perform geometric transforms, blurs, sharpens, edging, noise removal,
- and color manipulations.
-
+ Examples of ImageMagick Usage shows how to use ImageMagick from the
+ command-line to accomplish any of these tasks and much more. Also,
+ see Fred's ImageMagick Scripts: a plethora of command-line scripts that
+ perform geometric transforms, blurs, sharpens, edging, noise removal,
+ and color manipulations. With Magick.NET, use ImageMagick without having
+ to install ImageMagick on your server or desktop.