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/ChangeLog CHANGED Viewed

@@ -1,3 +1,12 @@
+RMagick 2.1.0
+    o Added Image::Info#caption= attribute
+    o Rename Image#crop_resized, #crop_resized! to #resize_to_fill,
+      #resize_to_fill!. Add aliases for the old names.
+    o Fix bug #16776, in the axes.rb example the last 2 arguments to
+      border.rectangle are swapped (bug report by Alain Feler)
+    o Fix bug #16931, apostrophe in #error directive causes error in some
+      versions of GCC (bug report by Justin Dossey)
 RMagick 2.0.0
     o Replaced configure/make/make install with standard Ruby setup.rb,
       extconf.rb

data/README.html CHANGED Viewed

@@ -1,14 +1,14 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
   <head>
-    <title>RMagick 2.0.0 README</title>
+    <title>RMagick 2.1.0 README</title>
     <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
     <meta name="GENERATOR" content="BlueCloth">
   </head>
   <body>
-<h1>RMagick 2.0.0 README</h1>
+<h1>RMagick 2.1.0 README</h1>
-<h2>12/27/07</h2>
+<h2>01/09/08</h2>
 <h2>Table Of Contents</h2>
@@ -40,13 +40,13 @@ ImageMagick image processing library.</p>
 <p><strong>Author:</strong> Tim Hunter</p>
-<p><strong>Email:</strong> <a href="m&#x61;&#105;&#108;t&#111;:&#x72;&#x6D;&#x61;&#x67;&#x69;&#x63;&#107;&#064;ru&#098;&#121;&#102;&#111;&#114;g&#101;&#x2E;&#x6F;&#114;&#103;">&#x72;&#x6D;&#x61;&#x67;&#x69;&#x63;&#107;&#064;ru&#098;&#121;&#102;&#111;&#114;g&#101;&#x2E;&#x6F;&#114;&#103;</a></p>
+<p><strong>Email:</strong> <a href="&#x6D;&#x61;&#x69;&#108;&#116;&#111;:&#x72;&#109;&#x61;&#x67;&#105;&#099;&#x6B;&#x40;&#114;&#117;&#x62;&#x79;&#x66;&#111;&#114;&#103;&#101;&#046;&#111;r&#x67;">&#x72;&#109;&#x61;&#x67;&#105;&#099;&#x6B;&#x40;&#114;&#117;&#x62;&#x79;&#x66;&#111;&#114;&#103;&#101;&#046;&#111;r&#x67;</a></p>
 <p><strong>RubyForge:</strong> <a href="http://rubyforge.org/projects/rmagick/">http://rubyforge.org/projects/rmagick/</a></p>
 <h2 id="new">What's new?</h2>
-<p>RMagick 2.0.0 incorporates all changes and bug fixes from RMagick 1.15.12.
+<p>RMagick 2.1.0 incorporates all changes and bug fixes from RMagick 1.15.12.
 Additionally,</p>
 <ul>
@@ -84,7 +84,7 @@ instead.</li>
 <h2 id="install">Installation</h2>
-<p>The installation procedure for RMagick 2.0.0 is different from that used
+<p>The installation procedure for RMagick 2.1.0 is different from that used
 in earlier releases. Before installing RMagick, you must install ImageMagick.
 Complete and up-to-date instructions for installing ImageMagick on Linux,
 *BSD, and other *nix-type O/S's are available
@@ -94,7 +94,7 @@ on OS X are available at <a href="http://rmagick.rubyforge.org/install-osx.html"
 steps 1 and 2. After installing
 ImageMagick, use the instructions in the next section to install RMagick.</p>
-<h2 id="install">Installing RMagick 2.0.0</h2>
+<h2 id="install">Installing RMagick 2.1.0</h2>
 <p>This release of RMagick uses Minero Aoki's setup.rb script for installation.
 See the next section for configuration options. Usually you do not need to
@@ -104,15 +104,15 @@ his web site <a href="http://i.loveruby.net">http://i.loveruby.net</a></p>
 <p>I assume you've already decompressed the tarball, or you wouldn't be reading
 this. If you have not decompressed the tarball, do so with this command:</p>
-<pre><code>tar xvzf RMagick-2.0.0-tar.gz
+<pre><code>tar xvzf RMagick-2.1.0-tar.gz
 </code></pre>
 <p>or</p>
-<pre><code>tar xvjf RMagick-2.0.0-tar.bz2
+<pre><code>tar xvjf RMagick-2.1.0-tar.bz2
 </code></pre>
-<p>Change to the RMagick-2.0.0 directory. If you are not using any
+<p>Change to the RMagick-2.1.0 directory. If you are not using any
 configuration options (usually you don't need to) enter the command</p>
 <pre><code>ruby setup.rb
@@ -179,9 +179,9 @@ the problem. Also see <a href="http://rmagick.rubyforge.org/install-faq.html#lib
 <p>When make is running the examples, if you get a message like this:</p>
-<pre><code>/home/you/RMagick-2.0.0/lib/RMagick.rb:11:in `require': libMagick.so.0:
+<pre><code>/home/you/RMagick-2.1.0/lib/RMagick.rb:11:in `require': libMagick.so.0:
   cannot open shared object file: No such file or directory -
-  /home/you/RMagick-2.0.0/ext/RMagick/RMagick.so (LoadError)
+  /home/you/RMagick-2.1.0/ext/RMagick/RMagick.so (LoadError)
 </code></pre>
 <p>you probably do not have the directory in which the ImageMagick library
@@ -201,7 +201,7 @@ systems, see the documentation for the dynamic loading facility.</p>
 <p>When make is running the examples, if you get a message like this:</p>
-<pre><code>hook /home/me/src/RMagick-2.0.0/./post-setup.rb failed:
+<pre><code>hook /home/me/src/RMagick-2.1.0/./post-setup.rb failed:
 No such file or directory - "/tmp/rmagick6872.6"
 </code></pre>

data/README.txt CHANGED Viewed

@@ -1,6 +1,6 @@
-RMagick 2.0.0 README
+RMagick 2.1.0 README
 ================================
-12/27/07
+01/09/08
 --------
 Table Of Contents
@@ -35,7 +35,7 @@ __Email:__ <rmagick@rubyforge.org>
 __RubyForge:__ <http://rubyforge.org/projects/rmagick/>
 <h2 id="new">What's new?</h2>
-RMagick 2.0.0 incorporates all changes and bug fixes from RMagick 1.15.12.
+RMagick 2.1.0 incorporates all changes and bug fixes from RMagick 1.15.12.
 Additionally,
 * The installation procedure is pure Ruby.
@@ -71,7 +71,7 @@ __ImageMagick__ 6.3.0 or later.  You can get ImageMagick from
 <h2 id="install">Installation</h2>
-The installation procedure for RMagick 2.0.0 is different from that used
+The installation procedure for RMagick 2.1.0 is different from that used
 in earlier releases. Before installing RMagick, you must install ImageMagick.
 Complete and up-to-date instructions for installing ImageMagick on Linux,
 *BSD, and other *nix-type O/S's are available
@@ -81,7 +81,7 @@ on OS X are available at <http://rmagick.rubyforge.org/install-osx.html>,
 steps 1 and 2. After installing
 ImageMagick, use the instructions in the next section to install RMagick.
-<h2 id="install">Installing RMagick 2.0.0</h2>
+<h2 id="install">Installing RMagick 2.1.0</h2>
 This release of RMagick uses Minero Aoki's setup.rb script for installation.
 See the next section for configuration options. Usually you do not need to
@@ -91,13 +91,13 @@ his web site <http://i.loveruby.net>
 I assume you've already decompressed the tarball, or you wouldn't be reading
 this. If you have not decompressed the tarball, do so with this command:
-    tar xvzf RMagick-2.0.0-tar.gz
+    tar xvzf RMagick-2.1.0-tar.gz
 or
-    tar xvjf RMagick-2.0.0-tar.bz2
+    tar xvjf RMagick-2.1.0-tar.bz2
-Change to the RMagick-2.0.0 directory. If you are not using any
+Change to the RMagick-2.1.0 directory. If you are not using any
 configuration options (usually you don't need to) enter the command
     ruby setup.rb
@@ -151,9 +151,9 @@ the problem. Also see <http://rmagick.rubyforge.org/install-faq.html#libmagick>.
 #### Cannot open shared object file
 When make is running the examples, if you get a message like this:
-    /home/you/RMagick-2.0.0/lib/RMagick.rb:11:in `require': libMagick.so.0:
+    /home/you/RMagick-2.1.0/lib/RMagick.rb:11:in `require': libMagick.so.0:
       cannot open shared object file: No such file or directory -
-      /home/you/RMagick-2.0.0/ext/RMagick/RMagick.so (LoadError)
+      /home/you/RMagick-2.1.0/ext/RMagick/RMagick.so (LoadError)
 you probably do not have the directory in which the ImageMagick library
 is installed in your load path.  An easy way to fix this is to define
@@ -170,7 +170,7 @@ systems, see the documentation for the dynamic loading facility.
 #### No such file or directory - "/tmp/rmagick6872.6"
 When make is running the examples, if you get a message like this:
-    hook /home/me/src/RMagick-2.0.0/./post-setup.rb failed:
+    hook /home/me/src/RMagick-2.1.0/./post-setup.rb failed:
     No such file or directory - "/tmp/rmagick6872.6"
 you probably do not have a temporary directory environment variable set. Set

data/doc/comtasks.html CHANGED Viewed

@@ -4,9 +4,9 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   <meta name="generator" content=
-  "HTML Tidy for Linux/x86 (vers 1st December 2004), see www.w3.org" />
+  "HTML Tidy for Linux/x86 (vers 1 September 2005), see www.w3.org" />
-  <title>RMagick 2.0.0: Common Tasks</title>
+  <title>RMagick 2.1.0: Common Tasks</title>
   <meta http-equiv="Content-Type" content=
   "text/html; charset=us-ascii" />
   <meta name="GENERATOR" content="Quanta Plus" />
@@ -31,7 +31,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="optequiv.html">Prev</a> | <a href=
@@ -153,6 +153,18 @@ thumb.write "thumb.gif"
   <code>resize</code> if the thumbnail is less than 10% of the size
   of the original image.</p>
+  <h3>flickr-style thumbnails</h3>
+  <p><a href="http://www.flickr.com">flickr</a> thumbnails are 75
+  pixels wide and 75 pixels tall. If the original image isn't
+  square, the thumbnail is cropped in its larger dimension so that
+  the image isn't distorted. You can get make this kind of
+  thumbnail with the <a href=
+  "image3.html#resize_to_fill">resize_to_fill</a> method.</p>
+  <pre class="example">
+thumb = img.resize_to_fill(75, 75)
+</pre>
   <h2 id="resizing">Resizing to a maximum (or minimum) size</h2>
   <p>Say you need to make all your thumbnails no bigger than 64x64
@@ -177,6 +189,15 @@ thumb.write "thumb.gif"
   value from the block. The <code>change_geometry</code> method
   then returns that value to its caller.</p>
+  <h3>Simple thumbnails</h3>
+  <p>If you just want to make sure your thumbnail is no bigger than
+  a certain width and height, use the <a href=
+  "image3.html#resize_to_fit">resize_to_fit</a> method.</p>
+  <pre class="example">
+thumb = img.resize_to_fit(75, 75)
+</pre>
   <h2><a id="blob" name="blob">Writing to or reading from a string
   instead of a file</a></h2>
@@ -255,7 +276,7 @@ img.write("myimage.jpg") { self.quality = 50 }
   </div>
   <hr />
-  <p class="spacer"> </p>
+  <p class="spacer"></p>
   <div class="nav">
     &laquo; <a href="optequiv.html">Prev</a> | <a href=

data/doc/constants.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: Constants</title>
+  <title>RMagick 2.1.0: Constants</title>
   <meta http-equiv="Content-Type" content=
   "text/html; charset=us-ascii" />
   <meta name="GENERATOR" content="Quanta Plus" />
@@ -61,7 +61,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="info.html">Prev</a> | <a href=
@@ -155,13 +155,13 @@
     <dd>An extended form of the <code>Version</code> constant with
     the format shown here:<br />
-    <code>This is RMagick 1.15.0 ($Date: 2007/12/26 21:44:14 $)
-    Copyright (C) 2007 by Timothy P. Hunter<br />
-    Built with ImageMagick 6.2.5 03/05/06 Q8
+    <code>This is RMagick 2.0.0 ($Date: 2008/01/07 00:03:59 $)
+    Copyright (C) 2008 by Timothy P. Hunter<br />
+    Built with ImageMagick 6.3.7 01/05/08 Q16
     http://www.imagemagick.org<br />
-    Built for ruby 1.8.0 (2003-08-04) [i686-linux]<br />
+    Built for ruby 1.8.6<br />
     Web page: http://rmagick.rubyforge.org<br />
-    Email: rmagick@rubyforge.org<br /></code></dd>
+    Email: rmagick@rubyforge.org</code></dd>
     <dt>MagickVersion</dt>
@@ -216,7 +216,7 @@
     <dt>Version</dt>
     <dd>The RMagick version string. This has the form:<br />
-    <code>RMagick major.minor.teeny</code></dd>
+    <code>RMagick 2.0.0</code></dd>
   </dl>
   <h3 class="const" id="AlignType">AlignType</h3>

data/doc/draw.html CHANGED Viewed

@@ -4,9 +4,9 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   <meta name="generator" content=
-  "HTML Tidy for Linux/x86 (vers 1st December 2004), see www.w3.org" />
+  "HTML Tidy for Linux/x86 (vers 1 September 2005), see www.w3.org" />
-  <title>RMagick 2.0.0: class Draw</title>
+  <title>RMagick 2.1.0: class Draw</title>
   <meta http-equiv="Content-Type" content=
   "text/html; charset=us-ascii" />
   <meta name="GENERATOR" content="Quanta Plus" />
@@ -25,7 +25,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="image3.html">Prev</a> | <a href=
@@ -247,8 +247,8 @@
   <div class="sig">
     <h3 id="new">new</h3>
-    <p>Magick::Draw.new <span class="arg">[&nbsp;{ optional
-    parameters }&nbsp;]</span> -&gt; <em>draw</em></p>
+    <p>Draw.new <span class="arg">[&nbsp;{ optional parameters
+    }&nbsp;]</span> -&gt; <em>draw</em></p>
   </div>
   <div class="desc">
@@ -280,7 +280,7 @@ gc = Draw.new
     "arg">height</span>, <span class="arg">x</span>, <span class=
     "arg">y</span>, <span class="arg">text</span>) <span class=
     "arg">[&nbsp;{ additional parameters }&nbsp;]</span> -&gt;
-    <em>draw</em></p>
+    <em>self</em></p>
   </div>
   <div class="desc">
@@ -531,7 +531,8 @@ title.annotate(montage, 0,0,0,40, 'Named Colors') {
   <div class="sig">
     <h3 id="clone">clone</h3>
-    <p><span class="arg">draw</span>.clone -&gt; <em>aDraw</em></p>
+    <p><span class="arg">draw</span>.clone -&gt;
+    <em>other_draw</em></p>
   </div>
   <div class="desc">
@@ -549,7 +550,7 @@ title.annotate(montage, 0,0,0,40, 'Named Colors') {
     <h3 id="draw">draw</h3>
     <p><span class="arg">draw</span>.draw(<span class=
-    "arg">img</span>) -&gt; <em>draw</em></p>
+    "arg">img</span>) -&gt; <em>self</em></p>
   </div>
   <div class="desc">
@@ -581,7 +582,8 @@ title.annotate(montage, 0,0,0,40, 'Named Colors') {
   <div class="sig">
     <h3 id="dup">dup</h3>
-    <p><span class="arg">draw</span>.dup -&gt; <em>aDraw</em></p>
+    <p><span class="arg">draw</span>.dup -&gt;
+    <em>other_draw</em></p>
   </div>
   <div class="desc">
@@ -605,16 +607,16 @@ title.annotate(montage, 0,0,0,40, 'Named Colors') {
     <p><span class=
     "arg">draw</span>.get_multiline_type_metrics([<span class=
-    "arg">anImage</span>,] <span class="arg">aString</span>) -&gt;
-    <em>aTypeMetric</em></p>
+    "arg">image</span>,] <span class="arg">string</span>) -&gt;
+    <em>type_metrics</em></p>
   </div>
   <div class="sig">
     <h3 id="get_type_metrics">get_type_metrics</h3>
     <p><span class="arg">draw</span>.get_type_metrics([<span class=
-    "arg">anImage</span>,] <span class="arg">aString</span>) -&gt;
-    <em>aTypeMetric</em></p>
+    "arg">image</span>,] <span class="arg">string</span>) -&gt;
+    <em>type_metrics</em></p>
   </div>
   <div class="desc">
@@ -680,22 +682,21 @@ title.annotate(montage, 0,0,0,40, 'Named Colors') {
       <dt>string</dt>
       <dd>The string to be rendered. If <span class=
-      "arg">image</span> is specified, the string may contain
-      special characters that refer to the image attributes. See
-      <a href="#spec_chars_table">this</a> table.</dd>
+      "arg">img</span> is specified, the string may contain special
+      characters that refer to the image attributes. See <a href=
+      "#spec_chars_table">this</a> table.</dd>
     </dl>
     <h4>Returns</h4>
-    <p>A Magick::TypeMetric struct. This structure has the
-    following attributes. (The descriptions are taken from the
-    <a href=
+    <p>A TypeMetric struct. This structure has the following
+    attributes. (The descriptions are taken from the <a href=
     "http://www.imagemagick.org/Magick++/TypeMetric.html">Magick++</a>
     documentation and source code.)</p>
     <table summary="type metric attributes" class="simple_table">
       <caption>
-        Magick::TypeMetric attributes
+        TypeMetric attributes
       </caption>
       <tr>
@@ -767,13 +768,13 @@ title.annotate(montage, 0,0,0,40, 'Named Colors') {
     <h3 id="inspect">inspect</h3>
     <p><span class="arg">draw</span>.inspect -&gt;
-    <em>draw</em></p>
+    <em>string</em></p>
   </div>
   <div class="desc">
     <h4>Description</h4>
-    <p>Displays the list of primitives that have been added to the
+    <p>Returns the list of primitives that have been added to the
     <code>draw</code> object. This is very handy for debugging.</p>
     <h4>Example</h4>
@@ -795,7 +796,7 @@ draw.inspect &raquo;
     <h3 id="affine">affine</h3>
     <p><span class="arg">draw</span>.affine(<span class="arg">sx,
-    rx, ry, sy, tx, ty</span>) -&gt; <em>draw</em></p>
+    rx, ry, sy, tx, ty</span>) -&gt; <em>self</em></p>
   </div>
   <div class="desc">
@@ -851,7 +852,7 @@ draw.inspect &raquo;
     <p><span class="arg">draw</span>.arc(<span class="arg">start_x,
     start_y, end_x, end_y, start_degrees, end_degrees</span>) -&gt;
-    <em>draw</em></p>
+    <em>self</em></p>
   </div>
   <div class="desc">
@@ -903,7 +904,7 @@ draw.inspect &raquo;
     "arg">cx1</span>, <span class="arg">cy1</span>, <span class=
     "arg">cx2</span>, <span class="arg">cy2</span>, <span class=
     "arg">x2</span>, <span class="arg">y2</span>...) -&gt;
-    <em>draw</em></p>
+    <em>self</em></p>
   </div>
   <div class="desc">
@@ -989,7 +990,7 @@ draw.inspect &raquo;
     <p><span class="arg">draw</span>.circle(<span class=
     "arg">origin_x, origin_y, perim_x, perim_y</span>) -&gt;
-    <em>draw</em></p>
+    <em>self</em></p>
   </div>
   <p>self</p>
@@ -1028,7 +1029,7 @@ draw.inspect &raquo;
     <h3 id="clip_path">clip_path</h3>
     <p><span class="arg">draw</span>.clip_path(<span class=
-    "arg">pathname</span>) -&gt; <em>draw</em></p>
+    "arg">pathname</span>) -&gt; <em>self</em></p>
   </div>
   <div class="desc">
@@ -1081,7 +1082,7 @@ gc.draw
     <p><span class=
     "arg">draw</span>.clip_rule(<code>"evenodd"</code> or
-    <code>"nonzero"</code>) -&gt; <em>draw</em></p>
+    <code>"nonzero"</code>) -&gt; <em>self</em></p>
   </div>
   <div class="desc">
@@ -1109,7 +1110,7 @@ gc.draw
     <p><span class=
     "arg">draw</span>.clip_units(<code>"userSpace"</code>
     <span class="arg">or</span> <code>"userSpaceOnUse"</code> or
-    <code>"objectSpace"</code>) -&gt; <em>draw</em></p>
+    <code>"objectSpace"</code>) -&gt; <em>self</em></p>
   </div>
   <div class="desc">
@@ -1136,7 +1137,7 @@ gc.draw
     <p><span class="arg">draw</span>.color(<span class=
     "arg">x</span>, <span class="arg">y</span>, <span class=
-    "arg">aPaintMethod</span>) -&gt; <em>draw</em></p>
+    "arg">paint_method</span>) -&gt; <em>self</em></p>
   </div>
   <div class="desc">
@@ -1160,7 +1161,7 @@ gc.draw
     <h4>Example</h4>
     <pre>
   draw.border_color = 'black'
-  draw.color(x, y, Magick::FillToBorderMethod)
+  draw.color(x, y, FillToBorderMethod)
 </pre>
     <h4>See Also</h4>
@@ -1175,8 +1176,8 @@ gc.draw
     "arg">x</span>, <span class="arg">y</span>, <span class=
     "arg">width</span>, <span class="arg">height</span>,
     <span class="arg">composite_image</span>, <span class=
-    "arg">op</span>=<code>Magick::OverCompositeOp</code>) -&gt;
-    <em>draw</em></p>
+    "arg">op</span>=<code>OverCompositeOp</code>) -&gt;
+    <em>self</em></p>
   </div>
   <div class="desc">
@@ -1236,7 +1237,7 @@ gc.draw
     <h3 id="decorate">decorate</h3>
     <p><span class="arg">draw</span>.decorate(<span class=
-    "arg">aDecorationType</span>) -&gt; <em>draw</em></p>
+    "arg">decoration</span>) -&gt; <em>self</em></p>
   </div>
   <div class="desc">
@@ -1255,7 +1256,7 @@ gc.draw
     <h4>Example</h4>
     <pre>
-draw.decorate(Magick::LineThroughDecoration)
+draw.decorate(LineThroughDecoration)
 </pre>
   </div>
@@ -1263,8 +1264,8 @@ draw.decorate(Magick::LineThroughDecoration)
     <h3 id="define_clip_path">define_clip_path</h3>
     <p><span class="arg">draw</span>.define_clip_path(<span class=
-    "arg">aString</span>) { <span class="arg">block</span> } -&gt;
-    <em>draw</em></p>
+    "arg">string</span>) { <span class="arg">block</span> } -&gt;
+    <em>self</em></p>
   </div>
   <div class="desc">
@@ -1302,7 +1303,7 @@ draw.decorate(Magick::LineThroughDecoration)
     "arg">origin_y</span>, <span class="arg">width</span>,
     <span class="arg">height</span>, <span class=
     "arg">arc_start</span>, <span class="arg">arc_end</span>) -&gt;
-    <em>draw</em></p>
+    <em>self</em></p>
   </div>
   <div class="desc">
@@ -1351,7 +1352,7 @@ draw.decorate(Magick::LineThroughDecoration)
     <h3 id="encoding">encoding</h3>
     <p><span class="arg">draw</span>.encoding(<span class=
-    "arg">aString</span>) -&gt; <em>draw</em></p>
+    "arg">string</span>) -&gt; <em>self</em></p>
   </div>
   <div class="desc">
@@ -1374,7 +1375,7 @@ draw.decorate(Magick::LineThroughDecoration)
     <h3 id="fill">fill</h3>
     <p><span class="arg">draw</span>.fill(<span class=
-    "arg">aString</span>) -&gt; <em>draw</em></p>
+    "arg">string</span>) -&gt; <em>self</em></p>
   </div>
   <div class="desc">
@@ -1406,8 +1407,7 @@ draw.decorate(Magick::LineThroughDecoration)
     <h3 id="fill_opacity">fill_opacity</h3>
     <p><span class="arg">draw</span>.fill_opacity(<span class=
-    "arg">aFloat</span> or <em>aString</em>) -&gt;
-    <em>draw</em></p>
+    "arg">float</span> or <em>string</em>) -&gt; <em>self</em></p>
   </div>
   <div class="desc">
@@ -1438,7 +1438,7 @@ draw.decorate(Magick::LineThroughDecoration)
     <p><span class=
     "arg">draw</span>.fill_rule(<code>"evenodd"</code> or
-    <code>"nonzero"</code>) -&gt; <em>draw</em></p>
+    <code>"nonzero"</code>) -&gt; <em>self</em></p>
   </div>
   <div class="desc">
@@ -1463,9 +1463,8 @@ draw.decorate(Magick::LineThroughDecoration)
   <div class="sig">
     <h3 id="font">font</h3>
-    <p><span class=
-    "arg"><em>draw</em>.font(<em>aString</em>)</span> -&gt;
-    <em>draw</em></p>
+    <p><span class="arg">draw</span>.font(<span class=
+    "arg">string</span>) -&gt; <em>self</em></p>
   </div>
   <div class="desc">
@@ -1496,7 +1495,7 @@ draw.decorate(Magick::LineThroughDecoration)
     <h3 id="font_family">font_family</h3>
     <p><span class="arg">draw</span>.font_family(<span class=
-    "arg">aString</span>) -&gt; draw</p>
+    "arg">string</span>) -&gt; <em>self</em></p>
   </div>
   <div class="desc">
@@ -1521,7 +1520,7 @@ draw.decorate(Magick::LineThroughDecoration)
     <h3 id="font_stretch">font_stretch</h3>
     <p><span class="arg">draw</span>.font_stretch(<span class=
-    "arg">aStretchType</span>) -&gt; <em>draw</em></p>
+    "arg">stretch</span>) -&gt; <em>self</em></p>
   </div>
   <div class="desc">
@@ -1543,7 +1542,7 @@ draw.decorate(Magick::LineThroughDecoration)
     <h3 id="font_style">font_style</h3>
     <p><span class="arg">draw</span>.font_style(<span class=
-    "arg">aStyleType</span>) -&gt; <em>draw</em></p>
+    "arg">style</span>) -&gt; <em>self</em></p>
   </div>
   <div class="desc">
@@ -1565,7 +1564,7 @@ draw.decorate(Magick::LineThroughDecoration)
     <h3 id="font_weight">font_weight</h3>
     <p><span class="arg">draw</span>.font_weight(<span class=
-    "arg">aWeightType</span>) -&gt; <em>draw</em></p>
+    "arg">weight</span>) -&gt; <em>self</em></p>
   </div>
   <div class="desc">
@@ -1589,14 +1588,14 @@ draw.decorate(Magick::LineThroughDecoration)
     <h3 id="gravity">gravity</h3>
     <p><span class="arg">draw</span>.gravity(<span class=
-    "arg">aGravityType</span>) -&gt; <em>draw</em></p>
+    "arg">gravity</span>) -&gt; <em>self</em></p>
   </div>
   <div class="desc">
     <h4>Description</h4>
     <p>Specify how the text is positioned. The default is
-    <code>Magick::NorthWestGravity</code>.</p>
+    <code>NorthWestGravity</code>.</p>
     <h4>Arguments</h4>
@@ -1624,7 +1623,7 @@ draw.decorate(Magick::LineThroughDecoration)
     <p><span class="arg">draw</span>.line(<span class=
     "arg">here_x</span>, <span class="arg">here_y</span>,
     <span class="arg">there_x</span>, <span class=
-    "arg">there_y</span>) -&gt; <em>draw</em></p>
+    "arg">there_y</span>) -&gt; <em>self</em></p>
   </div>
   <div class="desc">
@@ -1664,7 +1663,7 @@ draw.decorate(Magick::LineThroughDecoration)
     <p><span class="arg">draw</span>.matte(<span class=
     "arg">x</span>,<span class="arg">y</span>, <span class=
-    "arg">aPaintMethod</span>) -&gt; <em>draw</em></p>
+    "arg">paint_method</span>) -&gt; <em>self</em></p>
   </div>
   <div class="desc">
@@ -1681,7 +1680,7 @@ draw.decorate(Magick::LineThroughDecoration)
       <dd>Point in image to use, along with the PaintMethod
       constant, to set transparent pixels in the image.</dd>
-      <dt>aPaintMethod</dt>
+      <dt>paint_method</dt>
       <dd>
         One of the following <a href=
@@ -1735,7 +1734,7 @@ draw.decorate(Magick::LineThroughDecoration)
     <h3 id="opacity">opacity</h3>
     <p><span class="arg">draw</span>.opacity(<span class=
-    "arg">opacity</span>) -&gt; <em>draw</em></p>
+    "arg">opacity</span>) -&gt; <em>self</em></p>
   </div>
   <div class="desc">
@@ -1772,7 +1771,7 @@ draw.decorate(Magick::LineThroughDecoration)
     <h3 id="path">path</h3>
     <p><span class="arg">draw</span>.path(<span class=
-    "arg">aString</span>) -&gt; <em>draw</em></p>
+    "arg">string</span>) -&gt; <em>self</em></p>
   </div>
   <div class="desc">
@@ -1835,7 +1834,7 @@ draw.decorate(Magick::LineThroughDecoration)
     "arg">name</span>, <span class="arg">x</span>, <span class=
     "arg">y</span>, <span class="arg">width</span>, <span class=
     "arg">height</span>) { pattern primitives } -&gt;
-    <em>draw</em></p>
+    <em>self</em></p>
   </div>
   <div class="desc">
@@ -1893,7 +1892,7 @@ draw.decorate(Magick::LineThroughDecoration)
     <p><span class="arg">draw</span>.point(<span class=
     "arg">x</span>, <span class="arg">y</span>) -&gt;
-    <em>draw</em></p>
+    <em>self</em></p>
   </div>
   <div class="desc">
@@ -1919,7 +1918,7 @@ draw.decorate(Magick::LineThroughDecoration)
     <h3 id="pointsize">pointsize</h3>
     <p><span class="arg">draw</span>.pointsize(<span class=
-    "arg">anInteger</span>) -&gt; <em>draw</em></p>
+    "arg">integer</span>) -&gt; <em>self</em></p>
   </div>
   <div class="desc">
@@ -1946,7 +1945,7 @@ draw.decorate(Magick::LineThroughDecoration)
     <p><span class="arg">draw</span>.polygon(<span class=
     "arg">x1</span>, <span class="arg">y1</span>,...,<span class=
     "arg">xN</span>, <span class="arg">yN</span>) -&gt;
-    <em>draw</em></p>
+    <em>self</em></p>
   </div>
   <div class="desc">
@@ -1982,7 +1981,8 @@ draw.decorate(Magick::LineThroughDecoration)
     <p><span class="arg">draw</span>.polyline(<span class=
     "arg">x1</span>, <span class="arg">y1</span>,...,<span class=
-    "arg">xN</span>, <span class="arg">yN</span>) -&gt; draw</p>
+    "arg">xN</span>, <span class="arg">yN</span>) -&gt;
+    <em>self</em></p>
   </div>
   <div class="desc">
@@ -2014,7 +2014,7 @@ draw.decorate(Magick::LineThroughDecoration)
   <div class="sig">
     <h3 id="pop">pop</h3>
-    <p><span class="arg">draw</span>.pop -&gt; <em>draw</em></p>
+    <p><span class="arg">draw</span>.pop -&gt; <em>self</em></p>
   </div>
   <div class="desc">
@@ -2033,7 +2033,7 @@ draw.decorate(Magick::LineThroughDecoration)
   <div class="sig">
     <h3 id="push">push</h3>
-    <p><span class="arg">draw</span>.push -&gt; <em>draw</em></p>
+    <p><span class="arg">draw</span>.push -&gt; <em>self</em></p>
   </div>
   <div class="desc">
@@ -2061,7 +2061,8 @@ draw.decorate(Magick::LineThroughDecoration)
     <p><span class="arg">draw</span>.rectangle(<span class=
     "arg">x1</span>, <span class="arg">y1</span>, <span class=
-    "arg">x2</span>, <span class="arg">y2</span>) -&gt; draw</p>
+    "arg">x2</span>, <span class="arg">y2</span>) -&gt;
+    <em>self</em></p>
   </div>
   <div class="desc">
@@ -2097,7 +2098,7 @@ draw.decorate(Magick::LineThroughDecoration)
     <h3 id="rotate">rotate</h3>
     <p><span class="arg">draw</span>.rotate(<span class=
-    "arg">degrees</span>) -&gt; <em>draw</em></p>
+    "arg">degrees</span>) -&gt; <em>self</em></p>
   </div>
   <div class="desc">
@@ -2133,7 +2134,7 @@ draw.decorate(Magick::LineThroughDecoration)
     "arg">x1</span>, <span class="arg">y1</span>, <span class=
     "arg">x2</span>, <span class="arg">y2</span>, <span class=
     "arg">cw</span>, <span class="arg">ch</span>) -&gt;
-    <em>draw</em></p>
+    <em>self</em></p>
   </div>
   <div class="desc">
@@ -2175,7 +2176,7 @@ draw.decorate(Magick::LineThroughDecoration)
     <p><span class="arg">draw</span>.scale(<span class=
     "arg">sx</span>, <span class="arg">sy</span>) -&gt;
-    <em>draw</em></p>
+    <em>self</em></p>
   </div>
   <div class="desc">
@@ -2203,7 +2204,7 @@ draw.decorate(Magick::LineThroughDecoration)
     <h3 id="skewx">skewx</h3>
     <p><span class="arg">draw</span>.skewx(<span class=
-    "arg">aFloat</span>) -&gt; <em>draw</em></p>
+    "arg">float</span>) -&gt; <em>self</em></p>
   </div>
   <div class="desc">
@@ -2235,7 +2236,7 @@ draw.decorate(Magick::LineThroughDecoration)
     <h3 id="skewy">skewy</h3>
     <p><span class="arg">draw</span>.skewy(<span class=
-    "arg">aFloat</span>) -&gt; <em>draw</em></p>
+    "arg">float</span>) -&gt; <em>self</em></p>
   </div>
   <div class="desc">
@@ -2267,7 +2268,7 @@ draw.decorate(Magick::LineThroughDecoration)
     <h3 id="stroke">stroke</h3>
     <p><span class="arg">draw</span>.stroke(<span class=
-    "arg">aString</span>) -&gt; <em>draw</em></p>
+    "arg">string</span>) -&gt; <em>self</em></p>
   </div>
   <div class="desc">
@@ -2293,7 +2294,7 @@ draw.decorate(Magick::LineThroughDecoration)
     <p><span class=
     "arg">draw</span>.stroke_antialias(<code>true</code> or
-    <code>false</code>) -&gt; <em>draw</em></p>
+    <code>false</code>) -&gt; <em>self</em></p>
   </div>
   <div class="desc">
@@ -2308,7 +2309,7 @@ draw.decorate(Magick::LineThroughDecoration)
     <p><span class="arg">draw</span>.stroke_dasharray(<span class=
     "arg">x1</span>,...,<span class="arg">xn</span>) -&gt;
-    <em>draw</em></p>
+    <em>self</em></p>
   </div>
   <div class="desc">
@@ -2350,7 +2351,7 @@ draw.decorate(Magick::LineThroughDecoration)
     <h3 id="stroke_dashoffset">stroke_dashoffset</h3>
     <p><span class="arg">draw</span>.stroke_dashoffset(<span class=
-    "arg">anInteger</span>) -&gt; <em>draw</em></p>
+    "arg">integer</span>) -&gt; <em>self</em></p>
   </div>
   <div class="desc">
@@ -2375,7 +2376,7 @@ draw.decorate(Magick::LineThroughDecoration)
     <h3 id="stroke_linecap">stroke_linecap</h3>
     <p><span class="arg">draw</span>.stroke_linecap(<span class=
-    "arg">aString</span>) -&gt; <em>draw</em></p>
+    "arg">string</span>) -&gt; <em>self</em></p>
   </div>
   <div class="desc">
@@ -2408,7 +2409,7 @@ draw.decorate(Magick::LineThroughDecoration)
     <h3 id="stroke_linejoin">stroke_linejoin</h3>
     <p><span class="arg">draw</span>.stroke_linejoin(<span class=
-    "arg">aString</span>) -&gt; <em>draw</em></p>
+    "arg">string</span>) -&gt; <em>self</em></p>
   </div>
   <div class="desc">
@@ -2444,7 +2445,7 @@ draw.decorate(Magick::LineThroughDecoration)
     <h3 id="stroke_miterlimit">stroke_miterlimit</h3>
     <p><span class="arg">draw</span>.stroke_miterlimit(<span class=
-    "arg">aFloat</span>) -&gt; <em>draw</em></p>
+    "arg">float</span>) -&gt; <em>self</em></p>
   </div>
   <div class="desc">
@@ -2470,8 +2471,8 @@ draw.decorate(Magick::LineThroughDecoration)
     <h3 id="stroke_opacity">stroke_opacity</h3>
     <p><span class="arg">draw</span>.stroke_opacity(<span class=
-    "arg">aFloat</span> or <span class="arg">aString</span>) -&gt;
-    <em>draw</em></p>
+    "arg">float</span> or <span class="arg">string</span>) -&gt;
+    <em>self</em></p>
   </div>
   <div class="desc">
@@ -2503,7 +2504,7 @@ draw.stroke_opacity('40%')
     <h3 id="stroke_width">stroke_width</h3>
     <p><span class="arg">draw</span>.stroke_width(<span class=
-    "arg">anInteger</span>) -&gt; <em>draw</em></p>
+    "arg">integer</span>) -&gt; <em>self</em></p>
   </div>
   <div class="desc">
@@ -2527,7 +2528,7 @@ draw.stroke_opacity('40%')
     <p><span class="arg">draw</span>.text(<span class=
     "arg">x</span>,<span class="arg">y</span>, <span class=
-    "arg">text</span>) -&gt; <em>draw</em></p>
+    "arg">text</span>) -&gt; <em>self</em></p>
   </div>
   <div class="desc">
@@ -2599,7 +2600,7 @@ gc.text(10,10, %q/{"What's up?"}/) &raquo; "What's up?"
     <h3 id="text_align">text_align</h3>
     <p><span class="arg">draw</span>.text_align(<span class=
-    "arg">anAlignType</span>) -&gt; <em>draw</em></p>
+    "arg">alignment</span>) -&gt; <em>self</em></p>
   </div>
   <div class="desc">
@@ -2627,7 +2628,7 @@ gc.text(10,10, %q/{"What's up?"}/) &raquo; "What's up?"
     <h3 id="text_anchor">text_anchor</h3>
     <p><span class="arg">draw</span>.text_anchor(<span class=
-    "arg">anAnchorType</span>) -&gt; <em>draw</em></p>
+    "arg">anchor</span>) -&gt; <em>self</em></p>
   </div>
   <div class="desc">
@@ -2651,7 +2652,7 @@ gc.text(10,10, %q/{"What's up?"}/) &raquo; "What's up?"
     <p><span class=
     "arg">draw</span>.text_antialias(<code>true</code> or
-    <code>false</code>) -&gt; <em>draw</em></p>
+    <code>false</code>) -&gt; <em>self</em></p>
   </div>
   <div class="desc">
@@ -2684,7 +2685,7 @@ gc.text(10,10, %q/{"What's up?"}/) &raquo; "What's up?"
     <h3 id="text_undercolor">text_undercolor</h3>
     <p><span class="arg">draw</span>.text_undercolor(<span class=
-    "arg">aString</span>) -&gt; <em>draw</em></p>
+    "arg">string</span>) -&gt; <em>self</em></p>
   </div>
   <div class="desc">
@@ -2703,7 +2704,8 @@ gc.text(10,10, %q/{"What's up?"}/) &raquo; "What's up?"
     <h4>Example</h4>
-    <p><a href="javascript:popup('text_undercolor.rb.html')"><img src=
+    <p><a href=
+    "javascript:popup('text_undercolor.rb.html')"><img src=
     "ex/text_undercolor.gif" alt="text_undercolor example" title=
     "Click to see the example script" /></a></p>
   </div>
@@ -2713,7 +2715,7 @@ gc.text(10,10, %q/{"What's up?"}/) &raquo; "What's up?"
     <p><span class="arg">draw</span>.translate(<span class=
     "arg">tx</span>, <span class="arg">ty</span>) -&gt;
-    <em>draw</em></p>
+    <em>self</em></p>
   </div>
   <div class="desc">
@@ -2751,8 +2753,7 @@ gc.text(10,10, %q/{"What's up?"}/) &raquo; "What's up?"
   <div class="sig">
     <h3 id="affine_eq">affine=</h3>
-    <p><span class="arg">draw.</span>.affine =
-    <em>anAffineMatrix</em></p>
+    <p><span class="arg">draw</span>.affine = <em>matrix</em></p>
   </div>
   <div class="desc">
@@ -2769,8 +2770,7 @@ gc.text(10,10, %q/{"What's up?"}/) &raquo; "What's up?"
   <div class="sig">
     <h3 id="align_eq">align=</h3>
-    <p><span class="arg">draw.</span>.align =
-    <em>anAlignType</em></p>
+    <p><span class="arg">draw</span>.align = <em>alignment</em></p>
   </div>
   <div class="desc">
@@ -2789,7 +2789,7 @@ gc.text(10,10, %q/{"What's up?"}/) &raquo; "What's up?"
     <h3 id="decorate_eq">decorate=</h3>
     <p><span class="arg">draw</span>.decorate =
-    <em>aDecorationType</em></p>
+    <em>decoration</em></p>
   </div>
   <div class="desc">
@@ -2807,7 +2807,7 @@ gc.text(10,10, %q/{"What's up?"}/) &raquo; "What's up?"
   <div class="sig">
     <h3 id="density_eq">density=</h3>
-    <p><span class="arg">draw</span>.density = <em>aString</em></p>
+    <p><span class="arg">draw</span>.density = <em>string</em></p>
   </div>
   <div class="desc">
@@ -2820,8 +2820,7 @@ gc.text(10,10, %q/{"What's up?"}/) &raquo; "What's up?"
   <div class="sig">
     <h3 id="encoding_eq">encoding=</h3>
-    <p><span class="arg">draw</span>.encoding =
-    <em>aString</em></p>
+    <p><span class="arg">draw</span>.encoding = <em>string</em></p>
   </div>
   <div class="desc">
@@ -2839,8 +2838,8 @@ gc.text(10,10, %q/{"What's up?"}/) &raquo; "What's up?"
   <div class="sig">
     <h3 id="fill_eq">fill=</h3>
-    <p><span class="arg">draw</span>.fill = <em>aString</em> or
-    <em>aPixel</em></p>
+    <p><span class="arg">draw</span>.fill = <em>string</em> or
+    <em>pixel</em></p>
   </div>
   <div class="desc">
@@ -2856,7 +2855,7 @@ gc.text(10,10, %q/{"What's up?"}/) &raquo; "What's up?"
     <h3 id="fill_pattern_eq">fill_pattern=</h3>
     <p><span class="arg">draw</span>.fill_pattern =
-    <em>anImage</em></p>
+    <em>image</em></p>
   </div>
   <div class="desc">
@@ -2877,7 +2876,7 @@ gc.text(10,10, %q/{"What's up?"}/) &raquo; "What's up?"
   <div class="sig">
     <h3 id="font_eq">font=</h3>
-    <p><span class="arg">draw</span>.font = <em>aString</em></p>
+    <p><span class="arg">draw</span>.font = <em>string</em></p>
   </div>
   <div class="desc">
@@ -2891,7 +2890,7 @@ gc.text(10,10, %q/{"What's up?"}/) &raquo; "What's up?"
     <h3 id="font_family_eq">font_family=</h3>
     <p><span class="arg">draw</span>.font_family =
-    <em>aString</em></p>
+    <em>string</em></p>
   </div>
   <div class="desc">
@@ -2905,7 +2904,7 @@ gc.text(10,10, %q/{"What's up?"}/) &raquo; "What's up?"
     <h3 id="font_stretch_eq">font_stretch=</h3>
     <p><span class="arg">draw</span>.font_stretch =
-    <em>aStretchType</em></p>
+    <em>stretch</em></p>
   </div>
   <div class="desc">
@@ -2921,7 +2920,7 @@ gc.text(10,10, %q/{"What's up?"}/) &raquo; "What's up?"
     <h3 id="font_style_eq">font_style=</h3>
     <p><span class="arg">draw</span>.font_style =
-    <em>aStyleType</em></p>
+    <em>style</em></p>
   </div>
   <div class="desc">
@@ -2939,7 +2938,7 @@ gc.text(10,10, %q/{"What's up?"}/) &raquo; "What's up?"
     <h3 id="font_weight_eq">font_weight=</h3>
     <p><span class="arg">draw</span>.font_weight =
-    <em>aWeightType</em></p>
+    <em>weight</em></p>
   </div>
   <div class="desc">
@@ -2957,8 +2956,7 @@ gc.text(10,10, %q/{"What's up?"}/) &raquo; "What's up?"
   <div class="sig">
     <h3 id="gravity_eq">gravity=</h3>
-    <p><span class="arg">draw</span>.gravity =
-    <em>aGravityType</em></p>
+    <p><span class="arg">draw</span>.gravity = <em>gravity</em></p>
   </div>
   <div class="desc">
@@ -2977,7 +2975,7 @@ gc.text(10,10, %q/{"What's up?"}/) &raquo; "What's up?"
     <h3 id="pointsize_eq">pointsize=</h3>
     <p><span class="arg">draw</span>.pointsize =
-    <em>anNumeric</em></p>
+    <em>integer</em></p>
   </div>
   <div class="desc">
@@ -2989,8 +2987,7 @@ gc.text(10,10, %q/{"What's up?"}/) &raquo; "What's up?"
   <div class="sig">
     <h3 id="rotation_eq">rotation=</h3>
-    <p><span class="arg">draw</span>.rotation =
-    <em>aNumeric</em></p>
+    <p><span class="arg">draw</span>.rotation = <em>number</em></p>
   </div>
   <div class="desc">
@@ -3006,8 +3003,8 @@ gc.text(10,10, %q/{"What's up?"}/) &raquo; "What's up?"
   <div class="sig">
     <h3 id="stroke_eq">stroke=</h3>
-    <p><span class="arg">draw</span>.stroke = <em>aString</em> or
-    <em>aPixel</em></p>
+    <p><span class="arg">draw</span>.stroke = <em>string</em> or
+    <em>pixel</em></p>
   </div>
   <div class="desc">
@@ -3024,7 +3021,7 @@ gc.text(10,10, %q/{"What's up?"}/) &raquo; "What's up?"
     <h3 id="stroke_pattern_eq">stroke_pattern=</h3>
     <p><span class="arg">draw</span>.stroke_pattern =
-    <em>anImage</em></p>
+    <em>image</em></p>
   </div>
   <div class="desc">
@@ -3042,8 +3039,7 @@ gc.text(10,10, %q/{"What's up?"}/) &raquo; "What's up?"
   <div class="sig">
     <h3 id="stroke_width_eq">stroke_width=</h3>
-    <p><span class="arg">draw</span>.stroke =
-    <em>anInteger</em></p>
+    <p><span class="arg">draw</span>.stroke = <em>integer</em></p>
   </div>
   <div class="desc">
@@ -3069,7 +3065,7 @@ gc.text(10,10, %q/{"What's up?"}/) &raquo; "What's up?"
   <div class="sig">
     <h3 id="tile_eq">tile=</h3>
-    <p><span class="arg">draw</span>.tile = <em>anImage</em></p>
+    <p><span class="arg">draw</span>.tile = <em>image</em></p>
   </div>
   <div class="desc">
@@ -3085,8 +3081,8 @@ gc.text(10,10, %q/{"What's up?"}/) &raquo; "What's up?"
   <div class="sig">
     <h3 id="undercolor_eq">undercolor=</h3>
-    <p><span class="arg">draw</span>.undercolor = <em>aString</em>
-    or <em>aPixel</em></p>
+    <p><span class="arg">draw</span>.undercolor = <em>string</em>
+    or <em>pixel</em></p>
   </div>
   <div class="desc">