Replaced 'it's' by 'its' where needed and vice-versa

Maxime Buquet · Maxime Buquet · commit 6e7c76593868 · 2014-11-26T18:41:18.000+09:00
diff --git a/classes/arr.html b/classes/arr.html
@@ -977,7 +977,7 @@ <h4 id="method_filter_keys" class="method">filter_keys($array, $keys, $remove =
 
 			<article>
 				<h4 id="method_filter_recursive" class="method">filter_recursive($array, $callback = null)</h4>
-				<p>The <strong>filter_recursive</strong> method provides a recursive version of PHP's array_filter() function. Like it's counterpart, you can optionally pass a callback function to determine what should be filtered.</p>
+				<p>The <strong>filter_recursive</strong> method provides a recursive version of PHP's array_filter() function. Like its counterpart, you can optionally pass a callback function to determine what should be filtered.</p>
 				<table class="method">
 					<tbody>
 					<tr>
diff --git a/classes/database/dbutil.html b/classes/database/dbutil.html
@@ -964,7 +964,7 @@ <h4 class="method" id="method_drop_index">drop_index($table, $index_name, $db =
 
 			<article>
 				<h4 class="method" id="method_add_foregin_key">add_foregin_key($table, $foreign_key)</h4>
-				<p>The <strong>add_foreign_key</strong> method allows you to add a foreign key to a table after it's creation.</p>
+				<p>The <strong>add_foreign_key</strong> method allows you to add a foreign key to a table after its creation.</p>
 				<table class="method">
 					<tbody>
 						<tr>
diff --git a/classes/fieldset/fieldset.html b/classes/fieldset/fieldset.html
@@ -1219,9 +1219,9 @@ <h2 id="one_to_many_forms">Creating One-to-Many forms with ORM Models</h2>
 				<p>By default, the One-to-Many fieldset is displayed in tabular form, controlled by the template in the <kbd>config/form.php</kbd> file.
 				</p>
 
-				<pre class='php'><code>// We're going to create a one-to-many form of an article, identified by $id, and it's comments
+				<pre class='php'><code>// We're going to create a one-to-many form of an article, identified by $id, and its comments
 
-// get the article and it's related comments
+// get the article and its related comments
 $article = Model_Article::find($id, array('related' => array('comments')));
 
 // create the form fieldset for this article using the ORM model's form definition
@@ -1242,7 +1242,7 @@ <h2 id="one_to_many_forms">Creating One-to-Many forms with ORM Models</h2>
 
 				<p>
 					A tabular form generates HTML input tags that use an array with the name of the relation specified, and the primary key value of the
-					record as it's index value. Any blank rows that are added at the bottom of the table will use the relation name, with a '_new' suffix.
+					record as its index value. Any blank rows that are added at the bottom of the table will use the relation name, with a '_new' suffix.
 					This will allow you to update the parent record, and all related records, in one go, and process the new lines separately.
 				</p>
 				<p>
@@ -1434,7 +1434,7 @@ <h2 id="form_attributes">Form Attributes</h2>
 							<td>string</td>
 							<td><pre class="php"><code>'&lt;table&gt;{fields}&lt;/table&gt;\n'</code></pre></td>
 							<td>
-								template for the complete tabular form with all it's rows.
+								template for the complete tabular form with all its rows.
 							</td>
 						</tr>
 						<tr>
diff --git a/classes/ftp.html b/classes/ftp.html
@@ -607,7 +607,7 @@ <h4 class="method" id="method_delete">delete_dir($filepath)</h4>
 							<pre class="php"><code>// connect to an FTP server
 $ftp = Ftp::forge($config);
 
-// delete a folder with all it's contents
+// delete a folder with all its contents
 if ( ! $ftp->delete_dir('/path/to/folder'))
 {
 	// delete failed
diff --git a/classes/presenter.html b/classes/presenter.html
@@ -74,7 +74,7 @@ <h4 class="method" id="method_forge">forge($presenter, $method = 'view', $auto_f
 									<tr>
 										<th><kbd>$presenter</kbd></th>
 										<td><em>required</em></td>
-										<td class="description">Name of the presenter, and by default of it's associated view, using <a href="./view.html#method_forge">View</a> notation.</td>
+										<td class="description">Name of the presenter, and by default of its associated view, using <a href="./view.html#method_forge">View</a> notation.</td>
 									</tr>
 									<tr>
 										<th><kbd>$method</kbd></th>
@@ -211,7 +211,7 @@ <h3 id="view">View object compatibility</h3>
 
 			<p class="note">
 				If you want to extend the Presenter to be able to swap View instances after the Presenter object has been created, know that the
-				presenter doesn't have it's own data container. Instead, it uses the associated View object to store all data, which means that
+				presenter doesn't have its own data container. Instead, it uses the associated View object to store all data, which means that
 				if you swap that View object by a new one, you lose all variables set on it!
 			</p>
 		</div>
diff --git a/classes/router.html b/classes/router.html
@@ -257,7 +257,7 @@ <h4 class="method" id="method_get">get($name, $named_params = array())</h4>
 	'hello/(:name)(/:segment)' => array('welcome/user', 'name' => 'user'),
 );
 
-// note that "(/:segment)" will be replaced in its entirely by "article", so
+// note that "(/:segment)" will be replaced entirely by "article", so
 // this call will return 'http://your_base_url/welcome/user/johnarticle' !
 echo Router::get('user', array('name' => 'john', 'article'));
 </code></pre>
diff --git a/classes/theme/advanced.html b/classes/theme/advanced.html
@@ -54,7 +54,7 @@ <h2>Theme Class</h2>
 			<h3 id="asset">Asset support</h3>
 
 			<p>
-				Every Theme class instance has it's own instance of the Asset class, to make it easy to load assets from the theme.
+				Every Theme class instance has its own instance of the Asset class, to make it easy to load assets from the theme.
 				The Asset instance is populated with the asset paths of both the active and the fallback theme, which will provide
 				the same fallback features for your assets as you have for other theme elements like templates and views.
 			</p>
diff --git a/classes/theme/introduction.html b/classes/theme/introduction.html
@@ -123,7 +123,7 @@ <h3 id="partials">Theme template partials</h3>
 			</p>
 			<p>
 				The contents of a partials section can be accessed through a view variable $partials, an array with an entry for each of the partial
-				sections defined. You access a section using it's name. So for a partial section called 'sidebar', you would use <strong>echo $partials['sidebar'];</strong> in your page template.
+				sections defined. You access a section using its name. So for a partial section called 'sidebar', you would use <strong>echo $partials['sidebar'];</strong> in your page template.
 			</p>
 
 			<h3 id="chrome">Partial chrome</h3>
diff --git a/general/coding_standards.html b/general/coding_standards.html
@@ -259,7 +259,7 @@ <h3 id="comparison_logical">Comparisons, Logical operators</h3>
 			<p>Comparing function/method returns and variables should be type aware, for example some functions may return
 				<kbd>false</kbd>, and when comparing this return the type sensitive operators such as <kbd>===</kbd> or <kbd>!==</kbd>. Additionally, use of
 				<kbd>and</kbd> or <kbd>or</kbd> is preferred over <kbd>&amp;&amp;</kbd> or <kbd>||</kbd> for readability. In some cases, this cannot be avoided and the use of
-				<kbd>&amp;&amp;</kbd> or <kbd>||</kbd> as its required may be used. The <kbd>!</kbd> should have spaces on both sides when used.</p>
+				<kbd>&amp;&amp;</kbd> or <kbd>||</kbd> as it's required may be used. The <kbd>!</kbd> should have spaces on both sides when used.</p>
 
 			<pre class="php"><code>if ($var == false and $other_var != 'some_value')
 if ($var === false or my_function() !== false)
diff --git a/general/controllers/base.html b/general/controllers/base.html
@@ -150,7 +150,7 @@ <h4 id="returning_results">Returning the result</h4>
 			</p>
 			<p>
 				If your controller does not extend one of the base controllers, and you want to use this feature,
-				your controller must contain it's own after() method that will accept the actions return value, and has to wrap it into
+				your controller must contain its own after() method that will accept the actions return value, and has to wrap it into
 				a Reponse object which it must return.
 			</p>
 
diff --git a/general/namespacing.html b/general/namespacing.html
@@ -219,7 +219,7 @@ <h3 id="caveats">Caveats</h3>
 			<h4 id="caveats_mixnmatch">Do not mix different naming styles for the same class</h4>
 
 			<p>
-				Although you can mix-and-match namespaces and underscores to construct your class names, you can not mix-and-match it's usage.
+				Although you can mix-and-match namespaces and underscores to construct your class names, you can not mix-and-match its usage.
 				If you have defined a class <kbd>\Admin\Users\Group</kbd>, using <kbd>\Admin\Users_Group::method();</kbd> will load the correct
 				file (since it maps correctly to the right file), but the autoloader will throw an exception because the expected <kbd>\Admin\Users_Group</kbd> class is
 				not defined in that file.
diff --git a/general/presenters.html b/general/presenters.html
@@ -85,7 +85,7 @@ <h3 id="creating_presenters">Creating a Presenter</h3>
 				work here the same as with classes, which means that the view for <code>Presenter_Some_Thing</code> is expected
 				to be in <code>app/views/some/thing.php</code>.<br />
 				This default can be overwritten by setting a non-static <code>$_view</code> property in your Presenter with the
-				View name (without it's suffix), or passing a custom View name when forging the Presenter.</p>
+				View name (without its suffix), or passing a custom View name when forging the Presenter.</p>
 
 				<p>And last we'll create the Presenter from the controller:</p>
 
diff --git a/installation/instructions.html b/installation/instructions.html
@@ -192,7 +192,7 @@ <h4>Apache</h4>
 <pre class="plain"><code>&lt;IfModule mod_rewrite.c>
 	RewriteEngine on
 
-	# Send request to the subfolder, if its not a real file, folder or it's a root request
+	# Send request to the subfolder, if it's not a real file, folder or it's a root request
 	RewriteCond %{REQUEST_FILENAME} !-f
 	RewriteCond %{REQUEST_FILENAME} !-d [OR]
 	RewriteCond $1 ^$
@@ -206,7 +206,7 @@ <h4>Apache</h4>
 <pre class="plain"><code>&lt;IfModule mod_rewrite.c>
 	RewriteEngine on
 
-	# Send request to the subfolder, if its not a real file, folder or it's a root request
+	# Send request to the subfolder, if it's not a real file, folder or it's a root request
 	RewriteCond %{REQUEST_FILENAME} !-f
 	RewriteCond %{REQUEST_FILENAME} !-d [OR]
 	RewriteCond $1 ^$
diff --git a/installation/troubleshooting.html b/installation/troubleshooting.html
@@ -269,7 +269,7 @@ <h3 id="stack_frame_error">Exception thrown without a stack frame</h3>
 
 				<h4>Happens When...</h4>
 
-				<p>The cause of this message is that an error occured while PHP is already in it's tear-down phase, and no error handler is available anymore.</p>
+				<p>The cause of this message is that an error occured while PHP is already in its tear-down phase, and no error handler is available anymore.</p>
 
 				<h4>Solution</h4>
 
diff --git a/installation/upgrade.html b/installation/upgrade.html
@@ -60,22 +60,22 @@ <h4 id="plain">I just downloaded and installed the zip file</h4>
 				the changelog and check for each item if that change has impact on your application.
 			</p>
 
-			<h4 id="own_git">My project is in it's own repository, including the framework files</h4>
+			<h4 id="own_git">My project is in its own repository, including the framework files</h4>
 			<p>
 				Use the same procedure. Download the zip, and replace the files. Having them in a repository
 				gives you the benefit though to see the diff's, which makes it easier to work with the changelog
 				to make the required modifications your application (if needed).
 			</p>
 			<p class="note"><strong>Note</strong> that if you (still) use SubVersion, pay attention to the hidden svn directories in each folder. Don't delete them when replacing the files!</p>
 
-			<h4 id="git_with_subs">My project is in it's own repository, I use submodules for the FuelPHP repositories</h4>
+			<h4 id="git_with_subs">My project is in its own repository, I use submodules for the FuelPHP repositories</h4>
 			<p>
 				If you have created the submodules manually, you know how it works, and how to update them. If you started with a clone
 				of the fuel/fuel repository, add it as an upstream repository, and pull the master branch of the new version. Deal with
 				any merge issues that may pop up, and run a `git submodule update` to update the submodules to the release version.
 			</p>
 
-			<h4 id="git_with_git">My project is in it's own repository, I use separate repositories for the FuelPHP components</h4>
+			<h4 id="git_with_git">My project is in its own repository, I use separate repositories for the FuelPHP components</h4>
 			<p>
 				If these repositories are your own, add the fuel repositories as upstream remotes, and pull the release branch to
 				update your files. Then push to your repositories to complete the update. If you use fuel's repositories directly,
diff --git a/packages/auth/ormauth/intro.html b/packages/auth/ormauth/intro.html
@@ -47,7 +47,7 @@ <h2>OrmAuth - Introduction</h2>
 
 			<p>
 				Ormauth is a set of authentication and authorisation drivers that provide a similar functionality as Simpleauth,
-				but stores it's data in the database instead of in a configuration file. The data is accessed through ORM models.
+				but stores its data in the database instead of in a configuration file. The data is accessed through ORM models.
 			</p>
 			<p>
 				Besides this, it also comes with additional functionality. Unlike Simpleauth, Ormauth supports roles assigned directly
diff --git a/packages/auth/ormauth/usage.html b/packages/auth/ormauth/usage.html
@@ -57,12 +57,12 @@ <h2 id="usage">OrmAuth Usage</h2>
 			</p>
 
 			<p>
-				The Ormauth <kbd>group</kbd> driver stores it's group definitions in the database, and accesses it through ORM. It provides the logic
+				The Ormauth <kbd>group</kbd> driver stores its group definitions in the database, and accesses it through ORM. It provides the logic
 				for checking if a user is a member of a group, and for retrieving group information, or the roles defined to to a group.
 			</p>
 
 			<p>
-				The Ormauth <kbd>acl</kbd> driver is role driven, and stores it's acl definitions in the database, and accesses it through ORM.
+				The Ormauth <kbd>acl</kbd> driver is role driven, and stores its acl definitions in the database, and accesses it through ORM.
 				It provides the logic for checking if a user has access to a named ACL.
 			</p>
 
diff --git a/packages/auth/simpleauth/intro.html b/packages/auth/simpleauth/intro.html
@@ -46,7 +46,7 @@ <h1>
 			<h2>SimpleAuth - Introduction</h2>
 
 			<p>
-				Simpleauth is, as it's name implies, a simple authentication system which is included in the Auth package.
+				Simpleauth is, as its name implies, a simple authentication system which is included in the Auth package.
 				Besides being a working Auth implementation, it is also an example for other Auth drivers.
 				You can use this as a reference when building your own driver.
 			</p>
diff --git a/packages/auth/simpleauth/usage.html b/packages/auth/simpleauth/usage.html
@@ -57,12 +57,12 @@ <h2 id="usage">SimpleAuth Usage</h2>
 			</p>
 
 			<p>
-				The Simpleauth <kbd>group</kbd> driver stores it's group definitions in the simpleauth configuration file.	It provides the logic
+				The Simpleauth <kbd>group</kbd> driver stores its group definitions in the simpleauth configuration file.	It provides the logic
 				for checking if a user is a member of a group, and for retrieving group information, or the roles defined to to a group.
 			</p>
 
 			<p>
-				The Simpleauth <kbd>acl</kbd> driver is role driven, and stores it's acl definitions in the simpleauth configuration file.
+				The Simpleauth <kbd>acl</kbd> driver is role driven, and stores its acl definitions in the simpleauth configuration file.
 				It provides the logic for checking if a user has access to a named ACL.
 			</p>
 
diff --git a/packages/orm/creating_models.html b/packages/orm/creating_models.html
@@ -143,7 +143,7 @@ <h3 id="propperties">protected static $_properties</h3>
 
 				<p>Validation rules can be passed as either just the rule: <kbd>array('required')</kbd> or as the rule
 					with an array of params: <kbd>array('min_length' => array(3))</kbd> both are shown in the example
-					above. A full explanation of the Validation class and it's rule can be found under
+					above. A full explanation of the Validation class and its rules can be found under
 					<a href="../../classes/validation/validation.html">Core</a>. You need to set 
 					<a href="observers/included.html#os_validation">Observer_Validation</a> to run validations.
 				</p>
diff --git a/packages/orm/eav.html b/packages/orm/eav.html
@@ -59,7 +59,7 @@ <h2 id="intro">Introduction</h2>
 
 				<p>
 					You will typically use an EAV container when you have an entity (a record in ORM terms) that has a number of
-					related attributes as it's children. But for every record, these attibutes can be different. This makes it
+					related attributes as its children. But for every record, these attibutes can be different. This makes it
 					impossible to define these attributes as column in the entity's table, because there would be too many, most
 					of them will not have data, and you can't deal with dynamic attributes at all (because columns need to be
 					pre-defined).
diff --git a/packages/orm/model/nestedset.html b/packages/orm/model/nestedset.html
@@ -1003,7 +1003,7 @@ <h4 id="method_save_last_child" class="method">last_child($to = null)</h4>
 
 					<p class="note">
 						From a hierarchy perspective, <strong>first_child</strong> and <strong>last_child</strong> do the same. Only the
-						exact position in the tree, the relation to it's siblings after the insert or relocation of the node, is different.
+						exact position in the tree, the relation to its siblings after the insert or relocation of the node, is different.
 					</p>
 
 					<article>

Original file line number	Diff line number	Diff line change
`@@ -607,7 +607,7 @@ <h4 class="method" id="method_delete">delete_dir($filepath)</h4>`
`607`	`607`	`<pre class="php"><code>// connect to an FTP server`
`608`	`608`	`$ftp = Ftp::forge($config);`
`609`	`609`
`610`		`-// delete a folder with all it's contents`
	`610`	`+// delete a folder with all its contents`
`611`	`611`	`if ( ! $ftp->delete_dir('/path/to/folder'))`
`612`	`612`	`{`
`613`	`613`	`// delete failed`