<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>gems/gems/fastthread-1.0.1/ext/fastthread/fastthread.so</filename>
    </added>
    <added>
      <filename>gems/gems/fastthread-1.0.1/lib/fastthread.so</filename>
    </added>
    <added>
      <filename>gems/gems/mongrel-1.1.5/ext/http11/http11.so</filename>
    </added>
    <added>
      <filename>gems/gems/mongrel-1.1.5/lib/http11.so</filename>
    </added>
    <added>
      <filename>gems/gems/nokogiri-1.0.6/ext/nokogiri/native.so</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -2,3 +2,49 @@
 
 * This will become a table of contents (this text will be scraped).
 {:toc}
+
+
+## DataMapper &#49464;&#54021; &#49444;&#51221;
+&#45936;&#51060;&#53552;&#48288;&#51060;&#49828; &#49464;&#54021; &#49444;&#51221;&#51008; config/database.yml&#50640; &#51080;&#49845;&#45768;&#45796;.
+
+&#47564;&#50557; &#47784;&#46304; &#44060;&#48156;&#54872;&#44221;(development, test, production)&#50640; &#45824;&#54644;&#49436; sqlite3&#47484; &#49324;&#50857;&#54616;&#49888;&#45796;&#47732;, &#50500;&#47924;&#44163;&#46020; &#48320;&#44221;&#54616;&#49892; &#54596;&#50836;&#44032; &#50630;&#51004;&#47728; &#45796;&#51020; &#51109;&#51004;&#47196; &#44032;&#49492;&#46020; &#46121;&#45768;&#45796;.
+
+### &#47784;&#46304; &#54872;&#44221;&#51060; MySQL&#51068; &#44221;&#50864;
+&#47564;&#50557; &#47784;&#46304; &#54872;&#44221;&#51060; MySQL&#51060;&#46972;&#47732; &#45796;&#51020;&#44284; &#44057;&#51060; &#46108; &#48512;&#48516;&#51012;:
+
+    development: &amp;defaults
+      # These are the settings for repository :default
+      adapter:  sqlite3
+      database: sample_development.db
+&#51060;&#44163;&#51004;&#47196; &#48148;&#45012;&#51452;&#49884;&#47732; &#46121;&#45768;&#45796;.
+
+    development: &amp;defaults
+      adapter: mysql
+      database: app_name_development
+      username: user
+      password: pass
+      host: localhost
+
+mysql&#51060; &#50976;&#51200;&#45348;&#51076;&#47564; &#51064;&#49885;&#54616;&#45796;&#47732;, &#51201;&#50857;&#49884; &#50612;&#45813;&#53552;&#50752; &#54840;&#49828;&#53944;&#48512;&#48516; &#51460;&#47564; &#50896;&#54616;&#49884;&#45716;&#45936;&#47196; &#48148;&#44984;&#47732; &#46104;&#44192;&#49845;&#45768;&#45796;.
+
+### Production&#50640;&#49436;&#47564; MySQL&#51012; &#49324;&#50857;&#54624; &#44221;&#50864;
+&#47564;&#50557; production&#50640;&#49436;&#47564; MySQL&#51012; &#49324;&#50857;&#54616;&#49884;&#44192;&#45796;&#47732; &#44060;&#48156;&#54872;&#44221;&#48512;&#48516;&#51008; &#44536;&#45824;&#47196; &#46160;&#49884;&#44256; &#45796;&#51020;&#51032; &#48512;&#48516;&#51012;,
+
+    production:
+      &lt;&lt;:       *defaults
+      database: production.db
+      
+&#51060;&#44163;&#51004;&#47196; &#48148;&#45012;&#51452;&#49884;&#47732; &#46121;&#45768;&#45796;.
+
+    production:
+      adapter: mysql
+      database: app_name_development
+      username: user
+      password: pass
+      host: localhost
+#### NOTE
+MySQL&#44284; SQLite&#45716; &#50557;&#44036; &#52264;&#51060;&#44032; &#51080;&#49845;&#45768;&#45796;. 
+SQLite&#50640;&#49436;&#45716; &#50500;&#47924; &#51060;&#49345;&#50630;&#51648;&#47564;, MySQL&#50640;&#49436; &#53945;&#51221; &#53440;&#51077;&#51060; &#51228;&#45824;&#47196; &#49444;&#51221;&#46104;&#51648; &#50506;&#51004;&#47732; &#50640;&#47084;&#47484; &#48156;&#49373;&#49884;&#53412;&#45716; &#44221;&#50864;&#44032; &#51080;&#49845;&#45768;&#45796;.
+&#44536;&#47084;&#48064;&#47196; &#48176;&#52824;&#47484; &#54616;&#44592;&#51204;&#50640; &#47784;&#46304; &#54596;&#46300;&#46308;&#51060; &#51060;&#49345;&#51060; &#50630;&#45716;&#51648; &#53580;&#49828;&#53944;&#47484; &#54644;&#48372;&#49884;&#44592; &#48148;&#46989;&#45768;&#45796;.
+
+TODO Talk about setting up other DBs. 
\ No newline at end of file</diff>
      <filename>book-content/kr/3-interacting-with-the-database/1-dm-setting-up.markdown</filename>
    </modified>
    <modified>
      <diff>@@ -2,3 +2,113 @@
 
 * This will become a table of contents (this text will be scraped).
 {:toc}
+
+## &#47784;&#45944;
+
+### &#47784;&#45944; &#49373;&#49457;
+    merb-gen model ModelName
+
+### &#47784;&#45944; &#50676;&#44592;
+
+MERB_ROOT/app/models/model_name.rb &#54028;&#51068;&#51012; &#50676;&#50612;&#48372;&#49884;&#47732; &#46121;&#45768;&#45796;.
+
+### &#49549;&#49457;&#46308; &#51221;&#51032;&#54616;&#44592; 
+
+DataMapper&#50640;&#49436;&#45716;, &#53580;&#51060;&#48660;&#49373;&#49457;&#51060;&#45208; &#52860;&#47100;&#51012; &#52628;&#44032;&#54616;&#44592; &#50948;&#54644; &#51676;&#51613;&#49828;&#47084;&#50868; &#47560;&#51060;&#44536;&#47112;&#51060;&#49496;&#51012; &#54616;&#49892; &#54596;&#50836;&#44032; &#50630;&#49845;&#45768;&#45796;.
+(&#47932;&#47200; &#48372;&#45796; &#44256;&#44553;&#51032; &#51068;&#46308;&#51012; &#52376;&#47532;&#54616;&#45716;&#45936;&#50640;&#45716; &#54596;&#50836;&#54633;&#45768;&#45796;.)
+
+&#44592;&#48376; &#47784;&#45944; (&#51452;&#49437; &#54252;&#54632;): 
+    
+    class Person
+      include DataMapper::Resource
+      
+      #You can change this if you want
+      property :id, Serial
+      
+      #more properties here
+      # in format: 
+      #property :name, Type, :option =&gt; value, :option2 =&gt; value2
+      ... 
+      
+    end
+
+### &#53440;&#51077;&#46308;
+[http://datamapper.org](http://datamapper.org/)&#50640;&#49436; &#52280;&#44256;&#54664;&#49845;&#45768;&#45796;:
+
+* * * * *
+
+DM-Core&#45716; &#45796;&#51020;&#51032; '&#50896;&#49884;(primitive)' &#45936;&#51060;&#53552; &#53440;&#51077;&#46308;&#51012; &#51648;&#50896;&#54633;&#45768;&#45796;.
+
+&lt;ul&gt;
+&lt;li class=&quot;level1&quot;&gt;&lt;div class=&quot;li&quot;&gt; TrueClass, Boolean&lt;/div&gt;
+&lt;/li&gt;
+&lt;li class=&quot;level1&quot;&gt;&lt;div class=&quot;li&quot;&gt; String&lt;/div&gt;
+&lt;/li&gt;
+&lt;li class=&quot;level1&quot;&gt;&lt;div class=&quot;li&quot;&gt; Text&lt;/div&gt;
+
+&lt;/li&gt;
+&lt;li class=&quot;level1&quot;&gt;&lt;div class=&quot;li&quot;&gt; Float&lt;/div&gt;
+&lt;/li&gt;
+&lt;li class=&quot;level1&quot;&gt;&lt;div class=&quot;li&quot;&gt; Fixnum, Integer&lt;/div&gt;
+&lt;/li&gt;
+&lt;li class=&quot;level1&quot;&gt;&lt;div class=&quot;li&quot;&gt; BigDecimal,&lt;/div&gt;
+&lt;/li&gt;
+&lt;li class=&quot;level1&quot;&gt;&lt;div class=&quot;li&quot;&gt; DateTime, Date, Time&lt;/div&gt;
+&lt;/li&gt;
+
+&lt;li class=&quot;level1&quot;&gt;&lt;div class=&quot;li&quot;&gt; Object, (marshalled)&lt;/div&gt;
+&lt;/li&gt;
+&lt;li class=&quot;level1&quot;&gt;&lt;div class=&quot;li&quot;&gt; Discriminator (all you need for Single Table Inheritance, actually)&lt;/div&gt;
+&lt;/li&gt;
+&lt;/ul&gt;
+
+&#47564;&#50557; DM-Types&#51012; include&#54616;&#49884;&#47732;, &#45796;&#51020;&#51032; &#45936;&#51060;&#53552; &#53440;&#51077;&#46308;&#51060; &#51648;&#50896;&#46121;&#45768;&#45796;:
+
+&lt;ul&gt;
+&lt;li class=&quot;level1&quot;&gt;&lt;div class=&quot;li&quot;&gt; Csv&lt;/div&gt;
+
+&lt;/li&gt;
+&lt;li class=&quot;level1&quot;&gt;&lt;div class=&quot;li&quot;&gt; Enum&lt;/div&gt;
+&lt;/li&gt;
+&lt;li class=&quot;level1&quot;&gt;&lt;div class=&quot;li&quot;&gt; EpochTime&lt;/div&gt;
+&lt;/li&gt;
+&lt;li class=&quot;level1&quot;&gt;&lt;div class=&quot;li&quot;&gt; FilePath&lt;/div&gt;
+&lt;/li&gt;
+&lt;li class=&quot;level1&quot;&gt;&lt;div class=&quot;li&quot;&gt; Flag&lt;/div&gt;
+&lt;/li&gt;
+
+&lt;li class=&quot;level1&quot;&gt;&lt;div class=&quot;li&quot;&gt; IPAddress&lt;/div&gt;
+&lt;/li&gt;
+&lt;li class=&quot;level1&quot;&gt;&lt;div class=&quot;li&quot;&gt; &lt;acronym title=&quot;Uniform Resource Identifier&quot;&gt;URI&lt;/acronym&gt;&lt;/div&gt;
+&lt;/li&gt;
+&lt;li class=&quot;level1&quot;&gt;&lt;div class=&quot;li&quot;&gt; Yaml&lt;/div&gt;
+&lt;/li&gt;
+&lt;li class=&quot;level1&quot;&gt;&lt;div class=&quot;li&quot;&gt; Json&lt;/div&gt;
+&lt;/li&gt;
+&lt;li class=&quot;level1&quot;&gt;&lt;div class=&quot;li&quot;&gt; BCryptHash&lt;/div&gt;
+
+&lt;/li&gt;
+&lt;li class=&quot;level1&quot;&gt;&lt;div class=&quot;li&quot;&gt; Regex&lt;/div&gt;
+&lt;/li&gt;
+&lt;/ul&gt;
+
+&#51060; &#53440;&#51077;&#46308;&#50640; &#45824;&#54620; &#45236;&#50857;&#51008; [&#50668;&#44592;](http://datamapper.org/doku.php?id=dm-more:dm-types)&#50640;&#49436; &#48372;&#49892; &#49688; &#51080;&#49845;&#45768;&#45796;.
+
+* * * * *
+&#48372;&#45796; &#51088;&#49464;&#54620; &#45236;&#50857;&#51008; &#45796;&#51020;&#51032; &#47553;&#53356;&#50640;&#49436; &#52280;&#51312;&#54616;&#49884;&#44592; &#48148;&#46989;&#45768;&#45796;.
+More specifics on properties are found here:
+[http://datamapper.org/doku.php?id=docs:properties](http://datamapper.org/doku.php?id=docs:properties)
+
+### &#47560;&#51060;&#44536;&#47112;&#51060;&#49496;
+
+&#47749;&#48177;&#54616;&#44172; &#47568;&#50432;&#46300;&#47532;&#51088;&#47732;, &#50668;&#47084;&#48516;&#51008; &#49549;&#49457;&#46308;&#51012; &#47676;&#51200; &#51221;&#51032;&#54616;&#45716; &#44163;&#51012; &#45149;&#45236;&#49492;&#50556; &#46121;&#45768;&#45796;.
+&#44536;&#45796;&#51020;, &#45796;&#51020;&#51032; &#47749;&#47161;&#51012; &#49892;&#54665;&#54616;&#49884;&#44256;
+
+    rake db:create
+    
+&#51060;&#51228; &#47560;&#51060;&#44536;&#47112;&#51060;&#53944; &#47749;&#47161;&#51012; &#49892;&#54665;&#54616;&#49884;&#47732; &#46121;&#45768;&#45796;.
+
+    rake db:automigrate
+
+&#51060;&#51228; &#50896;&#54616;&#49884;&#45716; &#44163;&#46308;&#51060; &#49373;&#49457;&#46104;&#50632;&#51012; &#44163;&#51077;&#45768;&#45796;.
+&#48372;&#45796; &#51088;&#49464;&#54620; &#51221;&#48372;&#45716; [&#47560;&#51060;&#44536;&#47112;&#51060;&#49496; &#54168;&#51060;&#51648;](/interacting-with-the-database/dm-migrations)&#47484; &#52280;&#44256;&#54616;&#49884;&#44592; &#48148;&#46989;&#45768;&#45796;.</diff>
      <filename>book-content/kr/3-interacting-with-the-database/2-dm-schema.markdown</filename>
    </modified>
    <modified>
      <diff>@@ -2,3 +2,125 @@
 
 * This will become a table of contents (this text will be scraped).
 {:toc}
+
+CRUD (Create, Read, Update, Destroy) &#50529;&#49496;&#46308;&#50640; &#45824;&#54644;&#49436; &#44033;&#44033; &#49332;&#54196;&#48372;&#46020;&#47197; &#54616;&#44192;&#49845;&#45768;&#45796;.
+
+## Create
+
+&#47564;&#50557; &#45796;&#51020;&#50640;&#49436; &#49444;&#47749;&#46300;&#47532;&#45716; &#45236;&#50857;&#48372;&#45796; &#44618;&#44172; &#50508;&#44256;&#49910;&#51004;&#49884;&#47732; [datamapper &#47928;&#49436; CRUD&#48512;&#48516;](http://datamapper.org/doku.php?id=docs:crud)&#47484; &#52280;&#51312;&#54616;&#49884;&#44592; &#48148;&#46989;&#45768;&#45796;.
+
+db&#51032; &#49352;&#47196;&#50868; &#50676;&#51012; &#49373;&#49457;&#54624;&#46412; &#51060; &#49884;&#53248;&#49828;&#47484; &#49324;&#50857;&#54633;&#45768;&#45796;.
+
+### New
+
+&#47676;&#51200; ModelName&#51032; &#51064;&#49828;&#53556;&#49828;&#47484; &#47564;&#46308;&#50612;&#51469;&#45768;&#45796;.
+
+    model_name = ModelName.new
+### &#49549;&#49457;&#46308; &#49444;&#51221;
+
+&#44536;&#45796;&#51020;, &#54644;&#49884;&#50640; &#44536; &#49549;&#49457;&#46308;&#51012; &#49444;&#51221;&#54633;&#45768;&#45796;.
+
+    model_name.attributes = {:attr1 =&gt; val1, :attr2 =&gt; val2}
+
+&#54841;&#51008;, (&#50500;&#47560; &#50896;&#54616;&#49884;&#51648; &#50506;&#51012; &#53580;&#51648;&#47564;) &#49440;&#54840;&#54616;&#49888;&#45796;&#47732; &#54616;&#45208;&#49885; &#51068;&#51068;&#51060; &#49444;&#51221;&#54616;&#49892; &#49688;&#46020; &#51080;&#49845;&#45768;&#45796;.
+
+    model_name.attr1 = val1
+    model_name.attr2 = val2
+### &#51200;&#51109;&#54616;&#44592;
+&#51060;&#51228; &#51200;&#51109;&#54616;&#49884;&#47732; &#46121;&#45768;&#45796;:
+
+     model_name.save
+### &#50976;&#54952;&#49457; &#44160;&#51613; &#44208;&#44284;
+&#47784;&#46304; &#44160;&#51613;&#51012; &#53685;&#44284;&#54644;&#49436; &#51228;&#45824;&#47196; &#51200;&#51109;&#46104;&#50632;&#45796;&#47732;, true&#47484; &#47532;&#53556;&#54633;&#45768;&#45796;.
+&#54616;&#45208; &#51060;&#49345;&#51032; &#44160;&#51613;&#51012; &#53685;&#44284;&#54616;&#51648; &#47803;&#54644;&#49436; &#51200;&#51109;&#50640; &#49892;&#54056;&#54616;&#47732; false&#47484; &#48152;&#54872;&#54633;&#45768;&#45796;.
+
+#### &#50640;&#47084;
+&#49892;&#54056;&#54620;&#45796;&#47732;, 
+
+    model_name.errors
+&#51060;&#44163;&#51060; &#44033;&#44033;&#51032; &#49892;&#54056;&#50640; &#45824;&#54644; &#50640;&#47084;&#47700;&#49464;&#51648; &#48176;&#50676;&#51012; &#51460; &#44163;&#51077;&#45768;&#45796;.
+
+## &#45936;&#51060;&#53552; &#51069;&#44592;
+&#47564;&#50557; &#45796;&#51020;&#50640;&#49436; &#49444;&#47749;&#46300;&#47532;&#45716; &#45236;&#50857;&#48372;&#45796; &#44618;&#44172; &#50508;&#44256;&#49910;&#51004;&#49884;&#47732; [datamapper &#47928;&#49436; finder &#48512;&#48516;](http://datamapper.org/doku.php?id=docs:finders)&#51012; &#52280;&#51312;&#54616;&#49884;&#44592; &#48148;&#46989;&#45768;&#45796;.
+
+&#45936;&#51060;&#53552;&#48288;&#51060;&#49828;&#50640;&#49436; &#50676;(&#46308;)&#51012; &#50619;&#51004;&#49892;&#46412;&#45716; &#45796;&#51020;&#51032; &#49884;&#53248;&#49828;&#47484; &#49324;&#50857;&#54616;&#49884;&#47732; &#46121;&#45768;&#45796;.
+### 1&#44060;&#51032; &#45936;&#51060;&#53552; &#50619;&#44592;
+#### &#54532;&#46972;&#51060;&#47672;&#47532; &#53412;&#50640; &#51032;&#54620; &#48169;&#48277;
+##### Serial
+
+    ModelName.get(1)
+##### String
+
+    ModelName.get(&quot;foobar&quot;)
+ &#49884;&#47532;&#50620;&#53412;&#46308;&#50640; &#45824;&#54644;&#49436;&#45716; &#45796;&#47480; &#44032;&#45733;&#49457;&#46308;&#51060; &#51080;&#49845;&#45768;&#45796;. datamapper &#49324;&#51060;&#53944;&#44032; &#50668;&#47084;&#48516;&#46308;&#51012; &#46020;&#50752;&#46300;&#47540; &#44163;&#51077;&#45768;&#45796;.
+
+### &#49549;&#49457;(&#46308;)&#50640; &#51032;&#54620; &#48169;&#48277;
+
+You have to get the first in the db that follows the criteria if you get only one. (see below for getting several)
+
+    ModelName.first(:attr1 =&gt; val1, :attr2 =&gt; val2)
+Or just one attribute
+
+    ModelName.first(:attr =&gt; val)
+But you don't just have to make the attribute equal something. 
+
+    ModelName.first(:attr.gt =&gt; val)
+will find get the first &lt;tt&gt;model_name&lt;/tt&gt; such that &lt;tt&gt;model_name.attr &gt; val&lt;/tt&gt; is true. 
+
+You can find the full list of conditions here:
+
+[http://datamapper.org/doku.php?id=docs:finders#conditions](http://datamapper.org/doku.php?id=docs:finders#conditions)
+
+### Get Many
+Getting many is just the same as getting 1, but you do
+
+    ModelName.all(args)
+rather than
+
+    ModelName.first(args)
+For example, 
+
+    ModelName.all(price.gt =&gt; 5)
+will get all ModelNames with prices over 5, just as 
+
+    ModelName.first(price.gt =&gt; 5)
+will get the first with its price over 5. 
+
+## Update
+Use this sequence when altering an existing row in the database. 
+
+2 Choices:
+### Change Attributes, Then Update
+#### Change Attributes
+You make some changes to the instance. 
+
+    model_name.attr = foo
+#### Update
+Then, you update it in the db.
+
+    model_name.update
+This acts just the same as &lt;tt&gt;model_name.save&lt;/tt&gt; (see above), saving the changes to the db and returning &lt;tt&gt;true&lt;/tt&gt; if valditions succeed, and returning &lt;tt&gt;false&lt;/tt&gt; and making the error messages available in an array by
+
+     model_name.errors
+### Change Attributes and Update at Once
+If you have a hash of attributes, you can change and update all at once by doing
+
+    model_name.update_attributes(hash)
+This acts just like &lt;tt&gt;save&lt;/tt&gt; and &lt;tt&gt;update&lt;/tt&gt; as explained above. 
+### Dirtiness
+You can check if an object is &quot;dirty&quot;, or has had its attributes changed, by calling
+
+    model_name.dirty?
+which will return &lt;tt&gt;true&lt;/tt&gt; if it has changed and &lt;tt&gt;false&lt;/tt&gt; if it hasn't. 
+
+This is especially useful because the method is smart. If the first &lt;tt&gt;ModelName&lt;/tt&gt; in the database has &lt;tt&gt;attr1&lt;/tt&gt; of 3, then
+
+     foo = ModelName
+     foo.attr1 = 3
+     puts foo.dirty? #false
+## Destroy
+This is really easy, and there's basically one choice of how to do it. 
+
+     foo = ModelName.get(42)
+     foo.destroy
+&lt;tt&gt;destroy&lt;/tt&gt; will return &lt;tt&gt;true&lt;/tt&gt; if it succeeds in deleting &lt;tt&gt;foo&lt;/tt&gt; and &lt;tt&gt;false&lt;/tt&gt; if it fails. </diff>
      <filename>book-content/kr/3-interacting-with-the-database/3-dm-queries.markdown</filename>
    </modified>
    <modified>
      <diff>@@ -1,4 +1,6 @@
-#&#47784;&#45944; &#44288;&#44228;
+#Model Relationships
 
 * This will become a table of contents (this text will be scraped).
 {:toc}
+
+Everything you ever wanted to about assossiations in DM is (here)[http://datamapper.org/doku.php?id=docs:associations]
\ No newline at end of file</diff>
      <filename>book-content/kr/3-interacting-with-the-database/4-dm-relationships.markdown</filename>
    </modified>
    <modified>
      <diff>@@ -1,4 +1,47 @@
-#&#45936;&#51060;&#53552;&#48288;&#51060;&#49828; &#47560;&#51060;&#44536;&#47112;&#51060;&#49496;
+#Database Migrations
 
 * This will become a table of contents (this text will be scraped).
 {:toc}
+
+## DB Creation and Setup
+To first setup the db, do
+   
+    rake db:create
+    rake db:automigrate
+
+## Altering later
+Afterwards, you can add columns or change certain attributes of columns simply by making the necessary changes in the model and then running
+
+    rake db:autoupgrade
+to do a non-destructive upgrade or 
+
+    rake db:automigrate
+to do a destructive upgrade that will clear the database. 
+
+### BEWARE
+&quot;Non-destructive&quot; does not necessarily mean that something bad can't happen. It's always good policy to backup the database before messing with it if you care about the data. 
+
+### Default Values
+If you are adding a column, you can set the &lt;tt&gt;:default&lt;/tt&gt; attribute in the model, an it will set the value of the new attribute to that default value for each existing row. 
+
+For example, if you have a Person class with just an id attribute and 2 people in the db, and then you add
+
+    property :name, String, :default =&gt; &quot;John Smith&quot;
+to the model file at &lt;tt&gt;app/models/person.rb&lt;/tt&gt; and then run
+
+    rake db:autoupgrade
+then if you enter the console and inspect the people that had already been created, you will see:
+
+     $ merb -i
+     # annoying output you don't care about
+     irb(main):001:0&gt; Person.all
+     ~ SELECT &quot;id&quot;, &quot;name&quot; FROM &quot;people&quot; ORDER BY &quot;id&quot;
+     =&gt; [#&lt;Person id=1 name=&quot;John Smith&quot;&gt;, #&lt;Person id=2 name=&quot;John Smith&quot;&gt;]
+The People had their names automatically set to &quot;John Smith&quot; because that was the default value. 
+
+### DM-Migrations
+You can use the &lt;tt&gt;dm-migrations&lt;/tt&gt; plugin to make migrations to help with more advanced tasks. 
+
+There's some info (just a link as of now) [here](http://datamapper.org/doku.php?id=docs:migrations). 
+
+TODO explain using dm-migrations
\ No newline at end of file</diff>
      <filename>book-content/kr/3-interacting-with-the-database/5-dm-migrations.markdown</filename>
    </modified>
    <modified>
      <diff>@@ -1,4 +1,6 @@
-#&#50976;&#54952;&#49457; &#44160;&#51613;
+#Model Validations
 
 * This will become a table of contents (this text will be scraped).
 {:toc}
+
+Read about validations (here)[http://datamapper.org/doku.php?id=docs:validations]
\ No newline at end of file</diff>
      <filename>book-content/kr/3-interacting-with-the-database/6-dm-validations.markdown</filename>
    </modified>
    <modified>
      <diff>@@ -27,7 +27,8 @@ Merb::BootLoader.before_app_loads do
      :default_language    =&gt; 'en',
      :available_languages =&gt; [
             {:name =&gt; &quot;English&quot;,    :code =&gt; 'en'}, 
-            {:name =&gt; &quot;Fran&#231;ais&quot;,   :code =&gt; 'fr'}, 
+            {:name =&gt; &quot;Fran&#231;ais&quot;,   :code =&gt; 'fr'},
+            {:name =&gt; &quot;&#54620;&#44397;&#50612;&quot;,        :code =&gt; 'kr'},              
             {:name =&gt; &quot;&#26085;&#26412;&#35486;&quot;,        :code =&gt; 'jp'}, 
             {:name =&gt; &quot;Portugu&#234;s&quot;,  :code =&gt; 'pt'},
             {:name =&gt; &quot;Deutsch&quot;,    :code =&gt; 'de'},</diff>
      <filename>config/init.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,4 +1,4 @@
-#!/opt/ruby-enterprise-1.8.6-20080810/bin/ruby
+#!/usr/bin/ruby1.8
 #
 # This file was generated by RubyGems.
 #</diff>
      <filename>gems/bin/autospec</filename>
    </modified>
    <modified>
      <diff>@@ -1,4 +1,4 @@
-#!/opt/ruby-enterprise-1.8.6-20080810/bin/ruby
+#!/usr/bin/ruby1.8
 #
 # This file was generated by RubyGems.
 #</diff>
      <filename>gems/bin/edit_json.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,4 +1,4 @@
-#!/opt/ruby-enterprise-1.8.6-20080810/bin/ruby
+#!/usr/bin/ruby1.8
 #
 # This file was generated by RubyGems.
 #</diff>
      <filename>gems/bin/erubis</filename>
    </modified>
    <modified>
      <diff>@@ -1,4 +1,4 @@
-#!/opt/ruby-enterprise-1.8.6-20080810/bin/ruby
+#!/usr/bin/ruby1.8
 #
 # This file was generated by RubyGems.
 #</diff>
      <filename>gems/bin/gpgen</filename>
    </modified>
    <modified>
      <diff>@@ -1,4 +1,4 @@
-#!/opt/ruby-enterprise-1.8.6-20080810/bin/ruby
+#!/usr/bin/ruby1.8
 #
 # This file was generated by RubyGems.
 #</diff>
      <filename>gems/bin/maruku</filename>
    </modified>
    <modified>
      <diff>@@ -1,4 +1,4 @@
-#!/opt/ruby-enterprise-1.8.6-20080810/bin/ruby
+#!/usr/bin/ruby1.8
 #
 # This file was generated by RubyGems.
 #</diff>
      <filename>gems/bin/marutex</filename>
    </modified>
    <modified>
      <diff>@@ -1,4 +1,4 @@
-#!/opt/ruby-enterprise-1.8.6-20080810/bin/ruby
+#!/usr/bin/ruby1.8
 #
 # This file was generated by RubyGems.
 #</diff>
      <filename>gems/bin/merb</filename>
    </modified>
    <modified>
      <diff>@@ -1,4 +1,4 @@
-#!/opt/ruby-enterprise-1.8.6-20080810/bin/ruby
+#!/usr/bin/ruby1.8
 #
 # This file was generated by RubyGems.
 #</diff>
      <filename>gems/bin/mongrel_rails</filename>
    </modified>
    <modified>
      <diff>@@ -1,4 +1,4 @@
-#!/opt/ruby-enterprise-1.8.6-20080810/bin/ruby
+#!/usr/bin/ruby1.8
 #
 # This file was generated by RubyGems.
 #</diff>
      <filename>gems/bin/rackup</filename>
    </modified>
    <modified>
      <diff>@@ -1,4 +1,4 @@
-#!/opt/ruby-enterprise-1.8.6-20080810/bin/ruby
+#!/usr/bin/ruby1.8
 #
 # This file was generated by RubyGems.
 #</diff>
      <filename>gems/bin/rake</filename>
    </modified>
    <modified>
      <diff>@@ -1,4 +1,4 @@
-#!/opt/ruby-enterprise-1.8.6-20080810/bin/ruby
+#!/usr/bin/ruby1.8
 #
 # This file was generated by RubyGems.
 #</diff>
      <filename>gems/bin/rake2thor</filename>
    </modified>
    <modified>
      <diff>@@ -1,4 +1,4 @@
-#!/opt/ruby-enterprise-1.8.6-20080810/bin/ruby
+#!/usr/bin/ruby1.8
 #
 # This file was generated by RubyGems.
 #</diff>
      <filename>gems/bin/spec</filename>
    </modified>
    <modified>
      <diff>@@ -1,4 +1,4 @@
-#!/opt/ruby-enterprise-1.8.6-20080810/bin/ruby
+#!/usr/bin/ruby1.8
 #
 # This file was generated by RubyGems.
 #</diff>
      <filename>gems/bin/thor</filename>
    </modified>
    <modified>
      <diff>@@ -4,62 +4,65 @@ SHELL = /bin/sh
 #### Start of system configuration section. ####
 
 srcdir = .
-topdir = /opt/local/lib/ruby/1.8/i686-darwin9.1.0
+topdir = /usr/lib/ruby/1.8/i486-linux
 hdrdir = $(topdir)
 VPATH = $(srcdir):$(topdir):$(hdrdir)
-prefix = $(DESTDIR)/opt/local
 exec_prefix = $(prefix)
-sitedir = $(prefix)/lib/ruby/site_ruby
-rubylibdir = $(libdir)/ruby/$(ruby_version)
-docdir = $(datarootdir)/doc/$(PACKAGE)
-dvidir = $(docdir)
-datarootdir = $(prefix)/share
-archdir = $(rubylibdir)/$(arch)
-sbindir = $(exec_prefix)/sbin
+prefix = $(DESTDIR)/usr
+sharedstatedir = $(prefix)/com
+mandir = $(prefix)/share/man
 psdir = $(docdir)
-vendordir = $(prefix)/lib/ruby/vendor_ruby
+oldincludedir = $(DESTDIR)/usr/include
 localedir = $(datarootdir)/locale
+bindir = $(exec_prefix)/bin
+libexecdir = $(prefix)/lib/ruby1.8
+sitedir = $(DESTDIR)/usr/local/lib/site_ruby
 htmldir = $(docdir)
-datadir = $(datarootdir)
+vendorarchdir = $(vendorlibdir)/$(sitearch)
 includedir = $(prefix)/include
-infodir = $(datarootdir)/info
-sysconfdir = $(prefix)/etc
-mandir = $(DESTDIR)/opt/local/share/man
+infodir = $(prefix)/share/info
+vendorlibdir = $(vendordir)/$(ruby_version)
+sysconfdir = $(DESTDIR)/etc
 libdir = $(exec_prefix)/lib
-sharedstatedir = $(prefix)/com
-oldincludedir = $(DESTDIR)/usr/include
+sbindir = $(exec_prefix)/sbin
+rubylibdir = $(libdir)/ruby/$(ruby_version)
+docdir = $(datarootdir)/doc/$(PACKAGE)
+dvidir = $(docdir)
+vendordir = $(libdir)/ruby/vendor_ruby
+datarootdir = $(prefix)/share
 pdfdir = $(docdir)
+archdir = $(rubylibdir)/$(arch)
 sitearchdir = $(sitelibdir)/$(sitearch)
-vendorarchdir = $(vendorlibdir)/$(vendorarch)
-bindir = $(exec_prefix)/bin
-localstatedir = $(prefix)/var
-vendorlibdir = $(vendordir)/$(ruby_version)
+datadir = $(datarootdir)
+localstatedir = $(DESTDIR)/var
 sitelibdir = $(sitedir)/$(ruby_version)
-libexecdir = $(exec_prefix)/libexec
 
-CC = gcc
+CC = cc
 LIBRUBY = $(LIBRUBY_SO)
 LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
 LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
 LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
 
 RUBY_EXTCONF_H = 
-CFLAGS   =  -fno-common -O2  -fno-common -pipe -fno-common 
+CFLAGS   =  -fPIC -fno-strict-aliasing -g -g -O2  -fPIC $(cflags) 
 INCFLAGS = -I. -I$(topdir) -I$(hdrdir) -I$(srcdir)
-CPPFLAGS =  -I/opt/local/include
+DEFS     = -D_FILE_OFFSET_BITS=64
+CPPFLAGS =   $(DEFS) $(cppflags)
 CXXFLAGS = $(CFLAGS) 
-DLDFLAGS = -L. -L/opt/local/lib  
-LDSHARED = cc -dynamic -bundle -undefined suppress -flat_namespace
+ldflags  = -L. -Wl,-Bsymbolic-functions -rdynamic -Wl,-export-dynamic
+dldflags = 
+archflag = 
+DLDFLAGS = $(ldflags) $(dldflags) $(archflag)
+LDSHARED = $(CC) -shared
 AR = ar
 EXEEXT = 
 
-RUBY_INSTALL_NAME = ruby
-RUBY_SO_NAME = ruby
-arch = i686-darwin9.1.0
-sitearch = i686-darwin9.1.0
-vendorarch = i686-darwin9.1.0
+RUBY_INSTALL_NAME = ruby1.8
+RUBY_SO_NAME = ruby1.8
+arch = i486-linux
+sitearch = i486-linux
 ruby_version = 1.8
-ruby = /opt/local/bin/ruby
+ruby = /usr/bin/ruby1.8
 RUBY = $(ruby)
 RM = rm -f
 MAKEDIRS = mkdir -p
@@ -73,7 +76,7 @@ COPY = cp
 preload = 
 
 libpath = . $(libdir)
-LIBPATH =  -L&quot;.&quot; -L&quot;$(libdir)&quot;
+LIBPATH =  -L. -L$(libdir)
 DEFFILE = 
 
 CLEANFILES = mkmf.log
@@ -83,20 +86,21 @@ extout =
 extout_prefix = 
 target_prefix = 
 LOCAL_LIBS = 
-LIBS = $(LIBRUBYARG_SHARED)  -lpthread -ldl -lobjc  
+LIBS = $(LIBRUBYARG_SHARED)  -lpthread -ldl -lcrypt -lm   -lc
 SRCS = fastthread.c
 OBJS = fastthread.o
 TARGET = fastthread
-DLLIB = $(TARGET).bundle
+DLLIB = $(TARGET).so
 EXTSTATIC = 
 STATIC_LIB = 
 
+BINDIR        = $(bindir)
 RUBYCOMMONDIR = $(sitedir)$(target_prefix)
-RUBYLIBDIR = /Users/peter/code/merb-book/gems/gems/fastthread-1.0.1/lib$(target_prefix)
-RUBYARCHDIR = /Users/peter/code/merb-book/gems/gems/fastthread-1.0.1/lib$(target_prefix)
+RUBYLIBDIR = /home/jaigouk/development/merb-book/gems/gems/fastthread-1.0.1/lib$(target_prefix)
+RUBYARCHDIR = /home/jaigouk/development/merb-book/gems/gems/fastthread-1.0.1/lib$(target_prefix)
 
 TARGET_SO     = $(DLLIB)
-CLEANLIBS     = $(TARGET).bundle $(TARGET).il? $(TARGET).tds $(TARGET).map
+CLEANLIBS     = $(TARGET).so $(TARGET).il? $(TARGET).tds $(TARGET).map
 CLEANOBJS     = *.o *.a *.s[ol] *.pdb *.exp *.bak
 
 all:		$(DLLIB)</diff>
      <filename>gems/gems/fastthread-1.0.1/ext/fastthread/Makefile</filename>
    </modified>
    <modified>
      <diff></diff>
      <filename>gems/gems/fastthread-1.0.1/ext/fastthread/fastthread.o</filename>
    </modified>
    <modified>
      <diff>@@ -4,62 +4,65 @@ SHELL = /bin/sh
 #### Start of system configuration section. ####
 
 srcdir = .
-topdir = /opt/local/lib/ruby/1.8/i686-darwin9.1.0
+topdir = /usr/lib/ruby/1.8/i486-linux
 hdrdir = $(topdir)
 VPATH = $(srcdir):$(topdir):$(hdrdir)
-prefix = $(DESTDIR)/opt/local
 exec_prefix = $(prefix)
-sitedir = $(prefix)/lib/ruby/site_ruby
-rubylibdir = $(libdir)/ruby/$(ruby_version)
-docdir = $(datarootdir)/doc/$(PACKAGE)
-dvidir = $(docdir)
-datarootdir = $(prefix)/share
-archdir = $(rubylibdir)/$(arch)
-sbindir = $(exec_prefix)/sbin
+prefix = $(DESTDIR)/usr
+sharedstatedir = $(prefix)/com
+mandir = $(prefix)/share/man
 psdir = $(docdir)
-vendordir = $(prefix)/lib/ruby/vendor_ruby
+oldincludedir = $(DESTDIR)/usr/include
 localedir = $(datarootdir)/locale
+bindir = $(exec_prefix)/bin
+libexecdir = $(prefix)/lib/ruby1.8
+sitedir = $(DESTDIR)/usr/local/lib/site_ruby
 htmldir = $(docdir)
-datadir = $(datarootdir)
+vendorarchdir = $(vendorlibdir)/$(sitearch)
 includedir = $(prefix)/include
-infodir = $(datarootdir)/info
-sysconfdir = $(prefix)/etc
-mandir = $(DESTDIR)/opt/local/share/man
+infodir = $(prefix)/share/info
+vendorlibdir = $(vendordir)/$(ruby_version)
+sysconfdir = $(DESTDIR)/etc
 libdir = $(exec_prefix)/lib
-sharedstatedir = $(prefix)/com
-oldincludedir = $(DESTDIR)/usr/include
+sbindir = $(exec_prefix)/sbin
+rubylibdir = $(libdir)/ruby/$(ruby_version)
+docdir = $(datarootdir)/doc/$(PACKAGE)
+dvidir = $(docdir)
+vendordir = $(libdir)/ruby/vendor_ruby
+datarootdir = $(prefix)/share
 pdfdir = $(docdir)
+archdir = $(rubylibdir)/$(arch)
 sitearchdir = $(sitelibdir)/$(sitearch)
-vendorarchdir = $(vendorlibdir)/$(vendorarch)
-bindir = $(exec_prefix)/bin
-localstatedir = $(prefix)/var
-vendorlibdir = $(vendordir)/$(ruby_version)
+datadir = $(datarootdir)
+localstatedir = $(DESTDIR)/var
 sitelibdir = $(sitedir)/$(ruby_version)
-libexecdir = $(exec_prefix)/libexec
 
-CC = gcc
+CC = cc
 LIBRUBY = $(LIBRUBY_SO)
 LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
 LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
 LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
 
 RUBY_EXTCONF_H = 
-CFLAGS   =  -fno-common -O2  -fno-common -pipe -fno-common 
-INCFLAGS = -I. -I. -I/opt/local/lib/ruby/1.8/i686-darwin9.1.0 -I.
-CPPFLAGS =  -I/opt/local/include
+CFLAGS   =  -fPIC -fno-strict-aliasing -g -g -O2  -fPIC $(cflags) 
+INCFLAGS = -I. -I. -I/usr/lib/ruby/1.8/i486-linux -I.
+DEFS     = -D_FILE_OFFSET_BITS=64
+CPPFLAGS =   -D_FILE_OFFSET_BITS=64 
 CXXFLAGS = $(CFLAGS) 
-DLDFLAGS = -L. -L/opt/local/lib  
-LDSHARED = cc -dynamic -bundle -undefined suppress -flat_namespace
+ldflags  = -L. -Wl,-Bsymbolic-functions -rdynamic -Wl,-export-dynamic
+dldflags = 
+archflag = 
+DLDFLAGS = $(ldflags) $(dldflags) $(archflag)
+LDSHARED = $(CC) -shared
 AR = ar
 EXEEXT = 
 
-RUBY_INSTALL_NAME = ruby
-RUBY_SO_NAME = ruby
-arch = i686-darwin9.1.0
-sitearch = i686-darwin9.1.0
-vendorarch = i686-darwin9.1.0
+RUBY_INSTALL_NAME = ruby1.8
+RUBY_SO_NAME = ruby1.8
+arch = i486-linux
+sitearch = i486-linux
 ruby_version = 1.8
-ruby = /opt/local/bin/ruby
+ruby = /usr/bin/ruby1.8
 RUBY = $(ruby)
 RM = rm -f
 MAKEDIRS = mkdir -p
@@ -73,7 +76,7 @@ COPY = cp
 preload = 
 
 libpath = . $(libdir)
-LIBPATH =  -L&quot;.&quot; -L&quot;$(libdir)&quot;
+LIBPATH =  -L. -L$(libdir)
 DEFFILE = 
 
 CLEANFILES = mkmf.log
@@ -83,20 +86,21 @@ extout =
 extout_prefix = 
 target_prefix = 
 LOCAL_LIBS = 
-LIBS = $(LIBRUBYARG_SHARED) -lc  -lpthread -ldl -lobjc  
+LIBS = $(LIBRUBYARG_SHARED) -lc  -lpthread -ldl -lcrypt -lm   -lc
 SRCS = http11.c http11_parser.c
 OBJS = http11.o http11_parser.o
 TARGET = http11
-DLLIB = $(TARGET).bundle
+DLLIB = $(TARGET).so
 EXTSTATIC = 
 STATIC_LIB = 
 
+BINDIR        = $(bindir)
 RUBYCOMMONDIR = $(sitedir)$(target_prefix)
-RUBYLIBDIR = /Users/peter/code/merb-book/gems/gems/mongrel-1.1.5/lib$(target_prefix)
-RUBYARCHDIR = /Users/peter/code/merb-book/gems/gems/mongrel-1.1.5/lib$(target_prefix)
+RUBYLIBDIR = /home/jaigouk/development/merb-book/gems/gems/mongrel-1.1.5/lib$(target_prefix)
+RUBYARCHDIR = /home/jaigouk/development/merb-book/gems/gems/mongrel-1.1.5/lib$(target_prefix)
 
 TARGET_SO     = $(DLLIB)
-CLEANLIBS     = $(TARGET).bundle $(TARGET).il? $(TARGET).tds $(TARGET).map
+CLEANLIBS     = $(TARGET).so $(TARGET).il? $(TARGET).tds $(TARGET).map
 CLEANOBJS     = *.o *.a *.s[ol] *.pdb *.exp *.bak
 
 all:		$(DLLIB)</diff>
      <filename>gems/gems/mongrel-1.1.5/ext/http11/Makefile</filename>
    </modified>
    <modified>
      <diff></diff>
      <filename>gems/gems/mongrel-1.1.5/ext/http11/http11.o</filename>
    </modified>
    <modified>
      <diff></diff>
      <filename>gems/gems/mongrel-1.1.5/ext/http11/http11_parser.o</filename>
    </modified>
    <modified>
      <diff>@@ -1,6 +1,6 @@
 have_library: checking for main() in -lc... -------------------- yes
 
-&quot;gcc -o conftest -I. -I/opt/local/lib/ruby/1.8/i686-darwin9.1.0 -I. -I/opt/local/include -O2  -fno-common -pipe -fno-common conftest.c  -L&quot;.&quot; -L&quot;/opt/local/lib&quot; -L. -L/opt/local/lib     -lruby-static -lc  -lpthread -ldl -lobjc  &quot;
+&quot;cc -o conftest -I. -I/usr/lib/ruby/1.8/i486-linux -I.  -D_FILE_OFFSET_BITS=64  -fno-strict-aliasing -g -g -O2  -fPIC   conftest.c  -L. -L/usr/lib -L. -Wl,-Bsymbolic-functions -rdynamic -Wl,-export-dynamic     -lruby1.8-static -lc  -lpthread -ldl -lcrypt -lm   -lc&quot;
 checked program was:
 /* begin */
 1: /*top*/</diff>
      <filename>gems/gems/mongrel-1.1.5/ext/http11/mkmf.log</filename>
    </modified>
    <modified>
      <diff>@@ -4,62 +4,65 @@ SHELL = /bin/sh
 #### Start of system configuration section. ####
 
 srcdir = .
-topdir = /opt/local/lib/ruby/1.8/i686-darwin9.1.0
+topdir = /usr/lib/ruby/1.8/i486-linux
 hdrdir = $(topdir)
 VPATH = $(srcdir):$(topdir):$(hdrdir)
-prefix = $(DESTDIR)/opt/local
 exec_prefix = $(prefix)
-sitedir = $(prefix)/lib/ruby/site_ruby
-rubylibdir = $(libdir)/ruby/$(ruby_version)
-docdir = $(datarootdir)/doc/$(PACKAGE)
-dvidir = $(docdir)
-datarootdir = $(prefix)/share
-archdir = $(rubylibdir)/$(arch)
-sbindir = $(exec_prefix)/sbin
+prefix = $(DESTDIR)/usr
+sharedstatedir = $(prefix)/com
+mandir = $(prefix)/share/man
 psdir = $(docdir)
-vendordir = $(prefix)/lib/ruby/vendor_ruby
+oldincludedir = $(DESTDIR)/usr/include
 localedir = $(datarootdir)/locale
+bindir = $(exec_prefix)/bin
+libexecdir = $(prefix)/lib/ruby1.8
+sitedir = $(DESTDIR)/usr/local/lib/site_ruby
 htmldir = $(docdir)
-datadir = $(datarootdir)
+vendorarchdir = $(vendorlibdir)/$(sitearch)
 includedir = $(prefix)/include
-infodir = $(datarootdir)/info
-sysconfdir = $(prefix)/etc
-mandir = $(DESTDIR)/opt/local/share/man
+infodir = $(prefix)/share/info
+vendorlibdir = $(vendordir)/$(ruby_version)
+sysconfdir = $(DESTDIR)/etc
 libdir = $(exec_prefix)/lib
-sharedstatedir = $(prefix)/com
-oldincludedir = $(DESTDIR)/usr/include
+sbindir = $(exec_prefix)/sbin
+rubylibdir = $(libdir)/ruby/$(ruby_version)
+docdir = $(datarootdir)/doc/$(PACKAGE)
+dvidir = $(docdir)
+vendordir = $(libdir)/ruby/vendor_ruby
+datarootdir = $(prefix)/share
 pdfdir = $(docdir)
+archdir = $(rubylibdir)/$(arch)
 sitearchdir = $(sitelibdir)/$(sitearch)
-vendorarchdir = $(vendorlibdir)/$(vendorarch)
-bindir = $(exec_prefix)/bin
-localstatedir = $(prefix)/var
-vendorlibdir = $(vendordir)/$(ruby_version)
+datadir = $(datarootdir)
+localstatedir = $(DESTDIR)/var
 sitelibdir = $(sitedir)/$(ruby_version)
-libexecdir = $(exec_prefix)/libexec
 
-CC = gcc
+CC = cc
 LIBRUBY = $(LIBRUBY_SO)
 LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
 LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
 LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
 
 RUBY_EXTCONF_H = 
-CFLAGS   =  -fno-common -O2  -fno-common -pipe -fno-common  -g -DXP_UNIX -O3 -Wall -Wextra -Wcast-qual -Wwrite-strings -Wconversion -Wmissing-noreturn -Winline 
-INCFLAGS = -I. -I. -I/opt/local/lib/ruby/1.8/i686-darwin9.1.0 -I. -I/opt/local/include/libxml2
-CPPFLAGS =  -I/opt/local/include
+CFLAGS   =  -fPIC -fno-strict-aliasing -g -g -O2  -fPIC $(cflags)  -g -DXP_UNIX -O3 -Wall -Wextra -Wcast-qual -Wwrite-strings -Wconversion -Wmissing-noreturn -Winline 
+INCFLAGS = -I. -I. -I/usr/lib/ruby/1.8/i486-linux -I. -I/usr/include/libxml2
+DEFS     = -D_FILE_OFFSET_BITS=64
+CPPFLAGS =   -D_FILE_OFFSET_BITS=64 
 CXXFLAGS = $(CFLAGS) 
-DLDFLAGS = -L. -L/opt/local/lib  
-LDSHARED = cc -dynamic -bundle -undefined suppress -flat_namespace
+ldflags  = -L. -Wl,-Bsymbolic-functions -rdynamic -Wl,-export-dynamic
+dldflags = 
+archflag = 
+DLDFLAGS = $(ldflags) $(dldflags) $(archflag)
+LDSHARED = $(CC) -shared
 AR = ar
 EXEEXT = 
 
-RUBY_INSTALL_NAME = ruby
-RUBY_SO_NAME = ruby
-arch = i686-darwin9.1.0
-sitearch = i686-darwin9.1.0
-vendorarch = i686-darwin9.1.0
+RUBY_INSTALL_NAME = ruby1.8
+RUBY_SO_NAME = ruby1.8
+arch = i486-linux
+sitearch = i486-linux
 ruby_version = 1.8
-ruby = /opt/local/bin/ruby
+ruby = /usr/bin/ruby1.8
 RUBY = $(ruby)
 RM = rm -f
 MAKEDIRS = mkdir -p
@@ -73,7 +76,7 @@ COPY = cp
 preload = 
 
 libpath = . $(libdir)
-LIBPATH =  -L&quot;.&quot; -L&quot;$(libdir)&quot;
+LIBPATH =  -L. -L$(libdir)
 DEFFILE = 
 
 CLEANFILES = mkmf.log
@@ -83,20 +86,21 @@ extout =
 extout_prefix = 
 target_prefix = /nokogiri
 LOCAL_LIBS = 
-LIBS = $(LIBRUBYARG_SHARED) -lxslt -lxml2  -lpthread -ldl -lobjc  
-SRCS = html_document.c html_sax_parser.c native.c xml_cdata.c xml_document.c xml_dtd.c xml_io.c xml_node.c xml_node_set.c xml_reader.c xml_sax_parser.c xml_syntax_error.c xml_text.c xml_xpath.c xml_xpath_context.c xslt_stylesheet.c
-OBJS = html_document.o html_sax_parser.o native.o xml_cdata.o xml_document.o xml_dtd.o xml_io.o xml_node.o xml_node_set.o xml_reader.o xml_sax_parser.o xml_syntax_error.o xml_text.o xml_xpath.o xml_xpath_context.o xslt_stylesheet.o
+LIBS = $(LIBRUBYARG_SHARED) -lxslt -lxml2  -lpthread -ldl -lcrypt -lm   -lc
+SRCS = xml_dtd.c native.c xml_text.c xml_node_set.c xslt_stylesheet.c xml_document.c html_document.c xml_io.c xml_cdata.c xml_sax_parser.c xml_xpath.c xml_reader.c html_sax_parser.c xml_xpath_context.c xml_node.c xml_syntax_error.c
+OBJS = xml_dtd.o native.o xml_text.o xml_node_set.o xslt_stylesheet.o xml_document.o html_document.o xml_io.o xml_cdata.o xml_sax_parser.o xml_xpath.o xml_reader.o html_sax_parser.o xml_xpath_context.o xml_node.o xml_syntax_error.o
 TARGET = native
-DLLIB = $(TARGET).bundle
+DLLIB = $(TARGET).so
 EXTSTATIC = 
 STATIC_LIB = 
 
+BINDIR        = $(bindir)
 RUBYCOMMONDIR = $(sitedir)$(target_prefix)
 RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
 RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
 
 TARGET_SO     = $(DLLIB)
-CLEANLIBS     = $(TARGET).bundle $(TARGET).il? $(TARGET).tds $(TARGET).map
+CLEANLIBS     = $(TARGET).so $(TARGET).il? $(TARGET).tds $(TARGET).map
 CLEANOBJS     = *.o *.a *.s[ol] *.pdb *.exp *.bak
 
 all:		$(DLLIB)</diff>
      <filename>gems/gems/nokogiri-1.0.6/ext/nokogiri/Makefile</filename>
    </modified>
    <modified>
      <diff></diff>
      <filename>gems/gems/nokogiri-1.0.6/ext/nokogiri/html_document.o</filename>
    </modified>
    <modified>
      <diff></diff>
      <filename>gems/gems/nokogiri-1.0.6/ext/nokogiri/html_sax_parser.o</filename>
    </modified>
    <modified>
      <diff>@@ -1,6 +1,6 @@
 find_library: checking for xmlParseDoc() in -lxml2... -------------------- yes
 
-&quot;gcc -o conftest -I. -I/opt/local/lib/ruby/1.8/i686-darwin9.1.0 -I. -I/opt/local/include -O2  -fno-common -pipe -fno-common  -g -DXP_UNIX -O3 -Wall -Wextra -Wcast-qual -Wwrite-strings -Wconversion -Wmissing-noreturn -Winline conftest.c  -L&quot;.&quot; -L&quot;/opt/local/lib&quot; -L. -L/opt/local/lib     -lruby-static -lxml2  -lpthread -ldl -lobjc  &quot;
+&quot;cc -o conftest -I. -I/usr/lib/ruby/1.8/i486-linux -I.  -D_FILE_OFFSET_BITS=64  -fno-strict-aliasing -g -g -O2  -fPIC    -g -DXP_UNIX -O3 -Wall -Wextra -Wcast-qual -Wwrite-strings -Wconversion -Wmissing-noreturn -Winline conftest.c  -L. -L/usr/lib -L. -Wl,-Bsymbolic-functions -rdynamic -Wl,-export-dynamic     -lruby1.8-static -lxml2  -lpthread -ldl -lcrypt -lm   -lc&quot;
 conftest.c: In function &#8216;t&#8217;:
 conftest.c:3: error: &#8216;xmlParseDoc&#8217; undeclared (first use in this function)
 conftest.c:3: error: (Each undeclared identifier is reported only once
@@ -12,7 +12,7 @@ checked program was:
 3: int t() { void ((*volatile p)()); p = (void ((*)()))xmlParseDoc; return 0; }
 /* end */
 
-&quot;gcc -o conftest -I. -I/opt/local/lib/ruby/1.8/i686-darwin9.1.0 -I. -I/opt/local/include -O2  -fno-common -pipe -fno-common  -g -DXP_UNIX -O3 -Wall -Wextra -Wcast-qual -Wwrite-strings -Wconversion -Wmissing-noreturn -Winline conftest.c  -L&quot;.&quot; -L&quot;/opt/local/lib&quot; -L. -L/opt/local/lib     -lruby-static -lxml2  -lpthread -ldl -lobjc  &quot;
+&quot;cc -o conftest -I. -I/usr/lib/ruby/1.8/i486-linux -I.  -D_FILE_OFFSET_BITS=64  -fno-strict-aliasing -g -g -O2  -fPIC    -g -DXP_UNIX -O3 -Wall -Wextra -Wcast-qual -Wwrite-strings -Wconversion -Wmissing-noreturn -Winline conftest.c  -L. -L/usr/lib -L. -Wl,-Bsymbolic-functions -rdynamic -Wl,-export-dynamic     -lruby1.8-static -lxml2  -lpthread -ldl -lcrypt -lm   -lc&quot;
 conftest.c: In function &#8216;t&#8217;:
 conftest.c:3: warning: implicit declaration of function &#8216;xmlParseDoc&#8217;
 checked program was:
@@ -26,7 +26,7 @@ checked program was:
 
 find_library: checking for xsltParseStylesheetDoc() in -lxslt... -------------------- yes
 
-&quot;gcc -o conftest -I. -I/opt/local/lib/ruby/1.8/i686-darwin9.1.0 -I. -I/opt/local/include -O2  -fno-common -pipe -fno-common  -g -DXP_UNIX -O3 -Wall -Wextra -Wcast-qual -Wwrite-strings -Wconversion -Wmissing-noreturn -Winline conftest.c  -L&quot;.&quot; -L&quot;/opt/local/lib&quot; -L. -L/opt/local/lib    -lxml2  -lruby-static -lxslt -lxml2  -lpthread -ldl -lobjc  &quot;
+&quot;cc -o conftest -I. -I/usr/lib/ruby/1.8/i486-linux -I.  -D_FILE_OFFSET_BITS=64  -fno-strict-aliasing -g -g -O2  -fPIC    -g -DXP_UNIX -O3 -Wall -Wextra -Wcast-qual -Wwrite-strings -Wconversion -Wmissing-noreturn -Winline conftest.c  -L. -L/usr/lib -L. -Wl,-Bsymbolic-functions -rdynamic -Wl,-export-dynamic    -lxml2  -lruby1.8-static -lxslt -lxml2  -lpthread -ldl -lcrypt -lm   -lc&quot;
 conftest.c: In function &#8216;t&#8217;:
 conftest.c:3: error: &#8216;xsltParseStylesheetDoc&#8217; undeclared (first use in this function)
 conftest.c:3: error: (Each undeclared identifier is reported only once
@@ -38,7 +38,7 @@ checked program was:
 3: int t() { void ((*volatile p)()); p = (void ((*)()))xsltParseStylesheetDoc; return 0; }
 /* end */
 
-&quot;gcc -o conftest -I. -I/opt/local/lib/ruby/1.8/i686-darwin9.1.0 -I. -I/opt/local/include -O2  -fno-common -pipe -fno-common  -g -DXP_UNIX -O3 -Wall -Wextra -Wcast-qual -Wwrite-strings -Wconversion -Wmissing-noreturn -Winline conftest.c  -L&quot;.&quot; -L&quot;/opt/local/lib&quot; -L. -L/opt/local/lib    -lxml2  -lruby-static -lxslt -lxml2  -lpthread -ldl -lobjc  &quot;
+&quot;cc -o conftest -I. -I/usr/lib/ruby/1.8/i486-linux -I.  -D_FILE_OFFSET_BITS=64  -fno-strict-aliasing -g -g -O2  -fPIC    -g -DXP_UNIX -O3 -Wall -Wextra -Wcast-qual -Wwrite-strings -Wconversion -Wmissing-noreturn -Winline conftest.c  -L. -L/usr/lib -L. -Wl,-Bsymbolic-functions -rdynamic -Wl,-export-dynamic    -lxml2  -lruby1.8-static -lxslt -lxml2  -lpthread -ldl -lcrypt -lm   -lc&quot;
 conftest.c: In function &#8216;t&#8217;:
 conftest.c:3: warning: implicit declaration of function &#8216;xsltParseStylesheetDoc&#8217;
 checked program was:
@@ -50,17 +50,16 @@ checked program was:
 
 --------------------
 
-find_header: checking for #include &lt;libxml/xmlversion.h&gt;
-... -------------------- yes
+find_header: checking for libxml/xmlversion.h in /usr/include/libxml2,/usr/include/libxml2... -------------------- yes
 
-&quot;gcc -E -I. -I/opt/local/lib/ruby/1.8/i686-darwin9.1.0 -I. -I/opt/local/include -O2  -fno-common -pipe -fno-common  -g -DXP_UNIX -O3 -Wall -Wextra -Wcast-qual -Wwrite-strings -Wconversion -Wmissing-noreturn -Winline  conftest.c -o conftest.i&quot;
+&quot;cc -E -I. -I/usr/lib/ruby/1.8/i486-linux -I.  -D_FILE_OFFSET_BITS=64  -fno-strict-aliasing -g -g -O2  -fPIC    -g -DXP_UNIX -O3 -Wall -Wextra -Wcast-qual -Wwrite-strings -Wconversion -Wmissing-noreturn -Winline  conftest.c -o conftest.i&quot;
 conftest.c:1:31: error: libxml/xmlversion.h: No such file or directory
 checked program was:
 /* begin */
 1: #include &lt;libxml/xmlversion.h&gt;
 /* end */
 
-&quot;gcc -E -I. -I/opt/local/lib/ruby/1.8/i686-darwin9.1.0 -I. -I/opt/local/include -O2  -fno-common -pipe -fno-common  -g -DXP_UNIX -O3 -Wall -Wextra -Wcast-qual -Wwrite-strings -Wconversion -Wmissing-noreturn -Winline -I/opt/local/include/libxml2 conftest.c -o conftest.i&quot;
+&quot;cc -E -I. -I/usr/lib/ruby/1.8/i486-linux -I.  -D_FILE_OFFSET_BITS=64  -fno-strict-aliasing -g -g -O2  -fPIC    -g -DXP_UNIX -O3 -Wall -Wextra -Wcast-qual -Wwrite-strings -Wconversion -Wmissing-noreturn -Winline -I/usr/include/libxml2 conftest.c -o conftest.i&quot;
 checked program was:
 /* begin */
 1: #include &lt;libxml/xmlversion.h&gt;
@@ -68,10 +67,9 @@ checked program was:
 
 --------------------
 
-find_header: checking for #include &lt;libxslt/xslt.h&gt;
-... -------------------- yes
+find_header: checking for libxslt/xslt.h in /usr/include,/usr/include... -------------------- yes
 
-&quot;gcc -E -I. -I/opt/local/lib/ruby/1.8/i686-darwin9.1.0 -I. -I/opt/local/include/libxml2 -I/opt/local/include -O2  -fno-common -pipe -fno-common  -g -DXP_UNIX -O3 -Wall -Wextra -Wcast-qual -Wwrite-strings -Wconversion -Wmissing-noreturn -Winline  conftest.c -o conftest.i&quot;
+&quot;cc -E -I. -I/usr/lib/ruby/1.8/i486-linux -I. -I/usr/include/libxml2  -D_FILE_OFFSET_BITS=64  -fno-strict-aliasing -g -g -O2  -fPIC    -g -DXP_UNIX -O3 -Wall -Wextra -Wcast-qual -Wwrite-strings -Wconversion -Wmissing-noreturn -Winline  conftest.c -o conftest.i&quot;
 checked program was:
 /* begin */
 1: #include &lt;libxslt/xslt.h&gt;
@@ -79,7 +77,7 @@ checked program was:
 
 --------------------
 
-&quot;gcc -o conftest -I. -I/opt/local/lib/ruby/1.8/i686-darwin9.1.0 -I. -I/opt/local/include/libxml2 -I/opt/local/include -O2  -fno-common -pipe -fno-common  -g -DXP_UNIX -O3 -Wall -Wextra -Wcast-qual -Wwrite-strings -Wconversion -Wmissing-noreturn -Winline conftest.c  -L&quot;.&quot; -L&quot;/opt/local/lib&quot; -L. -L/opt/local/lib    -lxslt -lxml2  -lruby-static  -lpthread -ldl -lobjc  &quot;
+&quot;cc -o conftest -I. -I/usr/lib/ruby/1.8/i486-linux -I. -I/usr/include/libxml2  -D_FILE_OFFSET_BITS=64  -fno-strict-aliasing -g -g -O2  -fPIC    -g -DXP_UNIX -O3 -Wall -Wextra -Wcast-qual -Wwrite-strings -Wconversion -Wmissing-noreturn -Winline conftest.c  -L. -L/usr/lib -L. -Wl,-Bsymbolic-functions -rdynamic -Wl,-export-dynamic    -lxslt -lxml2  -lruby1.8-static  -lpthread -ldl -lcrypt -lm   -lc&quot;
 checked program was:
 /* begin */
 1: #include &lt;libxml/xmlversion.h&gt;</diff>
      <filename>gems/gems/nokogiri-1.0.6/ext/nokogiri/mkmf.log</filename>
    </modified>
    <modified>
      <diff></diff>
      <filename>gems/gems/nokogiri-1.0.6/ext/nokogiri/native.o</filename>
    </modified>
    <modified>
      <diff></diff>
      <filename>gems/gems/nokogiri-1.0.6/ext/nokogiri/xml_cdata.o</filename>
    </modified>
    <modified>
      <diff></diff>
      <filename>gems/gems/nokogiri-1.0.6/ext/nokogiri/xml_document.o</filename>
    </modified>
    <modified>
      <diff></diff>
      <filename>gems/gems/nokogiri-1.0.6/ext/nokogiri/xml_dtd.o</filename>
    </modified>
    <modified>
      <diff></diff>
      <filename>gems/gems/nokogiri-1.0.6/ext/nokogiri/xml_io.o</filename>
    </modified>
    <modified>
      <diff></diff>
      <filename>gems/gems/nokogiri-1.0.6/ext/nokogiri/xml_node.o</filename>
    </modified>
    <modified>
      <diff></diff>
      <filename>gems/gems/nokogiri-1.0.6/ext/nokogiri/xml_node_set.o</filename>
    </modified>
    <modified>
      <diff></diff>
      <filename>gems/gems/nokogiri-1.0.6/ext/nokogiri/xml_reader.o</filename>
    </modified>
    <modified>
      <diff></diff>
      <filename>gems/gems/nokogiri-1.0.6/ext/nokogiri/xml_sax_parser.o</filename>
    </modified>
    <modified>
      <diff></diff>
      <filename>gems/gems/nokogiri-1.0.6/ext/nokogiri/xml_syntax_error.o</filename>
    </modified>
    <modified>
      <diff></diff>
      <filename>gems/gems/nokogiri-1.0.6/ext/nokogiri/xml_text.o</filename>
    </modified>
    <modified>
      <diff></diff>
      <filename>gems/gems/nokogiri-1.0.6/ext/nokogiri/xml_xpath.o</filename>
    </modified>
    <modified>
      <diff></diff>
      <filename>gems/gems/nokogiri-1.0.6/ext/nokogiri/xml_xpath_context.o</filename>
    </modified>
    <modified>
      <diff></diff>
      <filename>gems/gems/nokogiri-1.0.6/ext/nokogiri/xslt_stylesheet.o</filename>
    </modified>
    <modified>
      <diff>@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = nil if s.respond_to? :required_rubygems_version=
   s.authors = [&quot;makoto kuwata&quot;]
   s.cert_chain = nil
-  s.date = %q{2006-03-12}
+  s.date = %q{2006-03-13}
   s.description = %q{'abstract.rb' is a library which enable you to define abstract method in Ruby.}
   s.files = [&quot;lib/abstract.rb&quot;, &quot;test/test.rb&quot;, &quot;README.txt&quot;, &quot;ChangeLog&quot;, &quot;setup.rb&quot;, &quot;abstract.gemspec&quot;]
   s.homepage = %q{http://rubyforge.org/projects/abstract}</diff>
      <filename>gems/specifications/abstract-1.0.0.gemspec</filename>
    </modified>
    <modified>
      <diff>@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new(&quot;&gt;= 0&quot;) if s.respond_to? :required_rubygems_version=
   s.authors = [&quot;makoto kuwata&quot;]
-  s.date = %q{2008-06-12}
+  s.date = %q{2008-06-13}
   s.default_executable = %q{erubis}
   s.description = %q{Erubis is an implementation of eRuby and has the following features:  * Very fast, almost three times faster than ERB and about 10% faster than eruby. * Multi-language support (Ruby/PHP/C/Java/Scheme/Perl/Javascript) * Auto escaping support * Auto trimming spaces around '&lt;% %&gt;' * Embedded pattern changeable (default '&lt;% %&gt;') * Enable to handle Processing Instructions (PI) as embedded pattern (ex. '&lt;?rb ... ?&gt;') * Context object available and easy to combine eRuby template with YAML datafile * Print statement available * Easy to extend and customize in subclass * Ruby on Rails support}
   s.email = %q{kwa(at)kuwata-lab.com}</diff>
      <filename>gems/specifications/erubis-2.6.2.gemspec</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>71cb580e691cf32edd05e93c82acb918dffc0c5a</id>
    </parent>
  </parents>
  <author>
    <name>jaigouk</name>
    <email>jaigouk@gmail.com</email>
  </author>
  <url>http://github.com/mattetti/merb-book/commit/9d4a623d04a01a40918970b3601606ab652d3020</url>
  <id>9d4a623d04a01a40918970b3601606ab652d3020</id>
  <committed-date>2008-12-29T06:23:19-08:00</committed-date>
  <authored-date>2008-12-29T06:23:19-08:00</authored-date>
  <message>redeployed merb, and it now runs ok. translated dm-schema</message>
  <tree>7dafb83e20858af51b9b549f8607ef0b56e64185</tree>
  <committer>
    <name>jaigouk</name>
    <email>jaigouk@gmail.com</email>
  </committer>
</commit>
