Skip to content

Commit

Permalink
Merge branch '1.1/develop' of https://github.com/fuel/docs into 1.1/d…
Browse files Browse the repository at this point in the history 
…evelop_japanese
  • Loading branch information
宮川 貴子 authored and 宮川 貴子 committed Jan 10, 2012
2 parents e87e7e0 + 1b6758a commit a4d162c
Show file tree
Hide file tree
Showing 130 changed files with 1,297 additions and 1,285 deletions.
40 changes: 20 additions & 20 deletions classes/agent/config.html
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="./../../assets/css/combined.css">
<script src="http://www.google.com/jsapi" type="text/javascript"></script>
Expand All @@ -20,42 +20,42 @@ <h1>
<strong>FuelPHP, a PHP 5.3 Framework</strong>
Documentation
</h1>

<form id="google_search">
<p>
<span id="search_clear">&nbsp;</span>
<input type="submit" name="search_submit" id="search_submit" value="search" />
<input type="text" value="" id="search_input" name="search_input" />
<input type="text" value="" id="search_input" name="search_input" />
</p>
</form>
</div>
<nav>

<div class="clear"></div>
</nav>
<a href="#" id="toc_handle">table of contents</a>
<div class="clear"></div>
</header>

<div id="cse">
<div id="cse_point"></div>
<div id="cse_content"></div>
</div>

<div id="main">

<h2>Agent Class</h2>

<p>The agent class allows you to retrieve information about browser type, version, platform or operating system, etc, based on the clients User Agent string.</p>

<section>
<h3 id="config">Configuration</h3>

<p>
The agent class uses the PHP function <a href="http://php.net/manual/en/function.get-browser.php">get_browser()</a>,
which attempts to determine the capabilities of the user's browser, by looking up the browser's information in the browscap.ini file.
</p>

<p>The following global configuration values can be defined:</p>
<table class="config">
<tbody>
Expand Down Expand Up @@ -94,16 +94,16 @@ <h3 id="config">Configuration</h3>
</tr>
</tbody>
</table>

<section>
<h5 id="browsercap_config">Browscap.ini configuration</h5>

<p>
If PHP has not been configured to use the browscap.ini file, the agent class will retrieve the file from the location defined in
the <strong>config/agent.php</strong> config file, and cached locally for re-use. This cache will be updated on a regular basis, based
on the timeout value defined in the configuration.
</p>

<table class="config">
<tbody>
<tr class="header">
Expand Down Expand Up @@ -146,15 +146,15 @@ <h5 id="browsercap_config">Browscap.ini configuration</h5>
</tbody>
</table>
</section>

<section>
<h5 id="cache_config">Cache configuration</h5>

<p>
It the agent class is configured to process a browscap.ini file, it will cache the result of both the ini file parser and individual user agent requests
in order to increase the response time of the class. These configuration settings determine how the data is cached. For more information, see the <a href="../cache/config.html">Cache</a> class documentation.
</p>

<table class="config">
<tbody>
<tr class="header">
Expand Down Expand Up @@ -185,16 +185,16 @@ <h5 id="cache_config">Cache configuration</h5>
</tbody>
</table>
</section>

</section>

</div>

<footer>
<p>
&copy; FuelPHP Development Team 2010-2011 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
&copy; FuelPHP Development Team 2010-2012 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
</p>
</footer>
</div>
</body>
</html>
</html>
2 changes: 1 addition & 1 deletion classes/agent/usage.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,7 @@ <h4 id="method_is_robot" class="method">is_robot()</h4>

<footer>
<p>
&copy; FuelPHP Development Team 2010-2011 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
&copy; FuelPHP Development Team 2010-2012 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
</p>
</footer>
</div>
Expand Down
2 changes: 1 addition & 1 deletion classes/arr.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1160,7 +1160,7 @@ <h4 id="function_in_arrayi" class="method" data-class="">in_arrayi($needle, $hay

<footer>
<p>
&copy; FuelPHP Development Team 2010-2011 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
&copy; FuelPHP Development Team 2010-2012 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
</p>
</footer>
</div>
Expand Down
2 changes: 1 addition & 1 deletion classes/asset/advanced.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ <h4 class="method" id="method_instance">instance($name = null)</h4>

<footer>
<p>
&copy; FuelPHP Development Team 2010-2011 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
&copy; FuelPHP Development Team 2010-2012 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
</p>
</footer>
</div>
Expand Down
2 changes: 1 addition & 1 deletion classes/asset/config.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ <h3 id="static_assets">Static assets</h3>

<footer>
<p>
&copy; FuelPHP Development Team 2010-2011 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
&copy; FuelPHP Development Team 2010-2012 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
</p>
</footer>
</div>
Expand Down
2 changes: 1 addition & 1 deletion classes/asset/usage.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,7 @@ <h4 id="method_render" class="method">render($group = null, $raw = false)</h4>

<footer>
<p>
&copy; FuelPHP Development Team 2010-2011 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
&copy; FuelPHP Development Team 2010-2012 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
</p>
</footer>
</div>
Expand Down
48 changes: 24 additions & 24 deletions classes/autoloader.html
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="./../assets/css/combined.css">
<script src="http://www.google.com/jsapi" type="text/javascript"></script>
Expand All @@ -20,34 +20,34 @@ <h1>
<strong>FuelPHP, a PHP 5.3 Framework</strong>
Documentation
</h1>

<form id="google_search">
<p>
<span id="search_clear">&nbsp;</span>
<input type="submit" name="search_submit" id="search_submit" value="search" />
<input type="text" value="" id="search_input" name="search_input" />
<input type="text" value="" id="search_input" name="search_input" />
</p>
</form>
</div>
<nav>

<div class="clear"></div>
</nav>
<a href="#" id="toc_handle">table of contents</a>
<div class="clear"></div>
</header>

<div id="cse">
<div id="cse_point"></div>
<div id="cse_content"></div>
</div>

<div id="main">

<h2>Autoloader Class</h2>

<p>The Autoloader class contains Fuel's autoloader function. It also supplies methods to interact with the autoloading process.</p>

<article>
<h4 class="method" id="method_add_namespace">add_namespace($namespace, $path)</h4>
<p>The <strong>add_namespace</strong> method adds a namespace and path.</p>
Expand Down Expand Up @@ -87,7 +87,7 @@ <h4 class="method" id="method_add_namespace">add_namespace($namespace, $path)</h
<th>Example</th>
<td>
<pre class="php"><code>Autoloader::add_namespace('Mynamespace', PKGPATH.'mynamespace/');

// With nested namespaces note the double backslash
Autoloader::add_namespace('Nested\\Namespace', PKGPATH.'nested/');
</code></pre>
Expand All @@ -96,7 +96,7 @@ <h4 class="method" id="method_add_namespace">add_namespace($namespace, $path)</h
</tbody>
</table>
</article>

<article>
<h4 class="method" id="method_add_namespaces">add_namespaces($namespace, $prepend = false)</h4>
<p>The <strong>add_namespaces</strong> method adds an array of namespaces.</p>
Expand Down Expand Up @@ -145,7 +145,7 @@ <h4 class="method" id="method_add_namespaces">add_namespaces($namespace, $prepen
</tbody>
</table>
</article>

<article>
<h4 class="method" id="method_namespace_path">namespace_path($namespace)</h4>
<p>The <strong>namespace_path</strong> method retrieves the path to a namespace.</p>
Expand Down Expand Up @@ -190,7 +190,7 @@ <h4 class="method" id="method_namespace_path">namespace_path($namespace)</h4>
</tbody>
</table>
</article>

<article>
<h4 class="method" id="method_add_class">add_class($class, $path)</h4>
<p>The <strong>add_class</strong> method adds a class path.</p>
Expand Down Expand Up @@ -235,7 +235,7 @@ <h4 class="method" id="method_add_class">add_class($class, $path)</h4>
</tbody>
</table>
</article>

<article>
<h4 class="method" id="method_add_classes">add_classes($classes)</h4>
<p>The <strong>add_class</strong> method adds an array of classes.</p>
Expand Down Expand Up @@ -279,7 +279,7 @@ <h4 class="method" id="method_add_classes">add_classes($classes)</h4>
</tbody>
</table>
</article>

<article>
<h4 class="method" id="method_alias_to_namespace">alias_to_namespace($class, $namespace = '')</h4>
<p>The <strong>alias_to_namespace</strong> method aliases a class to a namespace, the root by default.</p>
Expand Down Expand Up @@ -328,11 +328,11 @@ <h4 class="method" id="method_alias_to_namespace">alias_to_namespace($class, $na
</tbody>
</table>
</article>

<article>
<h4 class="method" id="method_add_core_namespace">add_core_namespace($namespace, $prefix = false)</h4>
<p>
The <strong>add_core_namespace</strong> method adds a namespace for which classes may be used without the namespace prefix and
The <strong>add_core_namespace</strong> method adds a namespace for which classes may be used without the namespace prefix and
will be auto-aliased to the global namespace. Prefixing the classes will overwrite core classes and previously added namespaces.
</p>
<table class="method">
Expand Down Expand Up @@ -376,7 +376,7 @@ <h4 class="method" id="method_add_core_namespace">add_core_namespace($namespace,
</tbody>
</table>
</article>

<article>
<h4 class="method" id="method_load">load($class)</h4>
<p>The <strong>load</strong> method tries to find the class, load it, and fire it's _init function if exists.</p>
Expand Down Expand Up @@ -417,9 +417,9 @@ <h4 class="method" id="method_load">load($class)</h4>
</tbody>
</table>
</article>

<h3 id="procedural_helpers">Procedural helpers</h3>

<article>
<h4 id="function_import">import($path, $folder = 'classes')</h4>
<p>The <strong>import</strong> function imports a php file inside COREPATH.</p>
Expand Down Expand Up @@ -459,20 +459,20 @@ <h4 id="function_import">import($path, $folder = 'classes')</h4>
<td>
<pre class="php"><code>// import Spyc
import('spyc/spyc', 'vendor');</code></pre>

</td>
</tr>
</tbody>
</table>
</article>

</div>

<footer>
<p>
&copy; FuelPHP Development Team 2010-2011 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
&copy; FuelPHP Development Team 2010-2012 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
</p>
</footer>
</div>
</body>
</html>
</html>
Loading

0 comments on commit a4d162c

Please sign in to comment.