svn: /phpdoc/ja/trunk/ language/basic-syntax.xml language/types/callable.xml language/types.xml reference/intl/resourcebundle/locales.xml
reference/var/functions/is-int.xml reference/var/functions/is-integer.xml reference/var/functions/is-long.xml
| From: | TAKAGI Masahiro | Date: | Mon, 15 Dec 2014 23:05:08 +0000 |
| Subject: | svn: /phpdoc/ja/trunk/ language/basic-syntax.xml language/types/callable.xml language/types.xml reference/intl/resourcebundle/locales.xml reference/var/functions/is-int.xml reference/var/functions/is-integer.xml reference/var/functions/is-long.xml |
||
| Groups: | php.doc.ja | ||
| Request: | Send a blank email to doc-ja+get-4304@lists.php.net to get a copy of this message | ||
takagi Mon, 15 Dec 2014 23:05:08 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=335299
Log:
Sync with en
Changed paths:
U phpdoc/ja/trunk/language/basic-syntax.xml
U phpdoc/ja/trunk/language/types/callable.xml
U phpdoc/ja/trunk/language/types.xml
U phpdoc/ja/trunk/reference/intl/resourcebundle/locales.xml
U phpdoc/ja/trunk/reference/var/functions/is-int.xml
U phpdoc/ja/trunk/reference/var/functions/is-integer.xml
U phpdoc/ja/trunk/reference/var/functions/is-long.xml
Modified: phpdoc/ja/trunk/language/basic-syntax.xml
===================================================================
--- phpdoc/ja/trunk/language/basic-syntax.xml 2014-12-15 10:18:51 UTC (rev 335298)
+++ phpdoc/ja/trunk/language/basic-syntax.xml 2014-12-15 23:05:08 UTC (rev 335299)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 334259 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 335256 Maintainer: hirokawa Status: ready -->
<!-- CREDITS: takagi, shimooka -->
<chapter xml:id="language.basic-syntax" xmlns="http://docbook.org/ns/docbook">
@@ -16,7 +16,7 @@
箇所以外のすべての部分は、PHP パーサに無視されます。
</para>
<para>
- PHP では、短い形式の開始タグ <literal><?</literal> および
<literal>?></literal> も使えます
+ PHP では、短い形式の開始タグ <literal><?</literal>
も使えます
(しかしこれはおすすめしません。というのも、この形式のタグは
&php.ini; で
<link linkend="ini.short-open-tag">short_open_tag</link>
を有効にするか
<option>--enable-short-tags</option> オプションつきで PHP を configure
した場合でないと使えないからです)。
@@ -110,18 +110,17 @@
<title>PHP の開始タグと終了タグ</title>
<programlisting role="php">
<![CDATA[
-1. <?php echo
'XHTMLまたはXMLドキュメントを処理したい場合は、この方法が良いでしょう';
?>
+1. <?php echo
'XHTMLまたはXMLドキュメントの中でPHPコードを扱いたい場合は、このタグを使いましょう';
?>
2. <script language="php">
- echo '(FrontPageのような) いくつかのエディタ は処理命令を好み
- ません';
+ echo '(FrontPageのような)
いくつかのエディタは、このタグの中の処理命令を好みません';
</script>
-3. <? echo 'これは、SGML を処理する最もシンプルな方法です'; ?>
- <?= expression ?> これは、"<? echo expression ?>"
のショートカットです。
+3. <? echo 'このコードは、短いタグの中にあります'; ?>
+ <?= '何かのテキスト' ?> これは、<? echo
'何かのテキスト' ?> のショートカットです。
4. <% echo 'オプションでASP形式のタグを使用可能です'; %>
- <%= $variable; %> これは、"<% echo $variable; %>"
のショートカットです。
+ <%= $variable; %> これは、<% echo $variable; %>
のショートカットです。
]]>
</programlisting>
</example>
Modified: phpdoc/ja/trunk/language/types/callable.xml
===================================================================
--- phpdoc/ja/trunk/language/types/callable.xml 2014-12-15 10:18:51 UTC (rev 335298)
+++ phpdoc/ja/trunk/language/types/callable.xml 2014-12-15 23:05:08 UTC (rev 335299)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 331556 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 335289 Maintainer: takagi Status: ready -->
<sect1 xml:id="language.types.callable">
- <title>コールバック</title>
+ <title>コールバック / Callable</title>
<para>
コールバックは、PHP 5.4 以降では <type>callable</type>
タイプヒントで表されます。
Modified: phpdoc/ja/trunk/language/types.xml
===================================================================
--- phpdoc/ja/trunk/language/types.xml 2014-12-15 10:18:51 UTC (rev 335298)
+++ phpdoc/ja/trunk/language/types.xml 2014-12-15 23:05:08 UTC (rev 335299)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 328219 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 335289 Maintainer: hirokawa Status: ready -->
<!-- CREDITS: takagi, shimooka -->
<chapter xml:id="language.types" xmlns="http://docbook.org/ns/docbook">
<title>型</title>
@@ -105,7 +105,7 @@
<listitem>
<simpara>
- <type>callback</type>
+ <type>callback (aka callable)</type>
</simpara>
</listitem>
Modified: phpdoc/ja/trunk/reference/intl/resourcebundle/locales.xml
===================================================================
--- phpdoc/ja/trunk/reference/intl/resourcebundle/locales.xml 2014-12-15 10:18:51 UTC (rev 335298)
+++ phpdoc/ja/trunk/reference/intl/resourcebundle/locales.xml 2014-12-15 23:05:08 UTC (rev 335299)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 330543 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 335255 Maintainer: takagi Status: ready -->
<refentry xml:id="resourcebundle.locales" xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
<refname>ResourceBundle::getLocales</refname>
@@ -65,7 +65,7 @@
<![CDATA[
<?php
$bundle = "/user/share/data/myapp";
-echo join(PHP_EOL, resourcebundle_locales($bundle);
+echo join(PHP_EOL, resourcebundle_locales($bundle));
?>
]]>
</programlisting>
Modified: phpdoc/ja/trunk/reference/var/functions/is-int.xml
===================================================================
--- phpdoc/ja/trunk/reference/var/functions/is-int.xml 2014-12-15 10:18:51 UTC (rev 335298)
+++ phpdoc/ja/trunk/reference/var/functions/is-int.xml 2014-12-15 23:05:08 UTC (rev 335299)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 329668 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 335292 Maintainer: hirokawa Status: ready -->
<!-- CREDITS: shimooka -->
<refentry xml:id="function.is-int" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
Modified: phpdoc/ja/trunk/reference/var/functions/is-integer.xml
===================================================================
--- phpdoc/ja/trunk/reference/var/functions/is-integer.xml 2014-12-15 10:18:51 UTC (rev 335298)
+++ phpdoc/ja/trunk/reference/var/functions/is-integer.xml 2014-12-15 23:05:08 UTC (rev 335299)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 297028 Maintainer: hirokawa Status: ready -->
+<!-- $Revision$ -->
+<!-- EN-Revision: 335292 Maintainer: hirokawa Status: ready -->
<!-- CREDITS: shimooka -->
<refentry xml:id="function.is-integer" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
Modified: phpdoc/ja/trunk/reference/var/functions/is-long.xml
===================================================================
--- phpdoc/ja/trunk/reference/var/functions/is-long.xml 2014-12-15 10:18:51 UTC (rev 335298)
+++ phpdoc/ja/trunk/reference/var/functions/is-long.xml 2014-12-15 23:05:08 UTC (rev 335299)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 297028 Maintainer: hirokawa Status: ready -->
+<!-- $Revision$ -->
+<!-- EN-Revision: 335292 Maintainer: hirokawa Status: ready -->
<!-- CREDITS: shimooka -->
<refentry xml:id="function.is-long" xmlns="http://docbook.org/ns/docbook">
<refnamediv>