Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge in latest fixes

  • Loading branch information...
commit f939c213bdc4a7402a9ef274601e50ff7156c4a8 1 parent 9633866
@durran durran authored
View
2  en/mongoid/docs/installation.html
@@ -155,7 +155,7 @@
and provides a single database in that session named "mongoid".
</p>
<div class="CodeRay">
- <div class="code"><pre><span class="key">development</span>:&#x000A; <span class="key">sessions</span>:&#x000A; <span class="key">default</span>:&#x000A; <span class="key">database</span>: <span class="string"><span class="content">mongoid</span></span>&#x000A; <span class="key">hosts</span>: <span class="string"><span class="content">localhost:27017</span></span>&#x000A;</pre></div>
+ <div class="code"><pre><span class="key">development</span>:&#x000A; <span class="key">sessions</span>:&#x000A; <span class="key">default</span>:&#x000A; <span class="key">database</span>: <span class="string"><span class="content">mongoid</span></span>&#x000A; <span class="key">hosts</span>:&#x000A; - <span class="string"><span class="content">localhost:27017</span></span>&#x000A;</pre></div>
</div>
<h3>Rails Applications</h3>
<p>
View
4 en/mongoid/docs/persistence.html
@@ -132,7 +132,7 @@
<td class='doc'>
<code>Model.create</code>
<p class='doc'>
- <i>Insert a document into the dataabase</i>
+ <i>Insert a document into the database</i>
</p>
</td>
<td>
@@ -151,7 +151,7 @@
<code>Model.create!</code>
<p class='doc'>
<i>
- Insert a document into the dataabase,
+ Insert a document into the database,
raising an error if a validation error occurs.
</i>
</p>
View
2  en/mongoid/docs/upgrading.html
@@ -131,7 +131,7 @@
</p>
<p>
<code>.demongoize</code> is a class method, that can take some data from mongo
- and instantiate and object of your custom type.
+ and instantiate an object of your custom type.
</p>
<p>
<code>.evolve</code> is a class method, that can take any object, and
Please sign in to comment.
Something went wrong with that request. Please try again.