Skip to content

Commit

Permalink
Merge branch '1.5/develop' into upstream-1.5-merge
Browse files Browse the repository at this point in the history
Conflicts:
	classes/agent/config.html
	classes/agent/usage.html
	classes/arr.html
	classes/asset/advanced.html
	classes/asset/config.html
	classes/asset/usage.html
	classes/autoloader.html
	classes/cache/advanced.html
	classes/cache/config.html
	classes/cache/usage.html
	classes/cli.html
	classes/config.html
	classes/cookie.html
	classes/crypt.html
	classes/database/db.html
	classes/database/dbutil.html
	classes/database/introduction.html
	classes/database/qb.html
	classes/database/qb_delete.html
	classes/database/qb_insert.html
	classes/database/qb_select.html
	classes/database/qb_update.html
	classes/database/qb_where.html
	classes/database/usage.html
	classes/date.html
	classes/debug.html
	classes/event.html
	classes/fieldset.html
	classes/file/advanced.html
	classes/file/handlers.html
	classes/file/intro.html
	classes/file/usage.html
	classes/finder.html
	classes/form.html
	classes/format.html
	classes/ftp.html
	classes/fuel.html
	classes/html.html
	classes/image.html
	classes/inflector.html
	classes/input.html
	classes/lang.html
	classes/log.html
	classes/markdown.html
	classes/migrate.html
	classes/model_crud/introduction.html
	classes/model_crud/methods.html
	classes/module.html
	classes/mongo/introduction.html
	classes/mongo/methods.html
	classes/num.html
	classes/package.html
	classes/pagination.html
	classes/profiler.html
	classes/redis.html
	classes/request/curl.html
	classes/request/request.html
	classes/request/soap.html
	classes/response.html
	classes/router.html
	classes/security.html
	classes/session/advanced.html
	classes/session/config.html
	classes/session/usage.html
	classes/str.html
	classes/theme/advanced.html
	classes/theme/introduction.html
	classes/theme/methods.html
	classes/upload/config.html
	classes/upload/usage.html
	classes/uri.html
	classes/validation/errors.html
	classes/validation/methods.html
	classes/validation/validation.html
	classes/view.html
	contribute.html
	credits.html
	general/classes.html
	general/coding_standards.html
	general/configuration.html
	general/constants.html
	general/controllers/base.html
	general/controllers/hybrid.html
	general/controllers/rest.html
	general/controllers/template.html
	general/environments.html
	general/error.html
	general/extending_core.html
	general/hmvc.html
	general/migrations.html
	general/models.html
	general/modules.html
	general/mvc.html
	general/packages.html
	general/profiling.html
	general/routing.html
	general/security.html
	general/tasks.html
	general/unit_testing.html
	general/viewmodels.html
	general/views.html
	index.html
	installation/download.html
	installation/instructions.html
	installation/troubleshooting.html
	installation/tutorials.html
	installation/upgrade.html
	license.html
	packages/auth/drivers.html
	packages/auth/intro.html
	packages/auth/simpleauth/acl.html
	packages/auth/simpleauth/groups.html
	packages/auth/simpleauth/intro.html
	packages/auth/simpleauth/login.html
	packages/auth/types/acl.html
	packages/auth/types/group.html
	packages/auth/types/login.html
	packages/auth/usage.html
	packages/email/introduction.html
	packages/email/methods.html
	packages/email/usage.html
	packages/oil/console.html
	packages/oil/generate.html
	packages/oil/intro.html
	packages/oil/package.html
	packages/oil/refine.html
	packages/oil/test.html
	packages/orm/creating_models.html
	packages/orm/crud.html
	packages/orm/eav.html
	packages/orm/intro.html
	packages/orm/model/soft.html
	packages/orm/observers/creating.html
	packages/orm/observers/included.html
	packages/orm/observers/intro.html
	packages/orm/relations/belongs_to.html
	packages/orm/relations/has_many.html
	packages/orm/relations/has_one.html
	packages/orm/relations/intro.html
	packages/orm/relations/many_many.html
	packages/parser/intro.html
	requirements.html
	templates/index.html
	vendor/htmlawed.html
	vendor/intro.html
	vendor/markdown.html
	vendor/phpquickprofiler.html
	vendor/phpseclib.html
	vendor/spyc.html
  • Loading branch information
kenjis committed Jan 20, 2013
2 parents 6b5a4d2 + e006d95 commit fda8a90
Show file tree
Hide file tree
Showing 149 changed files with 430 additions and 323 deletions.
2 changes: 1 addition & 1 deletion classes/agent/config.html
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ <h5 id="cache_config">Cache configuration</h5>

<footer>
<p>
&copy; FuelPHP Development Team 2010-2012 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
&copy; FuelPHP Development Team 2010-2013 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
[ <a href="https://github.com/fuel/docs/commits/1.5/develop/classes/agent/config.html">原文コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/commits/1.5/develop_japanese/classes/agent/config.html">翻訳コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/blob/1.5/develop_japanese/classes/agent/config.html">GitHubで修正</a> ]
</p>
</footer>
Expand Down
2 changes: 1 addition & 1 deletion classes/agent/usage.html
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,7 @@ <h4 id="method_is_robot" class="method">is_robot()</h4>

<footer>
<p>
&copy; FuelPHP Development Team 2010-2012 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
&copy; FuelPHP Development Team 2010-2013 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
[ <a href="https://github.com/fuel/docs/commits/1.5/develop/classes/agent/usage.html">原文コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/commits/1.5/develop_japanese/classes/agent/usage.html">翻訳コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/blob/1.5/develop_japanese/classes/agent/usage.html">GitHubで修正</a> ]
</p>
</footer>
Expand Down
2 changes: 1 addition & 1 deletion classes/arr.html
Original file line number Diff line number Diff line change
Expand Up @@ -1984,7 +1984,7 @@ <h4 id="function_in_arrayi" class="method" data-class="">in_arrayi($needle, $hay

<footer>
<p>
&copy; FuelPHP Development Team 2010-2012 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
&copy; FuelPHP Development Team 2010-2013 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
[ <a href="https://github.com/fuel/docs/commits/1.5/develop/classes/arr.html">原文コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/commits/1.5/develop_japanese/classes/arr.html">翻訳コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/blob/1.5/develop_japanese/classes/arr.html">GitHubで修正</a> ]
</p>
</footer>
Expand Down
2 changes: 1 addition & 1 deletion classes/asset/advanced.html
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ <h4 class="method" id="method_instance">instance($name = null)</h4>

<footer>
<p>
&copy; FuelPHP Development Team 2010-2012 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
&copy; FuelPHP Development Team 2010-2013 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
[ <a href="https://github.com/fuel/docs/commits/1.5/develop/classes/asset/advanced.html">原文コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/commits/1.5/develop_japanese/classes/asset/advanced.html">翻訳コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/blob/1.5/develop_japanese/classes/asset/advanced.html">GitHubで修正</a> ]
</p>
</footer>
Expand Down
2 changes: 1 addition & 1 deletion classes/asset/config.html
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ <h3 id="static_assets">Static assets</h3>

<footer>
<p>
&copy; FuelPHP Development Team 2010-2012 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
&copy; FuelPHP Development Team 2010-2013 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
[ <a href="https://github.com/fuel/docs/commits/1.5/develop/classes/asset/config.html">原文コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/commits/1.5/develop_japanese/classes/asset/config.html">翻訳コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/blob/1.5/develop_japanese/classes/asset/config.html">GitHubで修正</a> ]
</p>
</footer>
Expand Down
2 changes: 1 addition & 1 deletion classes/asset/usage.html
Original file line number Diff line number Diff line change
Expand Up @@ -583,7 +583,7 @@ <h4 id="method_render" class="method">render($group = null, $raw = false)</h4>

<footer>
<p>
&copy; FuelPHP Development Team 2010-2012 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
&copy; FuelPHP Development Team 2010-2013 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
[ <a href="https://github.com/fuel/docs/commits/1.5/develop/classes/asset/usage.html">原文コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/commits/1.5/develop_japanese/classes/asset/usage.html">翻訳コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/blob/1.5/develop_japanese/classes/asset/usage.html">GitHubで修正</a> ]
</p>
</footer>
Expand Down
3 changes: 1 addition & 2 deletions classes/autoloader.html
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ <h2>Autoloader クラス</h2>
<article>
<h4 class="method" id="method_add_namespace">add_namespace($namespace, $path, $psr = false)</h4>
<p><strong>add_namespace</strong> メソッドは名前空間とそのパスを追加します。</p>

<table class="method">
<tbody>
<tr>
Expand Down Expand Up @@ -477,7 +476,7 @@ <h4 id="function_import">import($path, $folder = 'classes')</h4>

<footer>
<p>
&copy; FuelPHP Development Team 2010-2012 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
&copy; FuelPHP Development Team 2010-2013 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
[ <a href="https://github.com/fuel/docs/commits/1.5/develop/classes/autoloader.html">原文コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/commits/1.5/develop_japanese/classes/autoloader.html">翻訳コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/blob/1.5/develop_japanese/classes/autoloader.html">GitHubで修正</a> ]
</p>
</footer>
Expand Down
2 changes: 1 addition & 1 deletion classes/cache/advanced.html
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ <h3>Advanced usage</h3>

<footer>
<p>
&copy; FuelPHP Development Team 2010-2012 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
&copy; FuelPHP Development Team 2010-2013 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
[ <a href="https://github.com/fuel/docs/commits/1.5/develop/classes/cache/advanced.html">原文コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/commits/1.5/develop_japanese/classes/cache/advanced.html">翻訳コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/blob/1.5/develop_japanese/classes/cache/advanced.html">GitHubで修正</a> ]
</p>
</footer>
Expand Down
2 changes: 1 addition & 1 deletion classes/cache/config.html
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ <h5 id="redis_driver_config">Redis driver configuration</h5>

<footer>
<p>
&copy; FuelPHP Development Team 2010-2012 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
&copy; FuelPHP Development Team 2010-2013 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
[ <a href="https://github.com/fuel/docs/commits/1.5/develop/classes/cache/config.html">原文コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/commits/1.5/develop_japanese/classes/cache/config.html">翻訳コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/blob/1.5/develop_japanese/classes/cache/config.html">GitHubで修正</a> ]
</p>
</footer>
Expand Down
2 changes: 1 addition & 1 deletion classes/cache/usage.html
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ <h4 class="method" id="method_call">call($identifier, $callback, $args = array()

<footer>
<p>
&copy; FuelPHP Development Team 2010-2012 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
&copy; FuelPHP Development Team 2010-2013 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
[ <a href="https://github.com/fuel/docs/commits/1.5/develop/classes/cache/usage.html">原文コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/commits/1.5/develop_japanese/classes/cache/usage.html">翻訳コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/blob/1.5/develop_japanese/classes/cache/usage.html">GitHubで修正</a> ]
</p>
</footer>
Expand Down
2 changes: 1 addition & 1 deletion classes/cli.html
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ <h4 class="method" id="method_write">write($text = '', $foreground = null, $back

<footer>
<p>
&copy; FuelPHP Development Team 2010-2012 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
&copy; FuelPHP Development Team 2010-2013 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
[ <a href="https://github.com/fuel/docs/commits/1.5/develop/classes/cli.html">原文コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/commits/1.5/develop_japanese/classes/cli.html">翻訳コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/blob/1.5/develop_japanese/classes/cli.html">GitHubで修正</a> ]
</p>
</footer>
Expand Down
2 changes: 1 addition & 1 deletion classes/config.html
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ <h4 class="method" id="method_save">save($file, $config = null)</h4>

<footer>
<p>
&copy; FuelPHP Development Team 2010-2012 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
&copy; FuelPHP Development Team 2010-2013 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
[ <a href="https://github.com/fuel/docs/commits/1.5/develop/classes/config.html">原文コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/commits/1.5/develop_japanese/classes/config.html">翻訳コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/blob/1.5/develop_japanese/classes/config.html">GitHubで修正</a> ]
</p>
</footer>
Expand Down
10 changes: 8 additions & 2 deletions classes/cookie.html
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,13 @@ <h3 id="configuration">設定</h3>
</tr>
</tbody>
</table>
<p>これらの値のどれか、又は複数の値がアプリケーションの共通設定ファイルから欠落しているとき、cookie クラスはこの表に定義されている値をデフォルトとして使用します。</p>
<p>If one or more of these values are missing from the global configuration, the class will use the defaults as defined in this table.</p>
<p class="note">
When using cookies, make <strong>ABSOLUTELY</strong> sure that the timezone configured in your <em>app/config/config.php</em> and/or your
<em>php.ini</em> file matches the timezone set on your server. Since cookie expiry timestamps are in GMT, expiry time calculation goes
horribly wrong when you have a timezone mismatch, ranging from not expiring properly to cookies not set at all because they arrive at
the browser already expired.
</p>

<article>
<h4 class="method" id="method_get">get($name = null, $default = null)</h4>
Expand Down Expand Up @@ -285,7 +291,7 @@ <h4 class="method" id="method_delete">delete($name, $path = null, $domain = null

<footer>
<p>
&copy; FuelPHP Development Team 2010-2012 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
&copy; FuelPHP Development Team 2010-2013 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
[ <a href="https://github.com/fuel/docs/commits/1.5/develop/classes/cookie.html">原文コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/commits/1.5/develop_japanese/classes/cookie.html">翻訳コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/blob/1.5/develop_japanese/classes/cookie.html">GitHubで修正</a> ]
</p>
</footer>
Expand Down
2 changes: 1 addition & 1 deletion classes/crypt.html
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ <h4 class="method" id="method_decode">decode($value, $key = false)</h4>

<footer>
<p>
&copy; FuelPHP Development Team 2010-2012 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
&copy; FuelPHP Development Team 2010-2013 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
[ <a href="https://github.com/fuel/docs/commits/1.5/develop/classes/crypt.html">原文コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/commits/1.5/develop_japanese/classes/crypt.html">翻訳コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/blob/1.5/develop_japanese/classes/crypt.html">GitHubで修正</a> ]
</p>
</footer>
Expand Down
2 changes: 1 addition & 1 deletion classes/database/db.html
Original file line number Diff line number Diff line change
Expand Up @@ -1243,7 +1243,7 @@ <h3 id="transaction">トランザクションの例</h3>

<footer>
<p>
&copy; FuelPHP Development Team 2010-2012 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
&copy; FuelPHP Development Team 2010-2013 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
[ <a href="https://github.com/fuel/docs/commits/1.5/develop/classes/database/db.html">原文コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/commits/1.5/develop_japanese/classes/database/db.html">翻訳コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/blob/1.5/develop_japanese/classes/database/db.html">GitHubで修正</a> ]
</p>
</footer>
Expand Down
6 changes: 3 additions & 3 deletions classes/database/dbutil.html
Original file line number Diff line number Diff line change
Expand Up @@ -961,7 +961,7 @@ <h4 class="method" id="method_drop_index">drop_index($table, $index_name, $db =
</tbody>
</table>
</article>

<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>
Expand Down Expand Up @@ -1019,7 +1019,7 @@ <h4 class="method" id="method_add_foregin_key">add_foregin_key($table, $foreign_
</tbody>
</table>
</article>

<article>
<h4 class="method" id="method_drop_foreign_key">drop_foreign_key($table, $fk_name)</h4>
<p>The <strong>drop_foreign_key</strong> method allows you to drop a foreign key from a table.</p>
Expand Down Expand Up @@ -1322,7 +1322,7 @@ <h4 class="method" id="method_repair_table">repair_table($table, $db = null)</h4

<footer>
<p>
&copy; FuelPHP Development Team 2010-2012 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
&copy; FuelPHP Development Team 2010-2013 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
[ <a href="https://github.com/fuel/docs/commits/1.5/develop/classes/database/dbutil.html">原文コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/commits/1.5/develop_japanese/classes/database/dbutil.html">翻訳コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/blob/1.5/develop_japanese/classes/database/dbutil.html">GitHubで修正</a> ]
</p>
</footer>
Expand Down
2 changes: 1 addition & 1 deletion classes/database/introduction.html
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ <h3 id="config_settings">全設定項目</h3>

<footer>
<p>
&copy; FuelPHP Development Team 2010-2012 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
&copy; FuelPHP Development Team 2010-2013 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
[ <a href="https://github.com/fuel/docs/commits/1.5/develop/classes/database/introduction.html">原文コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/commits/1.5/develop_japanese/classes/database/introduction.html">翻訳コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/blob/1.5/develop_japanese/classes/database/introduction.html">GitHubで修正</a> ]
</p>
</footer>
Expand Down
2 changes: 1 addition & 1 deletion classes/database/qb.html
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ <h2 id="introduction">Query Building</h2>

<footer>
<p>
&copy; FuelPHP Development Team 2010-2012 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
&copy; FuelPHP Development Team 2010-2013 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
[ <a href="https://github.com/fuel/docs/commits/1.5/develop/classes/database/qb.html">原文コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/commits/1.5/develop_japanese/classes/database/qb.html">翻訳コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/blob/1.5/develop_japanese/classes/database/qb.html">GitHubで修正</a> ]
</p>
</footer>
Expand Down
2 changes: 1 addition & 1 deletion classes/database/qb_delete.html
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ <h4 class="method" id="method_reset">reset()</h4>

<footer>
<p>
&copy; FuelPHP Development Team 2010-2012 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
&copy; FuelPHP Development Team 2010-2013 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
[ <a href="https://github.com/fuel/docs/commits/1.5/develop/classes/database/qb_delete.html">原文コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/commits/1.5/develop_japanese/classes/database/qb_delete.html">翻訳コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/blob/1.5/develop_japanese/classes/database/qb_delete.html">GitHubで修正</a> ]
</p>
</footer>
Expand Down
2 changes: 1 addition & 1 deletion classes/database/qb_insert.html
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ <h4 class="method" id="method_reset">reset()</h4>

<footer>
<p>
&copy; FuelPHP Development Team 2010-2012 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
&copy; FuelPHP Development Team 2010-2013 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
[ <a href="https://github.com/fuel/docs/commits/1.5/develop/classes/database/qb_insert.html">原文コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/commits/1.5/develop_japanese/classes/database/qb_insert.html">翻訳コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/blob/1.5/develop_japanese/classes/database/qb_insert.html">GitHubで修正</a> ]
</p>
</footer>
Expand Down
Loading

0 comments on commit fda8a90

Please sign in to comment.