Skip to content

Commit e16c99b

Browse files
NEKOGETNEKOGET
committed
本家変更分をmerge
2 parents b9f3d6b + ebdccda commit e16c99b

File tree

158 files changed

+158
-159
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

158 files changed

+158
-159
lines changed

‎classes/agent/config.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ <h5 id="cache_config">キャッシュの設定</h5>
193193

194194
<footer>
195195
<p>
196-
&copy; FuelPHP Development Team 2010-2013 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
196+
&copy; FuelPHP Development Team 2010-2014 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
197197
[ <a href="https://github.com/fuel/docs/commits/1.8/develop/classes/agent/config.html">原文コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/commits/1.8/develop_japanese/classes/agent/config.html">翻訳コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/blob/1.8/develop_japanese/classes/agent/config.html">GitHubで修正</a> ]
198198
</p>
199199
</footer>

‎classes/agent/usage.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@ <h4 id="method_is_robot" class="method">is_robot()</h4>
531531

532532
<footer>
533533
<p>
534-
&copy; FuelPHP Development Team 2010-2013 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
534+
&copy; FuelPHP Development Team 2010-2014 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
535535
[ <a href="https://github.com/fuel/docs/commits/1.8/develop/classes/agent/usage.html">原文コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/commits/1.8/develop_japanese/classes/agent/usage.html">翻訳コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/blob/1.8/develop_japanese/classes/agent/usage.html">GitHubで修正</a> ]
536536
</p>
537537
</footer>

‎classes/arr.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2862,7 +2862,7 @@ <h4 id="function_in_arrayi" class="method" data-class="">in_arrayi($needle, $hay
28622862

28632863
<footer>
28642864
<p>
2865-
&copy; FuelPHP Development Team 2010-2013 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
2865+
&copy; FuelPHP Development Team 2010-2014 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
28662866
[ <a href="https://github.com/fuel/docs/commits/1.8/develop/classes/arr.html">原文コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/commits/1.8/develop_japanese/classes/arr.html">翻訳コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/blob/1.8/develop_japanese/classes/arr.html">GitHubで修正</a> ]
28672867
</p>
28682868
</footer>

‎classes/asset/advanced.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ <h4 class="method" id="method_instance">instance($name = null)</h4>
185185

186186
<footer>
187187
<p>
188-
&copy; FuelPHP Development Team 2010-2013 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
188+
&copy; FuelPHP Development Team 2010-2014 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
189189
[ <a href="https://github.com/fuel/docs/commits/1.8/develop/classes/asset/advanced.html">原文コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/commits/1.8/develop_japanese/classes/asset/advanced.html">翻訳コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/blob/1.8/develop_japanese/classes/asset/advanced.html">GitHubで修正</a> ]
190190
</p>
191191
</footer>

‎classes/asset/config.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ <h3 id="static_assets">静的なアセット</h3>
221221

222222
<footer>
223223
<p>
224-
&copy; FuelPHP Development Team 2010-2013 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
224+
&copy; FuelPHP Development Team 2010-2014 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
225225
[ <a href="https://github.com/fuel/docs/commits/1.8/develop/classes/asset/config.html">原文コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/commits/1.8/develop_japanese/classes/asset/config.html">翻訳コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/blob/1.8/develop_japanese/classes/asset/config.html">GitHubで修正</a> ]
226226
</p>
227227
</footer>

‎classes/asset/usage.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,7 @@ <h4 id="method_render" class="method">render($group = null, $raw = false)</h4>
609609

610610
<footer>
611611
<p>
612-
&copy; FuelPHP Development Team 2010-2013 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
612+
&copy; FuelPHP Development Team 2010-2014 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
613613
[ <a href="https://github.com/fuel/docs/commits/1.8/develop/classes/asset/usage.html">原文コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/commits/1.8/develop_japanese/classes/asset/usage.html">翻訳コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/blob/1.8/develop_japanese/classes/asset/usage.html">GitHubで修正</a> ]
614614
</p>
615615
</footer>

‎classes/autoloader.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ <h4 id="function_import">import($path, $folder = 'classes')</h4>
476476

477477
<footer>
478478
<p>
479-
&copy; FuelPHP Development Team 2010-2013 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
479+
&copy; FuelPHP Development Team 2010-2014 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
480480
[ <a href="https://github.com/fuel/docs/commits/1.8/develop/classes/autoloader.html">原文コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/commits/1.8/develop_japanese/classes/autoloader.html">翻訳コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/blob/1.8/develop_japanese/classes/autoloader.html">GitHubで修正</a> ]
481481
</p>
482482
</footer>

‎classes/cache/advanced.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ <h3>Advanced usage</h3>
6666

6767
<footer>
6868
<p>
69-
&copy; FuelPHP Development Team 2010-2013 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
69+
&copy; FuelPHP Development Team 2010-2014 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
7070
[ <a href="https://github.com/fuel/docs/commits/1.8/develop/classes/cache/advanced.html">原文コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/commits/1.8/develop_japanese/classes/cache/advanced.html">翻訳コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/blob/1.8/develop_japanese/classes/cache/advanced.html">GitHubで修正</a> ]
7171
</p>
7272
</footer>

‎classes/cache/config.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ <h5 id="redis_driver_config">Redis driver configuration</h5>
185185

186186
<footer>
187187
<p>
188-
&copy; FuelPHP Development Team 2010-2013 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
188+
&copy; FuelPHP Development Team 2010-2014 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
189189
[ <a href="https://github.com/fuel/docs/commits/1.8/develop/classes/cache/config.html">原文コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/commits/1.8/develop_japanese/classes/cache/config.html">翻訳コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/blob/1.8/develop_japanese/classes/cache/config.html">GitHubで修正</a> ]
190190
</p>
191191
</footer>

‎classes/cache/usage.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ <h4 class="method" id="method_call">call($identifier, $callback, $args = array()
350350

351351
<footer>
352352
<p>
353-
&copy; FuelPHP Development Team 2010-2013 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
353+
&copy; FuelPHP Development Team 2010-2014 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
354354
[ <a href="https://github.com/fuel/docs/commits/1.8/develop/classes/cache/usage.html">原文コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/commits/1.8/develop_japanese/classes/cache/usage.html">翻訳コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/blob/1.8/develop_japanese/classes/cache/usage.html">GitHubで修正</a> ]
355355
</p>
356356
</footer>

0 commit comments

Comments
 (0)