RubyGems - rmagick - Versions diffs - 2.0.0 → 2.1.0 - Mend

rmagick 2.0.0 → 2.1.0

Potentially problematic release.

This version of rmagick might be problematic. Click here for more details.

Files changed (54) hide show

data/ChangeLog +9 -0
data/README.html +13 -13
data/README.txt +11 -11
data/doc/comtasks.html +25 -4
data/doc/constants.html +8 -8
data/doc/draw.html +112 -116
data/doc/ex/axes.rb +1 -1
data/doc/ex/clip_path.rb +5 -4
data/doc/ex/get_type_metrics.rb +2 -2
data/doc/ex/resize_to_fill.rb +10 -0
data/doc/ex/{crop_resized.rb → resize_to_fit.rb} +2 -2
data/doc/ilist.html +79 -82
data/doc/image1.html +213 -322
data/doc/image2.html +123 -136
data/doc/image3.html +340 -198
data/doc/imageattrs.html +211 -192
data/doc/imusage.html +6 -7
data/doc/index.html +9 -16
data/doc/info.html +90 -61
data/doc/magick.html +6 -6
data/doc/optequiv.html +26 -13
data/doc/rvg.html +22 -23
data/doc/rvgclip.html +15 -16
data/doc/rvggroup.html +23 -23
data/doc/rvgimage.html +18 -19
data/doc/rvgpattern.html +101 -82
data/doc/rvgshape.html +14 -21
data/doc/rvgstyle.html +4 -4
data/doc/rvgtext.html +10 -9
data/doc/rvgtspan.html +12 -11
data/doc/rvgtut.html +4 -4
data/doc/rvguse.html +4 -4
data/doc/rvgxform.html +9 -9
data/doc/struct.html +193 -195
data/doc/usage.html +12 -10
data/examples/constitute.rb +7 -0
data/ext/RMagick/MANIFEST +4 -4
data/ext/RMagick/extconf.rb +54 -42
data/ext/RMagick/rmagick.h +34 -11
data/ext/RMagick/rmdraw.c +6 -6
data/ext/RMagick/rmfill.c +2 -2
data/ext/RMagick/rmilist.c +9 -9
data/ext/RMagick/rmimage.c +110 -106
data/ext/RMagick/rminfo.c +33 -14
data/ext/RMagick/rmmain.c +11 -21
data/ext/RMagick/rmutil.c +51 -11
data/lib/RMagick.rb +25 -18
data/post-clean.rb +3 -3
data/post-install.rb +4 -5
data/rmagick.gemspec +5 -3
data/uninstall.rb +6 -6
metadata +7 -7
data/doc/ex/Adispatch.rb +0 -43
data/doc/ex/Zconstitute.rb +0 -9

data/doc/image3.html CHANGED Viewed

@@ -6,7 +6,7 @@
   <meta name="generator" content=
   "HTML Tidy for Linux/x86 (vers 1 September 2005), see www.w3.org" />
-  <title>RMagick 2.0.0: class Image (instance methods p-w)</title>
+  <title>RMagick 2.1.0: class Image (instance methods p-w)</title>
   <meta http-equiv="Content-Type" content=
   "text/html; charset=us-ascii" />
   <meta name="GENERATOR" content="Quanta Plus" />
@@ -51,7 +51,7 @@
 </head>
 <body>
-  <h6 id="header">RMagick 2.0.0 User's Guide and Reference</h6>
+  <h6 id="header">RMagick 2.1.0 User's Guide and Reference</h6>
   <div class="nav">
     &laquo;&nbsp;<a href="image2.html">Prev</a> | <a href=
@@ -109,6 +109,11 @@
           <li><a href="#resize_bang">resize!</a></li>
+          <li><a href="#resize_to_fill">resize_to_fill</a></li>
+          <li><a href=
+          "#resize_to_fill_bang">resize_to_fill!</a></li>
           <li><a href="#resize_to_fit">resize_to_fit</a></li>
           <li><a href="#resize_to_fit_bang">resize_to_fit!</a></li>
@@ -118,15 +123,15 @@
           <li><a href="#rotate">rotate</a></li>
           <li><a href="#rotate_bang">rotate!</a></li>
-          <li><a href="#sample">sample</a></li>
-          <li><a href="#sample_bang">sample!</a></li>
         </ul>
       </div>
       <div class="toccol">
         <ul>
+          <li><a href="#sample">sample</a></li>
+          <li><a href="#sample_bang">sample!</a></li>
           <li><a href="#scale">scale</a></li>
           <li><a href="#scale_bang">scale!</a></li>
@@ -174,15 +179,15 @@
           <li><a href="#store_pixels">store_pixels</a></li>
           <li><a href="#strip_bang">strip!</a></li>
-          <li><a href="#swirl">swirl</a></li>
-          <li><a href="#sync_profiles">sync_profiles</a></li>
         </ul>
       </div>
       <div class="toccol">
         <ul>
+          <li><a href="#swirl">swirl</a></li>
+          <li><a href="#sync_profiles">sync_profiles</a></li>
           <li><a href=
           "#texture_fill_to_border">texture_fill_to_border</a></li>
@@ -243,7 +248,7 @@
   <div class="sig">
     <h3 id="palette_q">palette?</h3>
-    <p><span class="arg">image</span>.palette? -&gt; true or
+    <p><span class="arg">img</span>.palette? -&gt; true or
     false</p>
   </div>
@@ -266,9 +271,9 @@
   <div class="sig">
     <h3 id="pixel_color">pixel_color</h3>
-    <p><span class="arg">image</span>.pixel_color(<span class=
+    <p><span class="arg">img</span>.pixel_color(<span class=
     "arg">x</span>, <span class="arg">y</span>[, <span class=
-    "arg">new_color</span>]) -&gt; <em>aPixel</em></p>
+    "arg">new_color</span>]) -&gt; <em>pixel</em></p>
   </div>
   <div class="desc">
@@ -311,8 +316,9 @@ old = image.pixel_color(20,40,"white")
   <div class="sig">
     <h3 id="polaroid">polaroid</h3>
-    <p>image.polaroid(angle=-5.0) [ <span class="arg">{ optional
-    arguments }</span> ] -&gt; anImage</p>
+    <p><span class="arg">img</span>.polaroid(angle=-5.0) [
+    <span class="arg">{ optional arguments }</span> ] -&gt;
+    image</p>
   </div>
   <div class="desc">
@@ -391,9 +397,9 @@ end
   <div class="sig">
     <h3 id="posterize">posterize</h3>
-    <p><span class="arg">image</span>.posterize(<span class=
+    <p><span class="arg">img</span>.posterize(<span class=
     "arg">levels</span>=4, <span class="arg">dither</span>=false)
-    -&gt; <em>anImage</em></p>
+    -&gt; <em>image</em></p>
   </div>
   <div class="desc">
@@ -444,8 +450,8 @@ end
   <div class="sig">
     <h3 id="preview">preview</h3>
-    <p><span class="arg">image</span>.preview(<span class=
-    "arg">aPreviewType</span>) -&gt; <em>anImage</em></p>
+    <p><span class="arg">img</span>.preview(<span class=
+    "arg">aPreviewType</span>) -&gt; <em>image</em></p>
   </div>
   <div class="desc">
@@ -551,9 +557,9 @@ end
   <div class="sig">
     <h3 id="profile_bang">profile!</h3>
-    <p><span class="arg">image</span>.profile!(<span class=
+    <p><span class="arg">img</span>.profile!(<span class=
     "arg">name</span>, <span class="arg">profile</span>) -&gt;
-    <em>image</em></p>
+    <em>self</em></p>
   </div>
   <div class="desc">
@@ -608,8 +614,8 @@ end
   <div class="sig">
     <h3 id="properties">properties</h3>
-    <p><span class="arg">image</span>.properties <span class=
-    "arg">[ {|name,value| block} ]</span> -&gt; <em>aHash</em></p>
+    <p><span class="arg">img</span>.properties <span class="arg">[
+    {|name,value| block} ]</span> -&gt; <em>hash</em></p>
   </div>
   <div class="desc">
@@ -641,13 +647,13 @@ end
   <div class="sig">
     <h3 id="quantize">quantize</h3>
-    <p><span class="arg">image</span>.quantize(<span class=
+    <p><span class="arg">img</span>.quantize(<span class=
     "arg">number_colors</span>=256, <span class=
-    "arg">colorspace</span>=Magick::RGBColorspace, <span class=
+    "arg">colorspace</span>=RGBColorspace, <span class=
     "arg">dither</span>=<code>true</code>, <span class=
     "arg">tree_depth</span>=0, <span class=
     "arg">measure_error</span>=<code>false</code>) -&gt;
-    <em>anImage</em></p>
+    <em>image</em></p>
   </div>
   <div class="desc">
@@ -728,10 +734,10 @@ end
   <div class="sig">
     <h3 id="quantum_operator">quantum_operator</h3>
-    <p><span class="arg">image</span>.quantum_operator(<span class=
+    <p><span class="arg">img</span>.quantum_operator(<span class=
     "arg">operator</span>, <span class="arg">rvalue</span>,
     <span class="arg">channel</span>=AllChannels) -&gt;
-    <em>anImage</em></p>
+    <em>self</em></p>
   </div>
   <div class="desc">
@@ -818,8 +824,8 @@ img.quantum_operator(DivideQuantumOperator, 2, RedChannel)
   <div class="sig">
     <h3 id="radial_blur">radial_blur</h3>
-    <p><span class="arg">image</span>.radial_blur(<span class=
-    "arg">aFloat</span>) -&gt; <em>anImage</em></p>
+    <p><span class="arg">img</span>.radial_blur(<span class=
+    "arg">float</span>) -&gt; <em>image</em></p>
   </div>
   <div class="desc">
@@ -866,9 +872,9 @@ img.quantum_operator(DivideQuantumOperator, 2, RedChannel)
     <h3 id="radial_blur_channel">radial_blur_channel</h3>
     <p><span class=
-    "arg">image</span>.radial_blur_channel(<span class=
-    "arg">aFloat</span> [, <span class="arg">channel</span>...])
-    -&gt; <em>anImage</em></p>
+    "arg">img</span>.radial_blur_channel(<span class="arg">float</span>
+    [, <span class="arg">channel</span>...]) -&gt;
+    <em>image</em></p>
   </div>
   <div class="desc">
@@ -906,10 +912,10 @@ img.quantum_operator(DivideQuantumOperator, 2, RedChannel)
   <div class="sig">
     <h3 id="raise">raise</h3>
-    <p><span class="arg">image</span>.raise(<span class=
+    <p><span class="arg">img</span>.raise(<span class=
     "arg">width</span>=6, <span class="arg">height</span>=6,
     <span class="arg">raised</span>=<code>true</code>) -&gt;
-    <em>anImage</em></p>
+    <em>image</em></p>
   </div>
   <div class="desc">
@@ -960,9 +966,9 @@ img.quantum_operator(DivideQuantumOperator, 2, RedChannel)
   <div class="sig">
     <h3 id="random_threshold_channel">random_threshold_channel</h3>
-    <p><span class="arg">image</span>.random_threshold_channel(
+    <p><span class="arg">img</span>.random_threshold_channel(
     <span class="arg">thresholds</span>, [<span class=
-    "arg">channel</span>...] ) -&gt; <em>anImage</em></p>
+    "arg">channel</span>...] ) -&gt; <em>image</em></p>
   </div>
   <div class="desc">
@@ -1030,8 +1036,8 @@ random_threshold_channel(geom, RedChannel)
   <div class="sig">
     <h3 id="recolor">recolor</h3>
-    <p><span class="arg">image</span>.recolor(<span class=
-    "arg">color_matrix</span>) -&gt; <em>anImage</em></p>
+    <p><span class="arg">img</span>.recolor(<span class=
+    "arg">color_matrix</span>) -&gt; <em>image</em></p>
   </div>
   <div class="desc">
@@ -1056,8 +1062,8 @@ random_threshold_channel(geom, RedChannel)
   <div class="sig">
     <h3 id="reduce_noise">reduce_noise</h3>
-    <p><span class="arg">image</span>.reduce_noise(<span class=
-    "arg">radius</span>) -&gt; <em>anImage</em></p>
+    <p><span class="arg">img</span>.reduce_noise(<span class=
+    "arg">radius</span>) -&gt; <em>image</em></p>
   </div>
   <div class="desc">
@@ -1104,9 +1110,9 @@ random_threshold_channel(geom, RedChannel)
   <div class="sig">
     <h3 id="resample">resample</h3>
-    <p><span class="arg">image</span>.resample(<span class=
+    <p><span class="arg">img</span>.resample(<span class=
     "arg">horizontal_res</span>=72.0[, <span class=
-    "arg">vertical_res</span>]) -&gt; <em>anImage</em></p>
+    "arg">vertical_res</span>]) -&gt; <em>image</em></p>
   </div>
   <div class="desc">
@@ -1147,13 +1153,13 @@ random_threshold_channel(geom, RedChannel)
   <div class="sig">
     <h3 id="resize">resize</h3>
-    <p><span class="arg">image</span>.resize(<span class=
+    <p><span class="arg">img</span>.resize(<span class=
     "arg">new_width</span>, <span class="arg">new_height</span>,
     <em>filter</em>=<a href=
     "constants.html#FilterTypes">LanczosFilter</a>,
     <em>support</em>=1.0) -&gt; <em>image</em><br />
-    <span class="arg">image</span>.resize(<span class=
-    "arg">scale_factor</span>) -&gt; <em>anImage</em></p>
+    <span class="arg">img</span>.resize(<span class=
+    "arg">scale_factor</span>) -&gt; <em>image</em></p>
   </div>
   <div class="desc">
@@ -1227,12 +1233,12 @@ random_threshold_channel(geom, RedChannel)
   <div class="sig">
     <h3 id="resize_bang">resize!</h3>
-    <p><em>image</em>.resize!(<em>new_width</em>,
+    <p><span class="arg">img</span>.resize!(<em>new_width</em>,
     <em>new_height</em>, <em>filter</em>=<a href=
     "constants.html#FilterTypes">LanczosFilter</a>,
-    <em>support</em>=1.0) -&gt; <em>image</em><br />
-    <span class="arg">image</span>.resize!(<span class=
-    "arg">scale_factor</span>) -&gt; <em>image</em></p>
+    <em>support</em>=1.0) -&gt; <em>self</em><br />
+    <span class="arg">img</span>.resize!(<span class=
+    "arg">scale_factor</span>) -&gt; <em>self</em></p>
   </div>
   <div class="desc">
@@ -1245,45 +1251,179 @@ random_threshold_channel(geom, RedChannel)
     <p>self</p>
   </div>
+  <div class="sig">
+    <h3 id="resize_to_fill">resize_to_fill</h3>
+    <p><span class="arg">img</span>.resize_to_fill(<span class=
+    "arg">width</span> [, <span class="arg">height</span> [,
+    <span class="arg">gravity</span>=<code>CenterGravity</code>]])
+    -&gt; <span class="arg">image</span></p>
+  </div>
+  <div class="desc">
+    <h4>Description</h4>
+    <p>A convenience method. Resize the image to fit within the
+    specified dimensions while retaining the aspect ratio of the
+    original image. If necessary, crop the image in the larger
+    dimension.</p>
+    <h4>Arguments</h4>
+    <dl>
+      <dt>width</dt>
+      <dd>The width of the resulting image in pixels</dd>
+      <dt>height</dt>
+      <dd>(Optional) The height of the resulting image in pixels.
+      If omitted, defaults to <span class="arg">width</span>.</dd>
+      <dt>gravity</dt>
+      <dd>Use this argument to specify which portion of the image
+      to retain when cropping. The value can be any <a href=
+      "constants.html#GravityType">GravityType</a> value. The
+      effect is the same as the <span class="arg">gravity</span>
+      argument to the <a href=
+      "image1.html#crop"><code>crop</code></a> method. The default
+      is <code>CenterGravity</code>.</dd>
+    </dl>
+    <h4>Returns</h4>
+    <p>A new image</p>
+    <h4>Example</h4>
+    <p>In this example, some rows have been cropped from the top
+    and bottom to produce a square thumbnail from a rectangular
+    image without distorting the image.</p>
+    <p class="rollover"><a href=
+    "javascript:popup('resize_to_fill.rb.html')">
+    <!-- This img tag displays the original image when the mouse is over -->
+     <img id="cropless" style="display: none" onmouseout=
+    "this.style.display='none';cropped.style.display='';" src=
+    "ex/images/Flower_Hat.jpg" alt="crop_resize example" title=
+    "Click to see the example script" />
+    <!--  This img tag displays the framed image when the mouse is not over-->
+     <img style=
+    "padding-left:62px; padding-right: 62px; padding-top: 87px;padding-bottom:87px;"
+    id="cropped" onmouseover=
+    "this.style.display='none';cropless.style.display='';" src=
+    "ex/resize_to_fill.jpg" alt="frame example" /></a> <img src=
+    "ex/images/spin.gif" alt="" style="margin-bottom: 230px" title=
+    "Mouse over the example to see the original image" /></p>
+    <h4>See also</h4>
+    <p><a href="image1.html#crop">crop</a>, <a href=
+    "#resize">resize</a>, <a href=
+    "#resize_to_fit">resize_to_fit</a></p>
+    <h4>Notes</h4>
+    <p><code>crop_resized</code> is an alias for this method.</p>
+  </div>
+  <div class="sig">
+    <h3 id="resize_to_fill_bang">resize_to_fill!</h3>
+    <p><span class="arg">img</span>.resize_to_fill!(<span class=
+    "arg">width</span> [, <span class="arg">height</span> [,
+    <span class="arg">gravity</span>=<code>CenterGravity</code>]])
+    -&gt; <em>self</em></p>
+  </div>
+  <div class="desc">
+    <h4>Description</h4>The in-place form of <a href=
+    "#resize_to_fill">resize_to_fill</a>.
+    <h4>Returns</h4>
+    <p>self</p>
+    <h4>See also</h4>
+    <p><a href="image1.html#crop_bang">crop!</a>, <a href=
+    "#resize_bang">resize!</a>, <a href=
+    "#resize_to_fit_bang">resize_to_fit!</a></p>
+    <h4>Notes</h4>
+    <p><code>crop_resized!</code> is an alias for this method.</p>
+  </div>
   <div class="sig">
     <h3 id="resize_to_fit">resize_to_fit</h3>
-    <p><em>image</em>.resize_to_fit(<em>new_width</em>,
-    <em>new_height</em>) -&gt; <em>anImage</em></p>
+    <p><span class="arg">img</span>.resize_to_fit(<span class=
+    "arg">new_width</span> [, <span class="arg">new_height</span>])
+    -&gt; <em>image</em></p>
   </div>
   <div class="desc">
     <h4>Description</h4>
     <p>A convenience method. Resize the image to fit within the
-    specified dimensions while retaining the original aspect
-    ratio.</p>
+    specified dimensions while retaining the original aspect ratio.
+    The image may be shorter or narrower than specified in the
+    smaller dimension but will not be larger than the specified
+    values.</p>
     <h4>Arguments</h4>
     <dl>
-      <dt>new_width, new_height</dt>
+      <dt>new_width</dt>
+      <dd>The maximum width of the resized image.</dd>
+      <dt>new_height</dt>
-      <dd>The maximum width and height of the resized image. In
-      order to retain the aspect ratio of the input image, the
-      actual dimensions of the resized image may be different but
-      will not be larger than the specified values.</dd>
+      <dd>(Optional) The maximum height of the resized image. If
+      omitted it defaults to the value of <span class=
+      "arg">new_width</span>.</dd>
     </dl>
     <h4>Returns</h4>
     <p>A new image</p>
-    <h4>See also</h4><a href=
-    "image1.html#change_geometry">change_geometry</a>, <a href=
-    "#resize">resize</a>
+    <h4>Example</h4>
+    <p>Compare the result of this example to the result of the
+    <a href="#resize_to_fill">resize_to_fill</a> example above.</p>
+    <p class="rollover"><a href=
+    "javascript:popup('resize_to_fit.rb.html')">
+    <!-- This img tag displays the original image when the mouse is over -->
+     <img id="rtfless" style="display: none" onmouseout=
+    "this.style.display='none';rtf.style.display='';" src=
+    "ex/images/Flower_Hat.jpg" alt="resize_to_fill example" title=
+    "Click to see the example script" />
+    <!--  This img tag displays the framed image when the mouse is not over-->
+     <img style=
+    "padding-left:69px; padding-right: 69px; padding-top: 87px;padding-bottom:87px;"
+    id="rtf" onmouseover=
+    "this.style.display='none';rtfless.style.display='';" src=
+    "ex/resize_to_fit.jpg" alt="frame example" /></a> <img src=
+    "ex/images/spin.gif" alt="" style="margin-bottom: 230px" title=
+    "Mouse over the example to see the original image" /></p>
+    <h4>See also</h4>
+    <p><a href="#resize">resize</a>, <a href=
+    "#resize_to_fill">resize_to_fill</a></p>
   </div>
   <div class="sig">
     <h3 id="resize_to_fit_bang">resize_to_fit!</h3>
-    <p><em>image</em>.resize_to_fit!(<em>new_width</em>,
-    <em>new_height</em>) -&gt; <em>image</em></p>
+    <p><span class="arg">img</span>.resize_to_fit!(<span class=
+    "arg">new_width</span> [, <span class="arg">new_height</span>])
+    -&gt; <em>self</em></p>
   </div>
   <div class="desc">
@@ -1295,14 +1435,19 @@ random_threshold_channel(geom, RedChannel)
     <h4>Returns</h4>
     <p>self</p>
+    <h4>See also</h4>
+    <p><a href="#resize_bang">resize!</a>, <a href=
+    "#resize_to_fill_bang">resize_to_fill!</a></p>
   </div>
   <div class="sig">
     <h3 id="roll">roll</h3>
-    <p><span class="arg">image</span>.roll(<span class=
+    <p><span class="arg">img</span>.roll(<span class=
     "arg">x_offset</span>, <span class="arg">y_offset</span>) -&gt;
-    <em>anImage</em></p>
+    <em>image</em></p>
   </div>
   <div class="desc">
@@ -1348,9 +1493,9 @@ random_threshold_channel(geom, RedChannel)
   <div class="sig">
     <h3 id="rotate">rotate</h3>
-    <p><span class="arg">image</span>.rotate(<span class=
+    <p><span class="arg">img</span>.rotate(<span class=
     "arg">amount</span> [, <span class="arg">qualifier</span>])
-    -&gt; <em>anImage</em></p>
+    -&gt; <em>image</em></p>
   </div>
   <div class="desc">
@@ -1418,9 +1563,9 @@ random_threshold_channel(geom, RedChannel)
   <div class="sig">
     <h3 id="rotate_bang">rotate!</h3>
-    <p><span class="arg">image</span>.rotate!(<span class=
+    <p><span class="arg">img</span>.rotate!(<span class=
     "arg">amount</span> [, <span class="arg">qualifier</span>])
-    -&gt; <em>image</em></p>
+    -&gt; <em>self</em></p>
   </div>
   <div class="desc">
@@ -1438,11 +1583,11 @@ random_threshold_channel(geom, RedChannel)
   <div class="sig">
     <h3 id="sample">sample</h3>
-    <p><span class="arg">image</span>.sample(<span class=
+    <p><span class="arg">img</span>.sample(<span class=
     "arg">new_width</span>, <span class="arg">new_height</span>)
-    -&gt; <span class="arg">anImage</span><br />
-    <span class="arg">image</span>.sample(<span class=
-    "arg">scale_factor</span>) -&gt; <em>anImage</em></p>
+    -&gt; <span class="arg">image</span><br />
+    <span class="arg">img</span>.sample(<span class=
+    "arg">scale_factor</span>) -&gt; <em>image</em></p>
   </div>
   <div class="desc">
@@ -1488,11 +1633,11 @@ random_threshold_channel(geom, RedChannel)
   <div class="sig">
     <h3 id="sample_bang">sample!</h3>
-    <p><span class="arg">image</span>.sample!(<span class=
+    <p><span class="arg">img</span>.sample!(<span class=
     "arg">new_width</span>, <span class="arg">new_height</span>)
-    -&gt; <em>image</em><br />
-    <span class="arg">image</span>.sample!(<span class=
-    "arg">scale_factor</span>) -&gt; <em>image</em></p>
+    -&gt; <em>self</em><br />
+    <span class="arg">img</span>.sample!(<span class=
+    "arg">scale_factor</span>) -&gt; <em>self</em></p>
   </div>
   <div class="desc">
@@ -1508,11 +1653,11 @@ random_threshold_channel(geom, RedChannel)
   <div class="sig">
     <h3 id="scale">scale</h3>
-    <p><span class="arg">image</span>.scale(<span class=
+    <p><span class="arg">img</span>.scale(<span class=
     "arg">new_width</span>, <span class="arg">new_height</span>)
-    -&gt; <em>anImage</em><br />
-    <span class="arg">image</span>.scale(<span class=
-    "arg">scale_factor</span>) -&gt; <em>anImage</em></p>
+    -&gt; <em>image</em><br />
+    <span class="arg">img</span>.scale(<span class=
+    "arg">scale_factor</span>) -&gt; <em>image</em></p>
   </div>
   <div class="desc">
@@ -1557,11 +1702,11 @@ random_threshold_channel(geom, RedChannel)
   <div class="sig">
     <h3 id="scale_bang">scale!</h3>
-    <p><span class="arg">image</span>.scale!(<span class=
+    <p><span class="arg">img</span>.scale!(<span class=
     "arg">new_width</span>, <span class="arg">new_height</span>)
-    -&gt; <em>image</em><br />
-    <span class="arg">image</span>.scale!(<span class=
-    "arg">scale_factor</span>) -&gt; <em>image</em></p>
+    -&gt; <em>self</em><br />
+    <span class="arg">img</span>.scale!(<span class=
+    "arg">scale_factor</span>) -&gt; <em>self</em></p>
   </div>
   <div class="desc">
@@ -1577,12 +1722,12 @@ random_threshold_channel(geom, RedChannel)
   <div class="sig">
     <h3 id="segment">segment</h3>
-    <p>image.segment(<span class=
+    <p><span class="arg">img</span>.segment(<span class=
     "arg">colorspace</span>=RGBColorspace, <span class=
     "arg">cluster_threshold</span>=1.0, <span class=
     "arg">smoothing_threshold</span>=1.5, <span class=
     "arg">verbose</span>=<code>false</code>) -&gt;
-    <em>anImage</em></p>
+    <em>image</em></p>
   </div>
   <div class="desc">
@@ -1629,7 +1774,7 @@ random_threshold_channel(geom, RedChannel)
     <h4>Example</h4>
-    <p><code>segment(Magick::YUVColorspace, 0.4, 0.4)</code></p>
+    <p><code>segment(YUVColorspace, 0.4, 0.4)</code></p>
     <p class="rollover"><a href=
     "javascript:popup('segment.rb.html')"><img src="ex/segment.jpg"
@@ -1647,9 +1792,8 @@ random_threshold_channel(geom, RedChannel)
   <div class="sig">
     <h3 id="separate">separate</h3>
-    <p><span class="arg">Image</span>.separate(<span class=
-    "arg">channel</span>...) -&gt; <span class=
-    "arg">anImageList</span></p>
+    <p>Image.separate(<span class="arg">channel</span>...) -&gt;
+    <span class="arg">imagelist</span></p>
   </div>
   <div class="desc">
@@ -1685,9 +1829,9 @@ random_threshold_channel(geom, RedChannel)
   <div class="sig">
     <h3 id="sepiatone">sepiatone</h3>
-    <p><span class="arg">image</span>.sepiatone(<span class=
+    <p><span class="arg">img</span>.sepiatone(<span class=
     "arg">threshold</span>=QuantumRange) -&gt; <span class=
-    "arg">anImage</span></p>
+    "arg">image</span></p>
   </div>
   <div class="desc">
@@ -1710,7 +1854,7 @@ random_threshold_channel(geom, RedChannel)
     <h4>Returns</h4>
-    <p>self</p>
+    <p>A new image.</p>
     <h4>Example</h4>
@@ -1736,9 +1880,9 @@ random_threshold_channel(geom, RedChannel)
   <div class="sig">
     <h3 id="set_channel_depth">set_channel_depth</h3>
-    <p><span class=
-    "arg">image.</span>set_channel_depth(<span class="arg">channel</span>,
-    <span class="arg">depth</span>) -&gt; <em>self</em></p>
+    <p><span class="arg">img.</span>set_channel_depth(<span class=
+    "arg">channel</span>, <span class="arg">depth</span>) -&gt;
+    <em>self</em></p>
   </div>
   <div class="desc">
@@ -1776,10 +1920,10 @@ random_threshold_channel(geom, RedChannel)
   <div class="sig">
     <h3 id="shade">shade</h3>
-    <p><span class="arg">image</span>.shade(<span class=
+    <p><span class="arg">img</span>.shade(<span class=
     "arg">shading</span>=<code>false</code>, <span class=
     "arg">azimuth</span>=30, <span class="arg">elevation</span>=30)
-    -&gt; <em>anImage</em></p>
+    -&gt; <em>image</em></p>
   </div>
   <div class="desc">
@@ -1833,10 +1977,10 @@ random_threshold_channel(geom, RedChannel)
   <div class="sig">
     <h3 id="shadow">shadow</h3>
-    <p><span class="arg">image</span>.shadow(<span class=
+    <p><span class="arg">img</span>.shadow(<span class=
     "arg">x_offset=4</span>, <span class="arg">y_offset=4</span>,
     <span class="arg">sigma=4.0</span>, <span class=
-    "arg">opacity=1.0</span>) -&gt; <em>anImage</em></p>
+    "arg">opacity=1.0</span>) -&gt; <em>image</em></p>
   </div>
   <div class="desc">
@@ -1908,9 +2052,9 @@ random_threshold_channel(geom, RedChannel)
   <div class="sig">
     <h3 id="sharpen">sharpen</h3>
-    <p><span class="arg">image</span>.sharpen(<span class=
+    <p><span class="arg">img</span>.sharpen(<span class=
     "arg">radius</span>=0.0, <span class="arg">sigma</span>=1.0)
-    -&gt; <em>anImage</em></p>
+    -&gt; <em>image</em></p>
   </div>
   <div class="desc">
@@ -1946,10 +2090,10 @@ random_threshold_channel(geom, RedChannel)
   <div class="sig">
     <h3 id="sharpen_channel">sharpen_channel</h3>
-    <p><span class="arg">image</span>.sharpen_channel( <span class=
+    <p><span class="arg">img</span>.sharpen_channel( <span class=
     "arg">radius</span>, <span class="arg">sigma</span>
     [,<span class="arg">channel</span>...] ) -&gt;
-    <em>anImage</em></p>
+    <em>image</em></p>
   </div>
   <div class="desc">
@@ -1994,9 +2138,9 @@ random_threshold_channel(geom, RedChannel)
   <div class="sig">
     <h3 id="shave">shave</h3>
-    <p><span class="arg">image</span>.shave(<span class=
+    <p><span class="arg">img</span>.shave(<span class=
     "arg">width</span>, <span class="arg">height</span>) -&gt;
-    <em>anImage</em></p>
+    <em>image</em></p>
   </div>
   <div class="desc">
@@ -2046,9 +2190,9 @@ random_threshold_channel(geom, RedChannel)
   <div class="sig">
     <h3 id="shave_bang">shave!</h3>
-    <p><span class="arg">image</span>.shave!(<span class=
+    <p><span class="arg">img</span>.shave!(<span class=
     "arg">width</span>, <span class="arg">height</span>) -&gt;
-    <em>image</em></p>
+    <em>self</em></p>
   </div>
   <div class="desc">
@@ -2064,9 +2208,9 @@ random_threshold_channel(geom, RedChannel)
   <div class="sig">
     <h3 id="shear">shear</h3>
-    <p><span class="arg">image</span>.shear(<span class=
+    <p><span class="arg">img</span>.shear(<span class=
     "arg">x_shear</span>, <span class="arg">y_shear</span>) -&gt;
-    <em>anImage</em></p>
+    <em>image</em></p>
   </div>
   <div class="desc">
@@ -2128,11 +2272,11 @@ random_threshold_channel(geom, RedChannel)
     <p><br />
     <span class=
-    "arg">image</span>.sigmoidal_contrast_channel(<span class=
+    "arg">img</span>.sigmoidal_contrast_channel(<span class=
     "arg">contrast</span>=3.0, <span class=
     "arg">midpoint</span>=50.0, <span class=
     "arg">sharpen</span>=false[,<span class=
-    "arg">channel</span>...]) -&gt; <em>anImage</em></p>
+    "arg">channel</span>...]) -&gt; <em>image</em></p>
   </div>
   <div class="desc">
@@ -2186,8 +2330,8 @@ random_threshold_channel(geom, RedChannel)
   <div class="sig">
     <h3 id="signature">signature</h3>
-    <p><span class="arg">image</span>.signature -&gt;
-    <em>aString</em></p>
+    <p><span class="arg">img</span>.signature -&gt;
+    <em>string</em></p>
   </div>
   <div class="desc">
@@ -2232,9 +2376,9 @@ img.properties &raquo;
   <div class="sig">
     <h3 id="sketch">sketch</h3>
-    <p><span class="arg">image</span>.sketch(<span class=
+    <p><span class="arg">img</span>.sketch(<span class=
     "arg">radius</span>=0.0, <span class="arg">sigma</span>=1.0,
-    <span class="arg">angle</span>=0.0) -&gt; <em>anImage</em></p>
+    <span class="arg">angle</span>=0.0) -&gt; <em>image</em></p>
   </div>
   <div class="desc">
@@ -2277,8 +2421,8 @@ img.properties &raquo;
   <div class="sig">
     <h3 id="solarize">solarize</h3>
-    <p><span class="arg">image</span>.solarize(<span class=
-    "arg">threshold</span>=50) -&gt; <em>anImage</em></p>
+    <p><span class="arg">img</span>.solarize(<span class=
+    "arg">threshold</span>=50) -&gt; <em>image</em></p>
   </div>
   <div class="desc">
@@ -2318,10 +2462,10 @@ img.properties &raquo;
   <div class="sig">
     <h3 id="splice">splice</h3>
-    <p><span class="arg">image</span>.splice(<span class=
+    <p><span class="arg">img</span>.splice(<span class=
     "arg">x</span>, <span class="arg">y</span>, <span class=
     "arg">width</span>, <span class="arg">height</span>[,
-    <span class="arg">color</span>]) -&gt; <em>anImage</em></p>
+    <span class="arg">color</span>]) -&gt; <em>image</em></p>
   </div>
   <div class="desc">
@@ -2387,8 +2531,8 @@ img.properties &raquo;
   <div class="sig">
     <h3 id="spread">spread</h3>
-    <p><span class="arg">image</span>.spread(<span class=
-    "arg">radius</span>=3) -&gt; <em>anImage</em></p>
+    <p><span class="arg">img</span>.spread(<span class=
+    "arg">radius</span>=3) -&gt; <em>image</em></p>
   </div>
   <div class="desc">
@@ -2420,9 +2564,9 @@ img.properties &raquo;
   <div class="sig">
     <h3 id="stegano">stegano</h3>
-    <p><span class="arg">image</span>.stegano(<span class=
+    <p><span class="arg">img</span>.stegano(<span class=
     "arg">watermark</span>, <span class="arg">offset</span>) -&gt;
-    <em>anImage</em></p>
+    <em>image</em></p>
   </div>
   <div class="desc">
@@ -2481,8 +2625,8 @@ img.properties &raquo;
   <div class="sig">
     <h3 id="stereo">stereo</h3>
-    <p><span class="arg">image</span>.stereo(<span class=
-    "arg">offset_image</span>) -&gt; <em>anImage</em></p>
+    <p><span class="arg">img</span>.stereo(<span class=
+    "arg">offset_image</span>) -&gt; <em>image</em></p>
   </div>
   <div class="desc">
@@ -2510,7 +2654,7 @@ img.properties &raquo;
   <div class="sig">
     <h3 id="store_pixels">store_pixels</h3>
-    <p><span class="arg">image</span>.store_pixels(<span class=
+    <p><span class="arg">img</span>.store_pixels(<span class=
     "arg">x</span>, <span class="arg">y</span>, <span class=
     "arg">columns</span>, <span class="arg">rows</span>,
     <span class="arg">pixels</span>) -&gt; <em>image</em></p>
@@ -2568,8 +2712,7 @@ img.properties &raquo;
   <div class="sig">
     <h3 id="strip_bang">strip!</h3>
-    <p><span class="arg">image</span>.strip! -&gt;
-    <em>image</em></p>
+    <p><span class="arg">img</span>.strip! -&gt; <em>self</em></p>
   </div>
   <div class="desc">
@@ -2590,8 +2733,8 @@ img.properties &raquo;
   <div class="sig">
     <h3 id="swirl">swirl</h3>
-    <p><span class="arg">image</span>.swirl(<span class=
-    "arg">degrees</span>) -&gt; <em>anImage</em></p>
+    <p><span class="arg">img</span>.swirl(<span class=
+    "arg">degrees</span>) -&gt; <em>image</em></p>
   </div>
   <div class="desc">
@@ -2632,7 +2775,7 @@ img.properties &raquo;
   <div class="sig">
     <h3 id="sync_profiles">sync_profiles</h3>
-    <p><span class="arg">image</span>.sync_profiles -&gt;
+    <p><span class="arg">img</span>.sync_profiles -&gt;
     <code>true</code> or <code>false</code></p>
   </div>
@@ -2661,9 +2804,9 @@ img.properties &raquo;
     <h3 id="texture_fill_to_border">texture_fill_to_border</h3>
     <p><span class=
-    "arg">image</span>.texture_fill_to_border(<span class=
+    "arg">img</span>.texture_fill_to_border(<span class=
     "arg">x</span>, <span class="arg">y</span>, <span class=
-    "arg">texture</span>) -&gt; <em>anImage</em></p>
+    "arg">texture</span>) -&gt; <em>image</em></p>
   </div>
   <div class="desc">
@@ -2728,10 +2871,9 @@ img.properties &raquo;
   <div class="sig">
     <h3 id="texture_floodfill">texture_floodfill</h3>
-    <p><span class=
-    "arg">image</span>.texture_floodfill(<span class="arg">x</span>,
-    <span class="arg">y</span>, <span class="arg">texture</span>)
-    -&gt; <em>anImage</em></p>
+    <p><span class="arg">img</span>.texture_floodfill(<span class=
+    "arg">x</span>, <span class="arg">y</span>, <span class=
+    "arg">texture</span>) -&gt; <em>image</em></p>
   </div>
   <div class="desc">
@@ -2795,8 +2937,8 @@ img.properties &raquo;
   <div class="sig">
     <h3 id="threshold">threshold</h3>
-    <p><span class="arg">image</span>.threshold(<span class=
-    "arg">threshold</span>) -&gt; <em>anImage</em></p>
+    <p><span class="arg">img</span>.threshold(<span class=
+    "arg">threshold</span>) -&gt; <em>image</em></p>
   </div>
   <div class="desc">
@@ -2817,7 +2959,7 @@ img.properties &raquo;
     <h4>Example</h4>
-    <p><code>threshold(Magick::MaxRGB*0.55)</code></p>
+    <p><code>threshold(MaxRGB*0.55)</code></p>
     <p class="rollover"><a href=
     "javascript:popup('threshold.rb.html')"><img src=
@@ -2845,11 +2987,11 @@ img.properties &raquo;
   <div class="sig">
     <h3 id="thumbnail">thumbnail</h3>
-    <p><span class="arg">image</span>.thumbnail(<span class=
+    <p><span class="arg">img</span>.thumbnail(<span class=
     "arg">new_width</span>, <span class="arg">new_height</span>)
-    -&gt; <em>anImage</em><br />
-    <span class="arg">image</span>.thumbnail(<span class=
-    "arg">scale_factor</span>) -&gt; <em>anImage</em></p>
+    -&gt; <em>image</em><br />
+    <span class="arg">img</span>.thumbnail(<span class=
+    "arg">scale_factor</span>) -&gt; <em>image</em></p>
   </div>
   <div class="desc">
@@ -2882,7 +3024,7 @@ img.properties &raquo;
     <h4>Example</h4>
     <pre>
-img = Magick::Image.read("images/Cheetah.jpg").first
+img = Image.read("images/Cheetah.jpg").first
 thumbnail = img.thumbnail(img.columns*0.09, img.rows*0.09)
 </pre>
@@ -2900,11 +3042,11 @@ thumbnail = img.thumbnail(img.columns*0.09, img.rows*0.09)
   <div class="sig">
     <h3 id="thumbnail_bang">thumbnail!</h3>
-    <p><span class="arg">image</span>.thumbnail!(<span class=
+    <p><span class="arg">img</span>.thumbnail!(<span class=
     "arg">new_width</span>, <span class="arg">new_height</span>)
-    -&gt; <em>image</em><br />
-    <span class="arg">image</span>.thumbnail!(<span class=
-    "arg">scale_factor</span>) -&gt; <em>image</em></p>
+    -&gt; <em>self</em><br />
+    <span class="arg">img</span>.thumbnail!(<span class=
+    "arg">scale_factor</span>) -&gt; <em>self</em></p>
   </div>
   <div class="desc">
@@ -2920,8 +3062,8 @@ thumbnail = img.thumbnail(img.columns*0.09, img.rows*0.09)
   <div class="sig">
     <h3 id="to_blob">to_blob</h3>
-    <p><span class="arg">image</span>.to_blob <span class="arg">[ {
-    optional arguments } ]</span>-&gt; <em>aString</em></p>
+    <p><span class="arg">img</span>.to_blob <span class="arg">[ {
+    optional arguments } ]</span>-&gt; <em>string</em></p>
   </div>
   <div class="desc">
@@ -2964,8 +3106,8 @@ thumbnail = img.thumbnail(img.columns*0.09, img.rows*0.09)
   <div class="sig">
     <h3 id="to_color">to_color</h3>
-    <p><span class="arg">image</span>.to_color(<span class=
-    "arg">aPixel</span>) -&gt; <em>aString</em></p>
+    <p><span class="arg">img</span>.to_color(<span class=
+    "arg">pixel</span>) -&gt; <em>string</em></p>
   </div>
   <div class="desc">
@@ -2990,7 +3132,7 @@ thumbnail = img.thumbnail(img.columns*0.09, img.rows*0.09)
 img = Image.read('ex/images/Flower_Hat.jpg').first
 &raquo; ex/images/Flower_Hat.jpg JPEG 200x250 DirectClass 8-bit 9761b
 pixel = img.pixel_color(img.columns/2, img.rows/2)
-&raquo; #&lt;struct Magick::Pixel red=216, green=147, blue=106, opacity=0&gt;
+&raquo; #&lt;struct Pixel red=216, green=147, blue=106, opacity=0&gt;
 img.to_color(pixel)
 &raquo; "#D8936A"
 </pre>
@@ -3007,10 +3149,10 @@ img.to_color(pixel)
   <div class="sig">
     <h3 id="transparent">transparent</h3>
-    <p><span class="arg">image</span>.transparent(<span class=
+    <p><span class="arg">img</span>.transparent(<span class=
     "arg">color</span>, <span class=
-    "arg">opacity</span>=Magick::TransparentOpacity) -&gt;
-    <em>anImage</em></p>
+    "arg">opacity</span>=TransparentOpacity) -&gt;
+    <em>image</em></p>
   </div>
   <div class="desc">
@@ -3073,8 +3215,8 @@ img.to_color(pixel)
   <div class="sig">
     <h3 id="transpose">transpose</h3>
-    <p><span class="arg">image</span>.transpose -&gt;
-    <em>anImage</em></p>
+    <p><span class="arg">img</span>.transpose -&gt;
+    <em>image</em></p>
   </div>
   <div class="desc">
@@ -3115,7 +3257,7 @@ img.to_color(pixel)
   <div class="sig">
     <h3 id="transpose_bang">transpose!</h3>
-    <p><span class="arg">image</span>.transpose! -&gt;
+    <p><span class="arg">img</span>.transpose! -&gt;
     <em>self</em></p>
   </div>
@@ -3132,8 +3274,8 @@ img.to_color(pixel)
   <div class="sig">
     <h3 id="transverse">transverse</h3>
-    <p><span class="arg">image</span>.transverse -&gt;
-    <em>anImage</em></p>
+    <p><span class="arg">img</span>.transverse -&gt;
+    <em>image</em></p>
   </div>
   <div class="desc">
@@ -3174,7 +3316,7 @@ img.to_color(pixel)
   <div class="sig">
     <h3 id="transverse_bang">transverse!</h3>
-    <p><span class="arg">image</span>.transverse! -&gt;
+    <p><span class="arg">img</span>.transverse! -&gt;
     <em>self</em></p>
   </div>
@@ -3191,8 +3333,8 @@ img.to_color(pixel)
   <div class="sig">
     <h3 id="trim">trim</h3>
-    <p><span class="arg">image</span>.trim(<span class=
-    "arg">reset</span>=false) -&gt; <em>anImage</em></p>
+    <p><span class="arg">img</span>.trim(<span class=
+    "arg">reset</span>=false) -&gt; <em>image</em></p>
   </div>
   <div class="desc">
@@ -3240,7 +3382,7 @@ img.to_color(pixel)
   <div class="sig">
     <h3 id="trim_bang">trim!</h3>
-    <p><span class="arg">image</span>.trim!(<span class=
+    <p><span class="arg">img</span>.trim!(<span class=
     "arg">reset</span>=false) -&gt; <em>self</em></p>
   </div>
@@ -3255,8 +3397,8 @@ img.to_color(pixel)
   <div class="sig">
     <h3 id="unique_colors">unique_colors</h3>
-    <p><span class="arg">image</span>.unique_colors -&gt;
-    <em>anImage</em></p>
+    <p><span class="arg">img</span>.unique_colors -&gt;
+    <em>image</em></p>
   </div>
   <div class="desc">
@@ -3278,10 +3420,10 @@ img.to_color(pixel)
   <div class="sig">
     <h3 id="unsharp_mask">unsharp_mask</h3>
-    <p><span class="arg">image</span>.unsharp_mask(<span class=
+    <p><span class="arg">img</span>.unsharp_mask(<span class=
     "arg">radius=0.0</span>, <span class="arg">sigma=1.0</span>,
     <span class="arg">amount=1.0</span>, <span class=
-    "arg">threshold=0.05</span>) -&gt; <em>anImage</em></p>
+    "arg">threshold=0.05</span>) -&gt; <em>image</em></p>
   </div>
   <div class="desc">
@@ -3351,11 +3493,11 @@ img.to_color(pixel)
     <h3 id="unsharp_mask_channel">unsharp_mask_channel</h3>
     <p><span class=
-    "arg">image</span>.unsharp_mask_channel(<span class=
+    "arg">img</span>.unsharp_mask_channel(<span class=
     "arg">radius=0.0</span>, <span class="arg">sigma=1.0</span>,
     <span class="arg">amount=1.0</span>, <span class=
     "arg">threshold=0.05</span> [,<span class=
-    "arg">channel</span>...]) -&gt; <em>anImage</em></p>
+    "arg">channel</span>...]) -&gt; <em>image</em></p>
   </div>
   <div class="desc">
@@ -3427,11 +3569,11 @@ img.to_color(pixel)
   <div class="sig">
     <h3 id="view">view</h3>
-    <p><span class="arg">image</span>.view(<span class=
+    <p><span class="arg">img</span>.view(<span class=
     "arg">x</span>, <span class="arg">y</span>, <span class=
     "arg">width</span>, <span class="arg">height</span>) -&gt;
     <em>aView</em><br />
-    <span class="arg">image</span>.view(<span class="arg">x</span>,
+    <span class="arg">img</span>.view(<span class="arg">x</span>,
     <span class="arg">y</span>, <span class="arg">width</span>,
     <span class="arg">height</span>) {&nbsp;|view|
     <em>block</em>&nbsp;} -&gt; <em>nil</em></p>
@@ -3461,7 +3603,7 @@ img.to_color(pixel)
       <dt>width, height</dt>
       <dd>The width and height of the view. The view may not extend
-      past the boundaries of <span class="arg">image</span>.</dd>
+      past the boundaries of <span class="arg">img</span>.</dd>
     </dl>
     <h4>Returns</h4>
@@ -3534,10 +3676,10 @@ end
   <div class="sig">
     <h3 id="vignette">vignette</h3>
-    <p>image.vignette(<span class="arg">x</span>, <span class=
-    "arg">y</span>, <span class="arg">radius</span>=0.0,
-    <span class="arg">sigma</span>=10.0) -&gt; <span class=
-    "arg">anImage</span></p>
+    <p><span class="arg">img</span>.vignette(<span class=
+    "arg">x</span>, <span class="arg">y</span>, <span class=
+    "arg">radius</span>=0.0, <span class="arg">sigma</span>=10.0)
+    -&gt; <span class="arg">image</span></p>
   </div>
   <div class="desc">
@@ -3556,7 +3698,7 @@ end
       "arg">x</span> make the vignette narrower. This argument
       should be positive and less than image.columns / 2. This
       argument is optional. If omitted, the default value is 0.10 *
-      <span class="arg">image</span>.columns.</dd>
+      <span class="arg">img</span>.columns.</dd>
       <dt>y</dt>
@@ -3565,7 +3707,7 @@ end
       the vignette shorter. This argument should be positive and
       less than image.rows / 2. This argument is optional. If
       omitted, the default value is 0.10 * <span class=
-      "arg">image</span>.rows.</dd>
+      "arg">img</span>.rows.</dd>
       <dt>radius, sigma</dt>
@@ -3610,16 +3752,16 @@ end
   <div class="sig">
     <h3 id="watermark">watermark</h3>
-    <p><span class="arg">image</span>.watermark(<span class=
+    <p><span class="arg">img</span>.watermark(<span class=
     "arg">mark</span>, <span class="arg">lightness</span>=1.0,
     <span class="arg">saturation</span>=1.0, <span class=
     "arg">x_offset</span>=0, <span class="arg">y_offset</span>=0)
-    -&gt; <em>anImage</em><br />
-    <span class="arg">image</span>.watermark(<span class=
+    -&gt; <em>image</em><br />
+    <span class="arg">img</span>.watermark(<span class=
     "arg">mark</span>, <span class="arg">lightness</span>=1.0,
     <span class="arg">saturation</span>=1.0, <span class=
     "arg">gravity</span>, <span class="arg">x_offset</span>=0,
-    <span class="arg">y_offset</span>=0) -&gt; <em>anImage</em></p>
+    <span class="arg">y_offset</span>=0) -&gt; <em>image</em></p>
   </div>
   <div class="desc">
@@ -3767,9 +3909,9 @@ end
   <div class="sig">
     <h3 id="wave">wave</h3>
-    <p><span class="arg">image</span>.wave(<span class=
+    <p><span class="arg">img</span>.wave(<span class=
     "arg">amplitude</span>=25.0, <span class=
-    "arg">wavelength</span>=150.0) -&gt; <em>anImage</em></p>
+    "arg">wavelength</span>=150.0) -&gt; <em>image</em></p>
   </div>
   <div class="desc">
@@ -3815,9 +3957,9 @@ end
   <div class="sig">
     <h3 id="wet_floor">wet_floor</h3>
-    <p><span class="arg">image</span>.wet_floor(<span class=
+    <p><span class="arg">img</span>.wet_floor(<span class=
     "arg">intial=0.5</span>, <span class="arg">rate=1.0</span>)
-    -&gt; <em>anImage</em></p>
+    -&gt; <em>image</em></p>
   </div>
   <div class="desc">
@@ -3881,11 +4023,11 @@ end
   <div class="sig">
     <h3 id="white_threshold">white_threshold</h3>
-    <p><span class="arg">image</span>.white_threshold(<span class=
+    <p><span class="arg">img</span>.white_threshold(<span class=
     "arg">red_channel</span> [, <span class=
     "arg">green_channel</span>[, <span class=
     "arg">blue_channel</span>[, <span class=
-    "arg">opacity_channel</span>]]]) -&gt; <em>anImage</em></p>
+    "arg">opacity_channel</span>]]]) -&gt; <em>image</em></p>
   </div>
   <div class="desc">
@@ -3923,12 +4065,12 @@ end
   <div class="sig">
     <h3 id="write">write</h3>
-    <p><span class="arg">image</span>.write(<span class=
+    <p><span class="arg">img</span>.write(<span class=
     "arg">filename</span>) <span class="arg">[ { optional arguments
-    } ]</span> -&gt; <span class="arg">image</span><br />
-    <span class="arg">image</span>.write(<span class=
+    } ]</span> -&gt; <em>self</em><br />
+    <span class="arg">img</span>.write(<span class=
     "arg">file</span>) <span class="arg">[ { optional arguments }
-    ]</span> -&gt; <em>image</em></p>
+    ]</span> -&gt; <em>self</em></p>
   </div>
   <div class="desc">