Merge branch '1.1/develop'

NEKOGET · NEKOGET · commit 6caa33820d7a · 2012-02-25T12:25:00.000+09:00
diff --git a/classes/asset/advanced.html b/classes/asset/advanced.html
@@ -54,8 +54,8 @@ <h3>Advanced usage</h3>
 
 				<p>
 					The Asset class supports the use of multiple instances. This might prove useful if you are using themes, where
-					every theme has it's own set of assets, or you are developing a modular application where each module provides
-					it's own set of assets.
+					every theme has its own set of assets, or you are developing a modular application where each module provides
+					its own set of assets.
 				</p>
 				<p>
 					In these cases, it would not be handy to have only a single instance and use search paths, since the chances of
diff --git a/classes/database/usage.html b/classes/database/usage.html
@@ -50,7 +50,7 @@ <h2>Database Usage</h2>
 				Normal database interactions are to go through the <a href="./db.html">DB class</a>.
 				The following examples will give you a feel for how to go about using databases in Fuel.
 			</p>
-			<p>Database usage is devided into a couple of segments:</p>
+			<p>Database usage is divided into a couple of segments:</p>
 
 			<ul>
 				<li><a href="#running-queries">Running queries</a></li>
@@ -144,7 +144,7 @@ <h3 id="selecting">Selection data</h3>
 				<h3 id="results">Results</h3>
 				<p>
 					Executing a select query will generate a result object containing the requested database records.
-					By default the result is fetched as associative arrays. Here is an exaple how to influence this
+					By default the result is fetched as associative arrays. Here is an example how to influence this
 					behaviour.
 				</p>
 				<pre class="php"><code>// Will fetch the result as an associative array.
@@ -162,7 +162,7 @@ <h3 id="results">Results</h3>
 // Just count the results, it returns an int.
 $num_rows = count($result);
 </code></pre>
-				<p>To access these results you eighter loop through the result object directly, or get the result array.</p>
+				<p>To access these results you either loop through the result object directly, or get the result array.</p>
 				<pre class="php"><code>$result = DB::select()->from('users')->execute();
 foreach($result as $item)
 {
@@ -182,7 +182,7 @@ <h3 id="results">Results</h3>
 foreach($on_key as $id => $item)
 {
 	// $id will contain the records id
-	// do something with $item or it's $id
+	// do something with $item or its $id
 }
 
 $key_value = $result->as_array('id', 'email');
@@ -313,7 +313,7 @@ <h3 id="updating">Updating</h3>
 				<h3 id="inserting">Inserting</h3>
 				<p>
 					For inserting data we use <a href="./db.html#method_insert">DB::insert</a>.
-					If succesfully executed an insert query will return an array containing a
+					If successfully executed an insert query will return an array containing a
 					list of insert id and rows created.
 				</p>
 				<pre class="php"><code>// Will execute INSERT INTO `users`(`name`,`email`,`password`)
@@ -324,7 +324,7 @@ <h3 id="inserting">Inserting</h3>
 	'password' => 's0_s3cr3t',
 ))->execute();
 </code></pre>
-				<p>You can also set the columns and values seperatly</p>
+				<p>You can also set the columns and values separately</p>
 
 				<pre class="php"><code>// Will execute INSERT INTO `users`(`name`,`email`,`password`)
 // VALUES ("John Random", "john@example.com", "s0_s3cr3t")
@@ -373,9 +373,9 @@ <h3 id="joins">Joins</h3>
 				<h3 id="escaping">Escaping</h3>
 
 				<p>Fields and values in database calls are escaped by default. In some cases you'll want to not escape data. The DB class provides a method to create <em>database expressions</em>, <a href="./db.html#method_expr">DB::expr</a>. If you don't want a value to get escaped, just wrap it in a database expression.</p>
-				<p>Database expressions are especially helpful when dealing with thing like MySQL's native function (like <em>COUNT</em>) and predefined constands (like <em>DEFAULT</em>).</p>
+				<p>Database expressions are especially helpful when dealing with thing like MySQL's native function (like <em>COUNT</em>) and predefined constants (like <em>DEFAULT</em>).</p>
 
-				<pre class="php"><code>// Set a field to it's default
+				<pre class="php"><code>// Set a field to its default
 DB::update('users')->where('id', '=', 1)->set(array(
 	'some_column' => DB::expr('DEFAULT'),
 ))->execute();
diff --git a/classes/fieldset.html b/classes/fieldset.html
@@ -48,7 +48,7 @@ <h1>
 			<h2>Fieldset Class</h2>
 
 			<p>
-				The Fieldset class is used to create a form and handle its' validation in an object oriented way. It uses the Form
+				The Fieldset class is used to create a form and handle its validation in an object oriented way. It uses the Form
 				and Validation classes. This class itself is only meant to model the fieldset and its fields while the other
 				two classes do the real work.
 			</p>
@@ -609,7 +609,7 @@ <h4 class="method" id="method_populate">populate($input, $repopulate = false)</h
 									<tr>
 										<th><kbd>$repopulate</kbd></th>
 										<td><code>false</code></td>
-										<td>Use the repopulate() method after inital populating</td>
+										<td>Use the repopulate() method after initial populating</td>
 									</tr>
 								</tbody>
 							</table>
diff --git a/classes/form.html b/classes/form.html
@@ -137,7 +137,7 @@ <h4 class="method" id="method_close">close()</h4>
 			<article>
 				<h4 class="method" id="method_input">input($field, $value = null, $attributes = array())</h4>
 				<p>
-					Creates an html input element. It can be set using the fieldname, it's value and tag attributes or all
+					Creates an html input element. It can be set using the fieldname, its value and tag attributes or all
 					in one array as the first argument.
 				</p>
 				<table class="method">
@@ -191,7 +191,7 @@ <h4 class="method" id="method_input">input($field, $value = null, $attributes =
 			<article>
 				<h4 class="method" id="method_button">button($field, $value = null, $attributes = array())</h4>
 				<p>
-					Creates an html button element. It can be set using the fieldname, it's value and tag attributes or all
+					Creates an html button element. It can be set using the fieldname, its value and tag attributes or all
 					in one array as the first argument.
 				</p>
 				<table class="method">
@@ -391,7 +391,7 @@ <h4 class="method" id="method_submit">submit($field, $value = null, $attributes
 
 			<article>
 				<h4 class="method" id="method_textarea">textarea($field, $value = null, $attributes = array())</h4>
-				<p>Creates an html textarea element. It can be set using the fieldname, it's value and tag attributes or all
+				<p>Creates an html textarea element. It can be set using the fieldname, its value and tag attributes or all
 					in one attribute for the first argument.</p>
 				<table class="method">
 					<tbody>
@@ -443,7 +443,7 @@ <h4 class="method" id="method_textarea">textarea($field, $value = null, $attribu
 
 			<article>
 				<h4 class="method" id="method_select">select($field, $values = null, $options = array(), $attributes = array())</h4>
-				<p>Creates an html select element. It can be set using the fieldname, it's selected value(s), it's options
+				<p>Creates an html select element. It can be set using the fieldname, its selected value(s), its options
 					and tag attributes or all in one attribute for the first argument.</p>
 				<table class="method">
 					<tbody>
@@ -475,7 +475,7 @@ <h4 class="method" id="method_select">select($field, $values = null, $options =
 									<th><kbd>$options</kbd></th>
 									<td><pre class="php"><code>array()</code></pre></td>
 									<td>Associative array of value=>label pairs, may also contain option groups as
-										opt_name=>array() where the array contains it's set of value=>label pairs.</td>
+										opt_name=>array() where the array contains its set of value=>label pairs.</td>
 								</tr>
 								<tr>
 									<th><kbd>$attributes</kbd></th>
diff --git a/classes/html.html b/classes/html.html
@@ -233,8 +233,8 @@ <h4 class="method" id="method_mail_to_safe">mail_to_safe($email, $text, $subject
 //	var user = "name";
 //	var at = "@";
 //	var server = "domain.com";
-//	document.write('&lt;a href="' + 'mail' + 'to:' + user + at + server + '"&gtName&lt;/a&gt');
-//&lt;/script&gt
+//	document.write('&lt;a href="' + 'mail' + 'to:' + user + at + server + '"&gt;Name&lt;/a&gt;');
+//&lt;/script&gt;
 echo Html::mail_to_safe('name@domain.com', 'Name');</code></pre>
 						</td>
 					</tr>
diff --git a/classes/mongo/methods.html b/classes/mongo/methods.html
@@ -49,7 +49,7 @@ <h2>Mongo_Db Class Methods</h2>
 
 			<p>
 				The Mongo_Db class allows you to interact with MongoDB databases. While in some cases it's
-				simular to interacting with databases like MySQL there are some distinct differences.
+				similar to interacting with databases like MySQL there are some distinct differences.
 			</p>
 
 			<p class="note">
diff --git a/classes/theme/introduction.html b/classes/theme/introduction.html
@@ -56,7 +56,7 @@ <h3 id="intro">Introduction</h3>
 			</p>
 			<p>
 				Like modules and packages, themes can be stored in multiple locations. You can define the paths to these locations in the
-				configuration file,	or add them to the theme instance at runtime. A theme is identified by it's name, which must be equal
+				configuration file,	or add them to the theme instance at runtime. A theme is identified by its name, which must be equal
 				to the name of the theme folder	used in one of the theme locations. If the theme is defined in multiple locations,
 				the first one found will be used.
 			</p>
diff --git a/classes/theme/methods.html b/classes/theme/methods.html
@@ -554,7 +554,7 @@ <h4 class="method" id="method_active">active($theme = null)</h4>
 							<pre class="php"><code>// Get the default instance
 $theme = \Theme::instance();
 
-// set the active theme to 'darkglow', and return it's definition
+// set the active theme to 'darkglow', and return its definition
 $active = $theme->active('darkglow');
 </code></pre>
 						</td>
@@ -607,7 +607,7 @@ <h4 class="method" id="method_fallback">fallback($theme = null)</h4>
 							<pre class="php"><code>// Get the default instance
 $theme = \Theme::instance();
 
-// set the fallback theme to 'basic', and return it's definition
+// set the fallback theme to 'basic', and return its definition
 $fallback = $theme->fallback('basic');
 </code></pre>
 						</td>
diff --git a/classes/upload/config.html b/classes/upload/config.html
@@ -263,4 +263,4 @@ <h3 id="configuration">&#35373;&#23450;</h3>
 		</footer>
 	</div>
 </body>
-</html>
+</html>
diff --git a/classes/upload/usage.html b/classes/upload/usage.html
@@ -557,7 +557,7 @@ <h4 class="method" id="method_register">register($event, $callback)</h4>
 
 				<p class="note">
 					<strong>Note:</strong> if you alter the contents of the <strong>$file</strong> array in your callback, you have to make sure that the
-					information is still valid, as the Upload class won't perform it's checks again. The only exception to this rule is the '<strong>saved_to</strong>' path,
+					information is still valid, as the Upload class won't perform its checks again. The only exception to this rule is the '<strong>saved_to</strong>' path,
 					which will be checked and created if required after the callback has been executed.
 				</p>
 			</article>
diff --git a/general/coding_standards.html b/general/coding_standards.html
@@ -248,9 +248,9 @@ <h3 id="comparison_logical">&#27604;&#36611;&#12392;&#35542;&#29702;&#28436;&#31639;&#23376;</h3>
 
 			<p>&#38306;&#25968;/&#12513;&#12477;&#12483;&#12489;&#12398;&#36820;&#20516;&#12420;&#22793;&#25968;&#12434;&#27604;&#36611;&#12377;&#12427;&#12395;&#12399;&#22411;&#12395;&#27880;&#24847;&#12375;&#12414;&#12377;&#12290;&#12383;&#12392;&#12360;&#12400;&#12289;&#38306;&#25968;&#12364; <kbd>false</kbd> &#12434;&#36820;&#12377;&#12392;&#12365;&#12395;&#12289;
 				&#12371;&#12398;&#36820;&#20516;&#12434; <kbd>===</kbd> &#12420; <kbd>!==</kbd> &#12398;&#12424;&#12358;&#12394;&#22411;&#12395;&#27880;&#24847;&#12375;&#12383;&#28436;&#31639;&#23376;&#12434;&#20351;&#29992;&#12375;&#12390;&#27604;&#36611;&#12375;&#12414;&#12377;&#12290;
-				&#12373;&#12425;&#12395; <kbd>and</kbd> &#12420; <kbd>or</kbd> &#12434;&#20351;&#29992;&#12377;&#12427;&#12371;&#12392;&#12364;&#12289;<kbd>&&</kbd> &#12420; <kbd>||</kbd> &#12424;&#12426;&#12418;&#35501;&#12415;&#12420;&#12377;&#12373;&#12398;&#35251;&#28857;&#12363;&#12425;&#22909;&#12414;&#12375;&#12356;&#12391;&#12377;&#12290;
-				&#22580;&#21512;&#12395;&#12424;&#12387;&#12390;&#12399;&#12371;&#12428;&#12434;&#36991;&#12369;&#12427;&#12371;&#12392;&#12364;&#12391;&#12365;&#12394;&#12356;&#12371;&#12392;&#12418;&#12354;&#12426;&#12414;&#12377;&#12398;&#12391;&#12289;&#24517;&#35201;&#12395;&#24540;&#12376;&#12390; <kbd>&&</kbd> &#12420; <kbd>||</kbd> &#12434;&#20351;&#29992;&#12375;&#12414;&#12377;&#12290;<kbd>!</kbd> &#12434;&#20351;&#29992;&#12377;&#12427;&#22580;&#21512;&#12399;&#12289;&#20001;&#31471;&#12395;&#12473;&#12506;&#12540;&#12473;&#12434;&#32622;&#12365;&#12414;&#12377;&#12290;</p>
-
+				&#12373;&#12425;&#12395; <kbd>and</kbd> &#12420; <kbd>or</kbd> &#12434;&#20351;&#29992;&#12377;&#12427;&#12371;&#12392;&#12364;&#12289;<kbd>&amp;&amp;</kbd> &#12420; <kbd>||</kbd> &#12424;&#12426;&#12418;&#35501;&#12415;&#12420;&#12377;&#12373;&#12398;&#35251;&#28857;&#12363;&#12425;&#22909;&#12414;&#12375;&#12356;&#12391;&#12377;&#12290;
+				&#22580;&#21512;&#12395;&#12424;&#12387;&#12390;&#12399;&#12371;&#12428;&#12434;&#36991;&#12369;&#12427;&#12371;&#12392;&#12364;&#12391;&#12365;&#12394;&#12356;&#12371;&#12392;&#12418;&#12354;&#12426;&#12414;&#12377;&#12398;&#12391;&#12289;&#24517;&#35201;&#12395;&#24540;&#12376;&#12390; <kbd>&amp;&amp;</kbd> &#12420; <kbd>||</kbd> &#12434;&#20351;&#29992;&#12375;&#12414;&#12377;&#12290;<kbd>!</kbd> &#12434;&#20351;&#29992;&#12377;&#12427;&#22580;&#21512;&#12399;&#12289;&#20001;&#31471;&#12395;&#12473;&#12506;&#12540;&#12473;&#12434;&#32622;&#12365;&#12414;&#12377;&#12290;
+			</p>
 			<pre class="php"><code>if ($var == false and $other_var != 'some_value')
 if ($var === false or my_function() !== false)
 if ( ! $var)</code></pre>
diff --git a/general/packages.html b/general/packages.html
@@ -73,7 +73,7 @@ <h3 id="installing">Installing packages</h3>
 			<code>app/config/config.php</code> or use <a href="../classes/package.html#method_load">Package::load()</a>.</p>
 
 			<h3 id="creation">Creating packages</h3>
-			<p>To help people understand what you are doing it's best to stucture your package like so:</p>
+			<p>To help people understand what you are doing it's best to structure your package like so:</p>
 
 			<pre><code>/packages
     /package
@@ -102,7 +102,7 @@ <h3 id="creation">Creating packages</h3>
 // Set the second argument to <kbd>true</kbd> to prefix and be able to overwrite core classes
 Autoloader::add_core_namespace('Mypackage', true);
 
-// And add the classes, this is usefull for:
+// And add the classes, this is useful for:
 // - optimization: no path searching is necessary
 // - it's required to be able to use as a core namespace
 // - if you want to break the autoloader's path search rules
diff --git a/general/views.html b/general/views.html
@@ -126,12 +126,11 @@ <h3 id="security">Security</h3>
 	{
 		$view = \View::forge('example');
 
-		// add it unfiltered just like you added
 		// add it filtered, outputs: &amp;lt;strong&amp;gt;not bold because filtered&amp;lt;/strong&amp;gt;
 		$view->title = '&lt;strong&gt;not bold because filtered&lt;/strong&gt;';
 
-		// add it unfiltered just like you added
-		$view->set('title', '&lt;strong&gt;not bold because filtered&lt;/strong&gt;', false);
+		// add it unfiltered, outputs: &lt;strong&gt; bold because unfiltered&lt;/strong&gt;
+		$view->set('title', '&lt;strong&gt; bold because unfiltered&lt;/strong&gt;', false);
 
 		return $view;
 	}
diff --git a/packages/auth/drivers.html b/packages/auth/drivers.html
@@ -113,7 +113,7 @@ <h3 id="implementing_function">Implementing functions.</h3>
 				<pre class="php"><code>/**
  * Get the user's ID
  *
- * @return  Array  containing this driver's ID & the user's ID
+ * @return  Array  containing this driver's ID &amp; the user's ID
  */
 public function get_user_id()
 {
diff --git a/packages/auth/usage.html b/packages/auth/usage.html
@@ -485,7 +485,7 @@ <h4 id="method_has_access" class="method">has_access($condition, $specific = nul
 	Response::redirect('no_admin');
 }
 
-// check if user can also update & delete comments
+// check if user can also update &amp; delete comments
 Auth::has_access('comments.[update,delete]');
 
 // The same with an array instead of a string
diff --git a/packages/oil/generate.html b/packages/oil/generate.html
@@ -82,19 +82,19 @@ <h3 id="controllers">Controllers</h3>
 
 	public function action_action1()
 	{
-		$this->template->title = 'Posts &raquo Action1';
+		$this->template->title = 'Posts &raquo; Action1';
 		$this->template->content = View::forge('posts/action1');
 	}
 
 	public function action_action2()
 	{
-		$this->template->title = 'Posts &raquo Action2';
+		$this->template->title = 'Posts &raquo; Action2';
 		$this->template->content = View::forge('posts/action2');
 	}
 
 	public function action_action3()
 	{
-		$this->template->title = 'Posts &raquo Action3';
+		$this->template->title = 'Posts &raquo; Action3';
 		$this->template->content = View::forge('posts/action3');
 	}
 
diff --git a/packages/orm/creating_models.html b/packages/orm/creating_models.html
@@ -114,7 +114,7 @@ <h3 id="propperties">protected static $_properties</h3>
 				<pre class="php"><code>class Model_Article extends Orm\Model
 {
 	protected static $_properties = array(
-		'id', // both validation & typing observers will ignore the PK
+		'id', // both validation &amp; typing observers will ignore the PK
 		'name' => array(
 			'data_type' => 'varchar',
 			'label' => 'Article Name',
diff --git a/packages/orm/crud.html b/packages/orm/crud.html
@@ -165,7 +165,7 @@ <h2>Delete</h2>
 
 					<p>Again nothing more to it: Find and delete.</p>
 
-					<p class="note">In the previous example the <kbd>$entry</kbd> variable and it's object still exist. The
+					<p class="note">In the previous example the <kbd>$entry</kbd> variable and its object still exist. The
 						primary keys are however set to <kbd>null</kbd> and the object itself is considered a new instance. If
 						you save it after deletion it will be re-entered into the database and be given a new primary key when
 						<kbd>auto_increment</kbd> is switched on.</p>
diff --git a/packages/orm/observers/included.html b/packages/orm/observers/included.html
@@ -234,7 +234,7 @@ <h4 id="os_typing">Observer_Typing</h4>
 					(even integers and floats) but with the typing observer those will be cast to their scalar type.
 				</p>
 
-				<p>In addition to the above the Typing observer also adds support for serialized & json fields. Both should
+				<p>In addition to the above the Typing observer also adds support for serialized &amp; json fields. Both should
 					be string type fields ("text" preferably) but will have their value encoded for saving (using
 					<kbd>serialize()</kbd> or <kbd>json_encode()</kbd>) and decoded when retrieving from the DB (using
 					<kbd>unserialize()</kbd> or <kbd>json_decode()</kbd>).</p>
diff --git a/packages/orm/relations/belongs_to.html b/packages/orm/relations/belongs_to.html
@@ -54,7 +54,7 @@ <h2>Orm</h2>
 			<section>
 				<h2 id="belongs_to">Relations: Belongs To</h2>
 
-				<p>Has the primary key of the relation keps in its table, belongs to 1 related object. This is the other
+				<p>Has the primary key of the relation kept in its table, belongs to 1 related object. This is the other
 					side of a <a href="has_one.html">HasOne</a> or <a href="has_many.html">HasMany</a> relation.</p>
 
 				<h3>Example</h3>
diff --git a/packages/orm/relations/intro.html b/packages/orm/relations/intro.html
@@ -136,7 +136,7 @@ <h3>Configuration Options</h3>
 							<td>bool <kbd>true</kbd></td>
 							<td rowspan="2">Cascading means the operation on the model is repeated on its relation. Thus
 								cascading a save will save the relations as well, cascading a delete will delete the
-								relations as well. <strong>Be very carefull with cascading delete!</strong><br />
+								relations as well. <strong>Be very careful with cascading delete!</strong><br />
 								You can override these options at runtime by passing <kbd>true</kbd> as the first
 								argument when calling <kbd>save()</kbd> or <kbd>delete()</kbd> on the originating model.</td>
 						</tr>
@@ -215,11 +215,11 @@ <h3 id="usage_rel_conditions">Usage with where/order_by conditions</h3>
 				<h3 id="usage_nested_rels">Usage with nested relationships</h3>
 
 				<p>It is also possible to fetch the relations of relations to an unlimited depth (though you might want to
-					be carefull creating queries that require too many joins). All these can also be combined with where
+					be careful creating queries that require too many joins). All these can also be combined with where
 					and order_by conditions, some are exemplified below.</p>
 
 				<p class="note">Note that the order matters here, if you want to fetch the relations of a relation you must
-					load the "parent" relation before it's relation. Otherwise an exception will be thrown.</p>
+					load the "parent" relation before its relation. Otherwise an exception will be thrown.</p>
 
 				<pre class="php"><code>// using array querying
 $post = Model_Post::find('first', array(
@@ -247,7 +247,7 @@ <h3 id="usage_nested_rels">Usage with nested relationships</h3>
 	->order_by('articles.published', 'desc')
 	->get_one();
 
-// or combine array & method chaining
+// or combine array &amp; method chaining
 $post = Model_Post::query()
 	->related('articles', array(
 		'related' => array('user' => array(
diff --git a/requirements.html b/requirements.html
@@ -84,7 +84,8 @@ <h5 id="php_extensions">PHP &#12456;&#12463;&#12473;&#12486;&#12531;&#12471;&#12519;&#12531;</h5>
 						<td>mcrypt</td>
 						<td>Crypt</td>
 						<td><a href="http://php.net/manual/en/book.mcrypt.php">&#12489;&#12461;&#12517;&#12513;&#12531;&#12488;</a>&#12290;<br />
-						&#12371;&#12428;&#12364;&#12394;&#12356;&#22580;&#21512;&#12289;PHPSecLib &#12434;&#20351;&#29992;&#12375;&#12390;&#12371;&#12398;&#27231;&#33021;&#12434;&#12456;&#12511;&#12517;&#12524;&#12540;&#12488;&#12375;&#12414;&#12377;&#12290;</td>
+						&#12371;&#12428;&#12364;&#12394;&#12356;&#22580;&#21512;&#12289;PHPSecLib &#12434;&#20351;&#29992;&#12375;&#12390;&#12371;&#12398;&#27231;&#33021;&#12434;&#12456;&#12511;&#12517;&#12524;&#12540;&#12488;&#12375;&#12414;&#12377;&#12290;
+						</td>
 					</tr>
 				</tbody>
 			</table>

-Original file line number
+Diff line change
 		</footer>
 	</div>
 </body>
 -</html>
 +</html>