Browse files

Pushing latest changes

  • Loading branch information...
1 parent 828ee6b commit 2b15efcb58ff3a663bedcd88cdda5cb3bd8a40d3 @durran durran committed Aug 25, 2012
View
2 en/mongoid/docs/documents.html
@@ -479,7 +479,7 @@
</div>
<h3>Resetting changes</h3>
<p>
- You can reset changes of a field to it's previous value by calling the
+ You can reset changes of a field to its previous value by calling the
reset method.
</p>
<div class="CodeRay">
View
2 en/mongoid/docs/extras.html
@@ -118,7 +118,7 @@
module to give you just that.
</p>
<div class="CodeRay">
- <div class="code"><pre><span class="keyword">class</span> <span class="class">Person</span>&#x000A; include <span class="constant">Mongoid</span>::<span class="constant">Document</span>&#x000A; include <span class="constant">Mongoid</span>::<span class="constant">Paranoia</span>&#x000A;<span class="keyword">end</span>&#x000A;&#x000A;person.delete <span class="comment"># Sets the deleted_at field to the current time.</span>&#x000A;person.delete! <span class="comment"># Permanently deletes the document.</span>&#x000A;person.destroy! <span class="comment"># Permanently delete the document with callbacks.</span>&#x000A;person.restore <span class="comment"># Brings the &quot;deleted&quot; document back to life.</span>&#x000A;</pre></div>
+ <div class="code"><pre><span class="keyword">class</span> <span class="class">Person</span>&#x000A; include <span class="constant">Mongoid</span>::<span class="constant">Document</span>&#x000A; include <span class="constant">Mongoid</span>::<span class="constant">Paranoia</span>&#x000A;<span class="keyword">end</span>&#x000A;&#x000A;person.delete <span class="comment"># Sets the deleted_at field to the current time, ignoring callbacks.</span>&#x000A;person.delete! <span class="comment"># Permanently deletes the document, ignoring callbacks.</span>&#x000A;person.destroy <span class="comment"># Sets the deleted_at field to the current time, firing callbacks.</span>&#x000A;person.destroy! <span class="comment"># Permanently deletes the document, firing callbacks.</span>&#x000A;person.restore <span class="comment"># Brings the &quot;deleted&quot; document back to life.</span>&#x000A;</pre></div>
</div>
<p>
The documents that have been "flagged" as deleted (soft deleted)
View
6 en/mongoid/docs/identity_map.html
@@ -115,9 +115,9 @@
<div class="code"><pre><span class="constant">Mongoid</span>.identity_map_enabled = <span class="predefined-constant">true</span>&#x000A;</pre></div>
</div>
<p>
- When a document is now loaded from the database, is is automatically
- added to the identity map by it's class and id. Subsequent request for
- that document by it's id will not hit the database, but rather pull
+ When a document is now loaded from the database, it is automatically
+ added to the identity map by its class and id. Subsequent request for
+ that document by its id will not hit the database, but rather pull
the document back from the identity map itself.
</p>
<p>
View
2 en/mongoid/docs/installation.html
@@ -365,7 +365,7 @@
<h2>Sharding</h2>
<p>
If you are using Mongoid in a sharded MongoDB environment and want to tell
- Mongoid to include the shard keys in it's updates, specify this at the
+ Mongoid to include the shard keys in its updates, specify this at the
model class level.
</p>
<div class="CodeRay">
View
2 en/mongoid/docs/persistence.html
@@ -689,7 +689,7 @@
</div>
<p>
Persisting using <code>with</code> is a <i>one time</i> switch in the persistence
- context - it changes back to it's defaults immediately after. Mongoid
+ context - it changes back to its defaults immediately after. Mongoid
will not remember anything specific on the document level regarding how it was
saved when using this method. A potential gotcha with this is persisting a document
via <code>with</code> and then immediately updating it after.
View
6 en/mongoid/docs/querying.html
@@ -127,8 +127,8 @@
<tr>
<td class='achtung'><img src="/images/achtung.png" /></td>
<td class='note'>
- Most of Mongoid's criteria has been extracted into it's own
- gem, Origin, which Mongoid now depends on for most of it's API.
+ Most of Mongoid's criteria has been extracted into its own
+ gem, Origin, which Mongoid now depends on for most of its API.
A complete list of commands can be found in
<a href="/en/origin/docs/selection.html">Selection with Origin</a>
and <a href="/en/origin/docs/options.html">Options with Origin</a>.
@@ -782,7 +782,7 @@
<code>has_many</code>, <code>has_and_belongs_to_many</code>, or
<code>embeds_many</code>, you must reload the relation to have scoping reapplied.
This is important to note if you change a value of a document in the relation
- that would affect it's visibility within the scoped relation.
+ that would affect its visibility within the scoped relation.
</p>
<div class="CodeRay">
<div class="code"><pre><span class="keyword">class</span> <span class="class">Label</span>&#x000A; include <span class="constant">Mongoid</span>::<span class="constant">Document</span>&#x000A; embeds_many <span class="symbol">:bands</span>&#x000A;<span class="keyword">end</span>&#x000A;&#x000A;<span class="keyword">class</span> <span class="class">Band</span>&#x000A; include <span class="constant">Mongoid</span>::<span class="constant">Document</span>&#x000A; field <span class="symbol">:active</span>, default: <span class="predefined-constant">true</span>&#x000A; embedded_in <span class="symbol">:label</span>&#x000A; default_scoped where(active: <span class="predefined-constant">true</span>)&#x000A;<span class="keyword">end</span>&#x000A;&#x000A;label.bands.push(band)&#x000A;label.bands <span class="comment">#=&gt; [ band ]</span>&#x000A;band.update_attribute(<span class="symbol">:active</span>, <span class="predefined-constant">false</span>)&#x000A;label.bands <span class="comment">#=&gt; [ band ] Must reload.</span>&#x000A;label.reload.bands <span class="comment">#=&gt; []</span>&#x000A;</pre></div>
View
8 en/mongoid/docs/relations.html
@@ -184,7 +184,7 @@
<h3>Cascading Callbacks</h3>
<p>
If you want the embedded document callbacks to fire when calling a persistence
- operation on it's parent, you will need to provide the cascade callbacks
+ operation on its parent, you will need to provide the cascade callbacks
option to the relation.
</p>
<div class='well'>
@@ -1111,7 +1111,7 @@
</p>
<h3>Storage</h3>
<p>
- When defining a relation of this nature, each document is stored in it's
+ When defining a relation of this nature, each document is stored in its
respective collection, but the child document contains a "foreign key"
reference to the parent.
</p>
@@ -1266,7 +1266,7 @@
</p>
<h3>Storage</h3>
<p>
- When defining a relation of this nature, each document is stored in it's
+ When defining a relation of this nature, each document is stored in its
respective collection, but the child document contains a "foreign key"
reference to the parent.
</p>
@@ -1675,7 +1675,7 @@
</div>
<h3>Storage</h3>
<p>
- When defining a relation of this nature, each document is stored in it's
+ When defining a relation of this nature, each document is stored in its
respective collection, and each document contains a "foreign key"
reference to the other in the form of an array.
</p>
View
6 en/mongoid/docs/upgrading.html
@@ -132,7 +132,7 @@
<div class="CodeRay">
<div class="code"><pre><span class="keyword">class</span> <span class="class">Band</span>&#x000A; include <span class="constant">Mongoid</span>::<span class="constant">Document</span>&#x000A; field <span class="symbol">:name</span>, type: <span class="constant">String</span>&#x000A; index({ name: <span class="integer">1</span> }, { unique: <span class="predefined-constant">true</span>, background: <span class="predefined-constant">true</span> })&#x000A;<span class="keyword">end</span>&#x000A;</pre></div>
</div>
- <p>Geospacial indexing needs "2d" as it's direction.</p>
+ <p>Geospacial indexing needs "2d" as its direction.</p>
<div class="CodeRay">
<div class="code"><pre><span class="keyword">class</span> <span class="class">Venue</span>&#x000A; include <span class="constant">Mongoid</span>::<span class="constant">Document</span>&#x000A; field <span class="symbol">:location</span>, type: <span class="constant">Array</span>&#x000A;&#x000A; index location: <span class="string"><span class="delimiter">&quot;</span><span class="content">2d</span><span class="delimiter">&quot;</span></span>&#x000A;<span class="keyword">end</span>&#x000A;</pre></div>
</div>
@@ -313,12 +313,12 @@
the relation will return empty results.
</p>
<p>
- If the id is set and it's document is persisted, accessing the relation
+ If the id is set and its document is persisted, accessing the relation
will return the document.
</p>
<p>
If the id is set, but the base document is not saved afterwards, then
- reloading will return the document to it's original state.
+ reloading will return the document to its original state.
</p>
</li>
<li>
View
2 en/moped/docs/driver.html
@@ -330,7 +330,7 @@
<code>Indexes#[]</code>
<p class='doc'>
<i>
- Get an index by it's spec.
+ Get an index by its spec.
</i>
</p>
</td>
View
4 en/origin/docs/installation.html
@@ -133,7 +133,7 @@
</table>
</div>
<p>
- At any time you can ask the queryable for a <code>selector</code> or it's
+ At any time you can ask the queryable for a <code>selector</code> or its
<code>options</code>, which can then be used with your favourite driver
to query the database for documents.
</p>
@@ -163,7 +163,7 @@
<code>Queryable</code> object manually, but provide an easier way to
generate them from models. Origin provides a <code>Origin::Forwardable</code>
module to allow you to specify a method to create queryables from, and
- subsequently injects all of it's public API into the model in question.
+ subsequently injects all of its public API into the model in question.
</p>
<div class="CodeRay">
<div class="code"><pre><span class="keyword">class</span> <span class="class">Query</span>&#x000A; include <span class="constant">Origin</span>::<span class="constant">Queryable</span>&#x000A;<span class="keyword">end</span>&#x000A;&#x000A;<span class="keyword">class</span> <span class="class">Band</span>&#x000A; extend <span class="constant">Origin</span>::<span class="constant">Forwardable</span>&#x000A; select_with <span class="symbol">:query</span>&#x000A;&#x000A; <span class="keyword">def</span> <span class="predefined-constant">self</span>.<span class="function">query</span>&#x000A; <span class="constant">Query</span>.new&#x000A; <span class="keyword">end</span>&#x000A;<span class="keyword">end</span>&#x000A;&#x000A;<span class="constant">Band</span>.where(name: <span class="regexp"><span class="delimiter">/</span><span class="content">^depeceh</span><span class="delimiter">/</span><span class="modifier">i</span></span>).gt(likes: <span class="integer">10000</span>)&#x000A;<span class="constant">Band</span>.nin(name: [ <span class="string"><span class="delimiter">&quot;</span><span class="content">New Order</span><span class="delimiter">&quot;</span></span>, <span class="string"><span class="delimiter">&quot;</span><span class="content">Pet Shop Boys</span><span class="delimiter">&quot;</span></span> ]).asc(<span class="symbol">:likes</span>)</pre></div>
View
2 en/origin/docs/serialization.html
@@ -119,7 +119,7 @@
</div>
<p>
Then when instantiating your queryable, you need to provide it a hash of
- field name/serializer pairs as it's second argument.
+ field name/serializer pairs as its second argument.
</p>
<div class="CodeRay">
<div class="code"><pre><span class="keyword">class</span> <span class="class">Query</span>&#x000A; include <span class="constant">Origin</span>::<span class="constant">Queryable</span>&#x000A;<span class="keyword">end</span>&#x000A;&#x000A;queryable = <span class="constant">Query</span>.new({}, { <span class="string"><span class="delimiter">&quot;</span><span class="content">date</span><span class="delimiter">&quot;</span></span> =&gt; <span class="constant">DateSerializer</span>.new })&#x000A;</pre></div>

0 comments on commit 2b15efc

Please sign in to comment.