Merge branch 'master' of github.com:probablycorey/mini_magick

probablycorey · Dec 28, 2011 · f0836cd · f0836cd
2 parents 1307717 + 323e4ae
commit f0836cd
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/README.rdoc b/README.rdoc
@@ -64,7 +64,7 @@ Need to combine several options?
 
 Want to composite two images? Super easy! (Aka, put a watermark on!)
 
-  image = Image.from_file("original.png")
+  image = Image.open("original.png")
   result = image.composite(Image.open("watermark.png", "jpg") do |c|
     c.gravity "center"
   end