cvs: phpdoc /ja/features error-handling.xml /ja/functions array.xml cpdf.xml dir.xml filesystem.xml ifx.xml image.xml ldap.xml mysql.xml oci8.xml
pcre.xml pgsql.xml strings.xml swf.xml var.xml xml.xml
| From: | Jouni Ahto | Date: | Sun, 14 Oct 2001 13:53:21 +0000 |
| Subject: | cvs: phpdoc /ja/features error-handling.xml /ja/functions array.xml cpdf.xml dir.xml filesystem.xml ifx.xml image.xml ldap.xml mysql.xml oci8.xml pcre.xml pgsql.xml strings.xml swf.xml var.xml xml.xml |
||
| Groups: | php.doc | ||
| Request: | Send a blank email to phpdoc+get-969337982@lists.php.net to get a copy of this message | ||
jah Sun Oct 14 09:53:21 2001 EDT
Modified files:
/phpdoc/ja/features error-handling.xml
/phpdoc/ja/functions array.xml cpdf.xml dir.xml filesystem.xml
ifx.xml image.xml ldap.xml mysql.xml oci8.xml
pcre.xml pgsql.xml strings.xml swf.xml var.xml
xml.xml
Log:
Fixed a lot of problems with entities (found when testing with Fop).
Index: phpdoc/ja/features/error-handling.xml diff -u phpdoc/ja/features/error-handling.xml:1.7 phpdoc/ja/features/error-handling.xml:1.8 --- phpdoc/ja/features/error-handling.xml:1.7 Mon Feb 26 10:40:18 2001 +++ phpdoc/ja/features/error-handling.xml Sun Oct 14 09:53:19 2001 @@ -104,13 +104,13 @@ ãããã¹ã¯ãããããããã«<link linkend="language.operators.bitwise">ãããæ¼ç®å</link>ã使ç¨ãã ãã¨ãå¯è½ã§ãã<filename>php.ini</filename>ã§ä½¿ç¨ã§ããã®ã¯ '|', - '~', '!', '&' ã®ã¿ã§ãããã¨ã«æ³¨æãã¦ä¸ããããããããããæ¼ç®å + '~', '!', '&' ã®ã¿ã§ãããã¨ã«æ³¨æãã¦ä¸ããããããããããæ¼ç®å ã§ãªããã®ã¯ã<filename>php3.ini</filename>ã®ä¸ã§ä½¿ç¨å¯è½ã§ãã </para> <para> PHP 4ã§ã¯ã <link linkend="ini.error-reporting">error_reporting</link> - ã®ããã©ã«ãè¨å®å¤ã¯ <literal>E_ALL & ~E_NOTICE</literal>ã§ããã + ã®ããã©ã«ãè¨å®å¤ã¯ <literal>E_ALL & ~E_NOTICE</literal>ã§ããã å ¨ã¦ã®ã¨ã©ã¼ã表示ãã¾ããPHP 3 ã§ã¯ãããã©ã«ãã®è¨å®ã¯ã <literal>(E_ERROR | E_WARNING | E_PARSE)</literal>ã§ããã åããã¨ãæå³ãã¾ããããããPHP 3 ã®<filename>php3.ini</filename> Index: phpdoc/ja/functions/array.xml diff -u phpdoc/ja/functions/array.xml:1.32 phpdoc/ja/functions/array.xml:1.33 --- phpdoc/ja/functions/array.xml:1.32 Sun Aug 12 20:33:48 2001 +++ phpdoc/ja/functions/array.xml Sun Oct 14 09:53:19 2001 @@ -1384,7 +1384,7 @@ <programlisting role="php"> $fruits = array ("d"=>"lemon", "a"=>"orange", "b"=>"banana", "c"=>"apple"); -function test_alter (&$item1, $key, $prefix) { +function test_alter (&$item1, $key, $prefix) { $item1 = "$prefix: $item1"; } Index: phpdoc/ja/functions/cpdf.xml diff -u phpdoc/ja/functions/cpdf.xml:1.15 phpdoc/ja/functions/cpdf.xml:1.16 --- phpdoc/ja/functions/cpdf.xml:1.15 Sun Aug 12 20:33:48 2001 +++ phpdoc/ja/functions/cpdf.xml Sun Oct 14 09:53:19 2001 @@ -119,7 +119,7 @@ /* 1åãã¤é²ã */ cpdf_setlinewidth($pdf, 2.0); - for ($alpha = 0; $alpha < 360; $alpha += 6) + for ($alpha = 0; $alpha < 360; $alpha += 6) { cpdf_rotate($pdf, 6.0); cpdf_moveto($pdf, $radius, 0.0); @@ -132,7 +132,7 @@ /* 5 åãã¤é²ã */ cpdf_setlinewidth($pdf, 3.0); - for ($alpha = 0; $alpha < 360; $alpha += 30) + for ($alpha = 0; $alpha < 360; $alpha += 30) { cpdf_rotate($pdf, 30.0); cpdf_moveto($pdf, $radius, 0.0); Index: phpdoc/ja/functions/dir.xml diff -u phpdoc/ja/functions/dir.xml:1.8 phpdoc/ja/functions/dir.xml:1.9 --- phpdoc/ja/functions/dir.xml:1.8 Sat Jul 7 18:25:34 2001 +++ phpdoc/ja/functions/dir.xml Sun Oct 14 09:53:20 2001 @@ -220,7 +220,7 @@ <?php $handle=opendir('.'); while (false!==($file = readdir($handle))) { - if ($file != "." && $file != "..") { + if ($file != "." && $file != "..") { echo "$file\n"; } } Index: phpdoc/ja/functions/filesystem.xml diff -u phpdoc/ja/functions/filesystem.xml:1.33 phpdoc/ja/functions/filesystem.xml:1.34 --- phpdoc/ja/functions/filesystem.xml:1.33 Sun Aug 12 20:33:48 2001 +++ phpdoc/ja/functions/filesystem.xml Sun Oct 14 09:53:20 2001 @@ -494,7 +494,7 @@ $num = count ($data); print "<p> $num fields in line $row: <br>"; $row++; - for ($c=0; $c<$num; $c++) { + for ($c=0; $c<$num; $c++) { print $data[$c] . "<br>"; } } @@ -2709,7 +2709,7 @@ </funcprototype> </funcsynopsis> <para> - <function>umask</function>ã¯PHPã®umaskãmask & 0777ã«ã»ãããã + <function>umask</function>ã¯PHPã®umaskãmask & 0777ã«ã»ãããã å ã®umaskå¤ãè¿ãã¾ãã PHPããµã¼ãã»ã¢ã¸ã¥ã¼ã«ã¨ãã¦åä½ä¸ã®å ´åãåãªã¯ã¨ã¹ãã çµäºãããã³ã«umaskã¯å ã®å¤ã«æ»ããã¾ãã Index: phpdoc/ja/functions/ifx.xml diff -u phpdoc/ja/functions/ifx.xml:1.10 phpdoc/ja/functions/ifx.xml:1.11 --- phpdoc/ja/functions/ifx.xml:1.10 Sun Aug 12 20:33:48 2001 +++ phpdoc/ja/functions/ifx.xml Sun Oct 14 09:53:20 2001 @@ -579,7 +579,7 @@ </funcprototype> </funcsynopsis> <para> - Informix ã¨ã©ã¼ã³ã¼ã (SQLSTATE & SQLCODE) ã¯æ¬¡ã®ãããªãã©ã¼ãã + Informix ã¨ã©ã¼ã³ã¼ã (SQLSTATE & SQLCODE) ã¯æ¬¡ã®ãããªãã©ã¼ãã ãã¨ãªãã¾ã : </para> <para> @@ -928,7 +928,7 @@ if (! isset ($types)) { ... ã¨ã©ã¼å¦ç ... } -for ($i = 0; $i < count($types); $i++) { +for ($i = 0; $i < count($types); $i++) { $fname = key($types); printf("%s :\t type = %s\n", $fname, $types[$fname]); next($types); @@ -970,7 +970,7 @@ if (! isset($properties)) { ... error ... } -for ($i = 0; $i < count($properties); $i++) { +for ($i = 0; $i < count($properties); $i++) { $fname = key ($properties); printf ("%s:\t type = %s\n", $fname, $properties[$fname]); next ($properties); Index: phpdoc/ja/functions/image.xml diff -u phpdoc/ja/functions/image.xml:1.25 phpdoc/ja/functions/image.xml:1.26 --- phpdoc/ja/functions/image.xml:1.25 Sat Jul 7 18:25:44 2001 +++ phpdoc/ja/functions/image.xml Sun Oct 14 09:53:20 2001 @@ -96,7 +96,7 @@ <title>IPTC ãè¿ã GetImageSize</title> <programlisting> <?php - $size = GetImageSize ("testimg.jpg",&$info); + $size = GetImageSize ("testimg.jpg",&$info); if (isset ($info["APP13"])) { $iptc = iptcparse ($info["APP13"]); var_dump ($iptc); Index: phpdoc/ja/functions/ldap.xml diff -u phpdoc/ja/functions/ldap.xml:1.21 phpdoc/ja/functions/ldap.xml:1.22 --- phpdoc/ja/functions/ldap.xml:1.21 Sun Aug 12 20:33:48 2001 +++ phpdoc/ja/functions/ldap.xml Sun Oct 14 09:53:20 2001 @@ -93,7 +93,7 @@ $info = ldap_get_entries($ds, $sr); echo "Data for ".$info["count"]." items returned:<p>"; - for ($i=0; $i<$info["count"]; $i++) { + for ($i=0; $i<$info["count"]; $i++) { echo "dn is: ". $info[$i]["dn"] ."<br>"; echo "first cn entry is: ". $info[$i]["cn"][0] ."<br>"; echo "first email entry is: ". $info[$i]["mail"][0] ."<p>"; @@ -1180,7 +1180,7 @@ $info = ldap_get_entries($ds, $sr); -for ($i=0; $i<$info["count"]; $i++) +for ($i=0; $i<$info["count"]; $i++) echo $info[$i]["ou"][0] ; </programlisting> </example> Index: phpdoc/ja/functions/mysql.xml diff -u phpdoc/ja/functions/mysql.xml:1.19 phpdoc/ja/functions/mysql.xml:1.20 --- phpdoc/ja/functions/mysql.xml:1.19 Sat Jul 7 18:25:57 2001 +++ phpdoc/ja/functions/mysql.xml Sun Oct 14 09:53:20 2001 @@ -421,7 +421,7 @@ $i = 0; $cnt = mysql_num_rows($db_list); -while ($i < $cnt) { +while ($i < $cnt) { echo mysql_db_name($db_list, $i) . "\n"; $i++; } Index: phpdoc/ja/functions/oci8.xml diff -u phpdoc/ja/functions/oci8.xml:1.16 phpdoc/ja/functions/oci8.xml:1.17 --- phpdoc/ja/functions/oci8.xml:1.16 Sun Aug 12 20:33:48 2001 +++ phpdoc/ja/functions/oci8.xml Sun Oct 14 09:53:20 2001 @@ -113,7 +113,7 @@ field2 = empty_clob()) returning field2 into :field2"; OCIParse($conn, $sql); $clob = OCINewDescriptor($conn, OCI_D_LOB); -OCIBindByName ($stmt, ":field2", &$clob, -1, OCI_B_CLOB); +OCIBindByName ($stmt, ":field2", &$clob, -1, OCI_B_CLOB); OCIExecute($stmt, OCI_DEFAULT); $clob->save ("some text"); @@ -191,7 +191,7 @@ <funcdef>int <function>OCIDefineByName</function></funcdef> <paramdef>int <parameter>stmt</parameter></paramdef> <paramdef>string <parameter>Column-Name</parameter></paramdef> - <paramdef>mixed &<parameter>variable</parameter></paramdef> + <paramdef>mixed &<parameter>variable</parameter></paramdef> <paramdef>int <parameter> <replaceable><optional>type</optional></replaceable> @@ -227,8 +227,8 @@ /* the define MUST be done BEFORE ociexecute! */ -OCIDefineByName($stmt,"EMPNO",&$empno); -OCIDefineByName($stmt,"ENAME",&$ename); +OCIDefineByName($stmt,"EMPNO",&$empno); +OCIDefineByName($stmt,"ENAME",&$ename); OCIExecute($stmt); @@ -256,7 +256,7 @@ <funcdef>int <function>OCIBindByName</function></funcdef> <paramdef>int <parameter>stmt</parameter></paramdef> <paramdef>string <parameter>ph_name</parameter></paramdef> - <paramdef>mixed &<parameter>variable</parameter></paramdef> + <paramdef>mixed &<parameter>variable</parameter></paramdef> <paramdef>int<parameter>length</parameter></paramdef> <paramdef>int <parameter> @@ -305,13 +305,13 @@ $rowid = OCINewDescriptor($conn,OCI_D_ROWID); -OCIBindByName($stmt,":empno",&$empno,32); -OCIBindByName($stmt,":ename",&$ename,32); -OCIBindByName($stmt,":rid",&$rowid,-1,OCI_B_ROWID); +OCIBindByName($stmt,":empno",&$empno,32); +OCIBindByName($stmt,":ename",&$ename,32); +OCIBindByName($stmt,":rid",&$rowid,-1,OCI_B_ROWID); $update = OCIParse($conn,"update emp set sal = :sal where ROWID = :rid"); -OCIBindByName($update,":rid",&$rowid,-1,OCI_B_ROWID); -OCIBindByName($update,":sal",&$sal,32); +OCIBindByName($update,":rid",&$rowid,-1,OCI_B_ROWID); +OCIBindByName($update,":sal",&$sal,32); $sal = 10000; @@ -327,7 +327,7 @@ $stmt = OCIParse($conn,"select * from emp where empno in (1111,2222,3333)"); OCIExecute($stmt); -while (OCIFetchInto($stmt,&$arr,OCI_ASSOC)) { +while (OCIFetchInto($stmt,&$arr,OCI_ASSOC)) { var_dump($arr); } OCIFreeStatement($stmt); @@ -793,12 +793,12 @@ $conn = OCILogon($user, $password); $stmt = OCIParse($conn,"select rowid from $table $where"); $rowid = OCINewDescriptor($conn,OCI_D_ROWID); - OCIDefineByName($stmt,"ROWID",&$rowid); + OCIDefineByName($stmt,"ROWID",&$rowid); OCIExecute($stmt); while ( OCIFetch($stmt) ) { $nrows = OCIRowCount($stmt); $delete = OCIParse($conn,"delete from $table where ROWID = :rid"); - OCIBindByName($delete,":rid",&$rowid,-1,OCI_B_ROWID); + OCIBindByName($delete,":rid",&$rowid,-1,OCI_B_ROWID); OCIExecute($delete); print "$nrows\n"; if ( ($nrows % $commitsize) == 0 ) { @@ -831,7 +831,7 @@ $lob = OCINewDescriptor($conn, OCI_D_LOB); $stmt = OCIParse($conn,"insert into $table (id, the_blob) values(my_seq.NEXTVAL, EMPTY_BLOB()) returning the_blob into :the_blob"); - OCIBindByName($stmt, ':the_blob', &$lob, -1, OCI_B_BLOB); + OCIBindByName($stmt, ':the_blob', &$lob, -1, OCI_B_BLOB); OCIExecute($stmt); if($lob->savefile($lob_upload)){ OCICommit($conn); @@ -922,7 +922,7 @@ while (OCIFetch ($stmt)) { print "\n"; $ncols = OCINumCols ($stmt); - for ( $i = 1; $i <= $ncols; $i++ ) { + for ( $i = 1; $i <= $ncols; $i++ ) { $column_name = OCIColumnName ($stmt, $i); $column_value = OCIResult ($stmt, $i); print $column_name . ': ' . $column_value . "\n"; @@ -994,7 +994,7 @@ <funcprototype> <funcdef>int <function>OCIFetchInto</function></funcdef> <paramdef>int <parameter>stmt</parameter></paramdef> - <paramdef>array &<parameter>result</parameter></paramdef> + <paramdef>array &<parameter>result</parameter></paramdef> <paramdef>int <parameter> <replaceable><optional>mode</optional></replaceable> @@ -1040,7 +1040,7 @@ <funcprototype> <funcdef>int <function>OCIFetchStatement</function></funcdef> <paramdef>int <parameter>stmt</parameter></paramdef> - <paramdef>array &<parameter>variable</parameter></paramdef> + <paramdef>array &<parameter>variable</parameter></paramdef> </funcprototype> </funcsynopsis> <para> @@ -1153,7 +1153,7 @@ print "<TH>Length</TH>"; print "</TR>"; $ncols = OCINumCols ($stmt); -for ( $i = 1; $i <= $ncols; $i++ ) { +for ( $i = 1; $i <= $ncols; $i++ ) { $column_name = OCIColumnName ($stmt, $i); $column_type = OCIColumnType ($stmt, $i); $column_size = OCIColumnSize ($stmt, $i); @@ -1328,11 +1328,11 @@ $curs = OCINewCursor ($conn); $stmt = OCIParse ($conn, "begin info.output(:data); end;"); -ocibindbyname ($stmt,"data",&$curs,-1,OCI_B_CURSOR); +ocibindbyname ($stmt,"data",&$curs,-1,OCI_B_CURSOR); ociexecute ($stmt); ociexecute ($curs); -while (OCIFetchInto($curs,&$data)) { +while (OCIFetchInto($curs,&$data)) { var_dump($data); } @@ -1362,14 +1362,14 @@ print "<TH># EMPLOYEES</TH>"; print "</TR>"; -while (OCIFetchInto($stmt,&$data,OCI_ASSOC)) { +while (OCIFetchInto($stmt,&$data,OCI_ASSOC)) { print "<TR>"; $dname = $data["DNAME"]; $deptno = $data["DEPTNO"]; print "<TD>$dname</TD>"; print "<TD>$deptno</TD>"; ociexecute($data[ "EMPCNT" ]); - while (OCIFetchInto($data[ "EMPCNT" ],&$subdata,OCI_ASSOC)) { + while (OCIFetchInto($data[ "EMPCNT" ],&$subdata,OCI_ASSOC)) { $num_emps = $subdata["NUM_EMPS"]; print "<TD>$num_emps</TD>"; } @@ -1480,7 +1480,7 @@ print "<TH>Length</TH>"; print "</TR>"; $ncols = OCINumCols ($stmt); -for ($i = 1; $i <= $ncols; $i++) { +for ($i = 1; $i <= $ncols; $i++) { $column_name = OCIColumnName ($stmt, $i); $column_type = OCIColumnType ($stmt, $i); $column_size = OCIColumnSize ($stmt, $i); @@ -1539,7 +1539,7 @@ print "<TH>Length</TH>"; print "</TR>"; $ncols = OCINumCols($stmt); - for ( $i = 1; $i <= $ncols; $i++ ) { + for ( $i = 1; $i <= $ncols; $i++ ) { $column_name = OCIColumnName($stmt,$i); $column_type = OCIColumnType($stmt,$i); $column_size = OCIColumnSize($stmt,$i); Index: phpdoc/ja/functions/pcre.xml diff -u phpdoc/ja/functions/pcre.xml:1.26 phpdoc/ja/functions/pcre.xml:1.27 --- phpdoc/ja/functions/pcre.xml:1.26 Sun Oct 14 00:05:01 2001 +++ phpdoc/ja/functions/pcre.xml Sun Oct 14 09:53:20 2001 @@ -197,7 +197,7 @@ ãã®ä¾ã®åºåã¯ä»¥ä¸ã®ããã«ãªãã¾ãã <informalexample> <programlisting> -<b>example: </b>, <div align=left>this is a test</div> +<b>example: </b>, <div align=left>this is a test</div> example: , this is a test </programlisting> </informalexample> @@ -264,7 +264,7 @@ // \\2 ã¯å¾æ¹åç §ã®ä¾ã§ããããã¯ãpcre ã«æ£è¦è¡¨ç¾èªä½ã®æ¬å¼§ã®2çªç®ã® // çµãã¤ã¾ããã®å ´åã¯([\w]+)ãã«ããããã¾ããæååãäºéå¼ç¨ç¬¦ã§æ¬ // ããã¦ãããããããã¯ã¹ã©ãã·ã¥ã®è¿½å ãå¿ è¦ã§ãã -$html = "<b>bold text</b><a href=howdy.html>click me</a>"; +$html = "<b>bold text</b><a href=howdy.html>click me</a>"; preg_match_all ("/(<([\w]+)[^>]*>)(.*)(<\/\\2>)/", $html, $matches); @@ -393,7 +393,7 @@ <example> <title>/e 修飾åã®ä½¿ç¨æ³</title> <programlisting role="php"> -preg_replace ("/(<\/?)(\w+)([^>]*>)/e", +preg_replace ("/(<\/?)(\w+)([^>]*>)/e", "'\\1'.strtoupper('\\2').'\\3'", $html_body); </programlisting> @@ -615,7 +615,7 @@ </para> <para> æ£è¦è¡¨ç¾ã®ç¹æ®æåã¯ã次ã®ãããªãã®ã§ãã - <screen>. \\ + * ? [ ^ ] $ ( ) { } = ! < > | :</screen> + <screen>. \\ + * ? [ ^ ] $ ( ) { } = ! < > | :</screen> </para> <para> <example> @@ -1721,7 +1721,7 @@ ã¯ã"bar" ãåã«ãããéã« "foo" ãåã«ãªã "baz" ã«ããããã¾ãã 䏿¹ã - (?<=\d{3}(?!999)...)foo + (?<=\d{3}(?!999)...)foo ã¯ã3æ¡ã®æ°ãå è¡ããä¸ã®3æåã"999"ã§ãªã"foo"ã«ãããããå¥ã® ãã¿ã¼ã³ã§ãã @@ -1807,7 +1807,7 @@ "a" ã®æ¤ç´¢ãæååå ¨ä½ã«å¯¾ãã¦å·¦ããå³ã«å度è¡ãããã å¹çã¯è¯ãããã¾ããããããããã¿ã¼ã³ã次ã®ããã«æ¸ããå ´åã - ^(?>.*)(?<=abcd) + ^(?>.*)(?<=abcd) ãã®å ´åã¯ã.* ã«é¢ããåæ¤ç´¢ã¯è¡ããããæååå ¨ä½ã«ã®ã¿ãã ããã¾ããç¶ã徿¹è¨æã¯ãæå¾ã®4æåã«å¯¾ãã試è¡ã1åã ãè¡ @@ -1820,10 +1820,10 @@ ä¸ã®ææ®µã§ãã ãã¿ã¼ã³ - (\D+|<\d+>)*[!?] + (\D+|<\d+>)*[!?] ã¯ãç¡å¶éã®æ°ã®å¯æååã«ããããã¾ãããã®å¯æååã¯éæ°å¤ãã - ãªãã<>ã§æ¬ãããæ°å¤ã®ã©ã¡ããã§ãå¾ã« ! ã¾ã㯠? ãç¶ããã®ã§ + ãªãã<>ã§æ¬ãããæ°å¤ã®ã©ã¡ããã§ãå¾ã« ! ã¾ã㯠? ãç¶ããã®ã§ ãããããããå ´åãå®è¡ã¯é«éã§ãããããã以ä¸ã®æååã«é©ç¨ã ãå ´åã @@ -1837,7 +1837,7 @@ ã¦ãããæååã«ããããªãå ´åã«æ©æã«å¤±æã¨å¤å®ãã¾ãã) ãã®ãã¿ã¼ã³ã次ã®ããã«å¤æ´ããå ´åã - ((?>\D+)|<\d+>)*[!?] + ((?>\D+)|<\d+>)*[!?] æ°å以å¤ã®ä¸¦ã³ã«ããä¸åãçãããã¨ããªããªãã失æã¯æ©æã«çã ã¾ãã Index: phpdoc/ja/functions/pgsql.xml diff -u phpdoc/ja/functions/pgsql.xml:1.25 phpdoc/ja/functions/pgsql.xml:1.26 --- phpdoc/ja/functions/pgsql.xml:1.25 Sun Aug 12 20:33:48 2001 +++ phpdoc/ja/functions/pgsql.xml Sun Oct 14 09:53:20 2001 @@ -422,10 +422,10 @@ } $arr = pg_fetch_array ($result, 0); -echo $arr[0] . " <- array\n"; +echo $arr[0] . " <- array\n"; $arr = pg_fetch_array ($result, 1); -echo $arr["author"] . " <- array\n"; +echo $arr["author"] . " <- array\n"; ?> </programlisting> </example> Index: phpdoc/ja/functions/strings.xml diff -u phpdoc/ja/functions/strings.xml:1.43 phpdoc/ja/functions/strings.xml:1.44 --- phpdoc/ja/functions/strings.xml:1.43 Sun Oct 14 06:21:15 2001 +++ phpdoc/ja/functions/strings.xml Sun Oct 14 09:53:20 2001 @@ -677,7 +677,7 @@ $original = strtr ($str, $trans); </programlisting> </informalexample> - <literal>$original</literal> ã®å å®¹ã¯æ¬¡ã®ããã«ãªãã¾ãã: "Hallo & + <literal>$original</literal> ã®å å®¹ã¯æ¬¡ã®ããã«ãªãã¾ãã: "Hallo & <Frau> & Krämer" <note> <para> @@ -1488,7 +1488,7 @@ <para> metaphone ã¯ãLawrence Philips <lphilips@verity.com> ã«ãã éçºããã¾ããã["Practical - Algorithms for Programmers", Binstock & Rex, Addison Wesley, + Algorithms for Programmers", Binstock & Rex, Addison Wesley, 1995] ã§è§£èª¬ããã¦ãã¾ãã <note> <para> @@ -2818,7 +2818,7 @@ // 4.0b3ããåã®ãã¼ã¸ã§ã³ã®å ´å: $pos = strpos ($mystring, "b"); -if (is_string ($pos) && !$pos) { +if (is_string ($pos) && !$pos) { // è¦ã¤ããã¾ããã§ãã... } </programlisting> Index: phpdoc/ja/functions/swf.xml diff -u phpdoc/ja/functions/swf.xml:1.9 phpdoc/ja/functions/swf.xml:1.10 --- phpdoc/ja/functions/swf.xml:1.9 Sun Aug 12 20:33:49 2001 +++ phpdoc/ja/functions/swf.xml Sun Oct 14 09:53:20 2001 @@ -42,7 +42,7 @@ swf_placeobject (11, 60); swf_popmatrix (); -for ($i = 0; $i < 30; $i++) { +for ($i = 0; $i < 30; $i++) { $p = $i/(30-1); swf_pushmatrix (); swf_scale (1-($p*.9), 1, 1); @@ -57,7 +57,7 @@ swf_showframe (); } -for ($i = 0; $i < 30; $i++) { +for ($i = 0; $i < 30; $i++) { swf_removeobject (50); if (($i%4) == 0) { swf_showframe (); @@ -73,7 +73,7 @@ </programlisting> </example> ãã®ã³ã¼ãã¯ã¢ãã¡ã¼ã·ã§ã³ãçæãã<ulink - url="&url.swf.test">url</ulink>ã§è¦ããã¨ãã§ãã¾ãã + url="&url.swf.test;">url</ulink>ã§è¦ããã¨ãã§ãã¾ãã </para> <note> <para> @@ -2382,4 +2382,4 @@ sgml-local-catalogs:nil sgml-local-ecat-files:nil End: ---> \ No newline at end of file +--> Index: phpdoc/ja/functions/var.xml diff -u phpdoc/ja/functions/var.xml:1.29 phpdoc/ja/functions/var.xml:1.30 --- phpdoc/ja/functions/var.xml:1.29 Sat Jul 7 18:26:17 2001 +++ phpdoc/ja/functions/var.xml Sun Oct 14 09:53:20 2001 @@ -1021,7 +1021,7 @@ $conn = odbc_connect("webdb", "php", "chicken"); $stmt = odbc_prepare($conn, "SELECT data FROM sessions WHERE id = ?"); $sqldata = array($PHP_AUTH_USER); -if (!odbc_execute($stmt, &$sqldata) || !odbc_fetch_into($stmt, &$tmp)) { +if (!odbc_execute($stmt, &$sqldata) || !odbc_fetch_into($stmt, &$tmp)) { // å®è¡ã¾ãã¯åå¾ã失æããå ´åã空ã®é åã§åæåãã¾ã $session_data = array(); } else { @@ -1120,7 +1120,7 @@ <function>unset</function>ãã³ã¼ã«ãããåã¨åãå¤ãä¿æãã¾ãã <informalexample> <programlisting role="php"> -function foo(&$bar) { +function foo(&$bar) { unset($bar); $bar = "blah"; } Index: phpdoc/ja/functions/xml.xml diff -u phpdoc/ja/functions/xml.xml:1.12 phpdoc/ja/functions/xml.xml:1.13 --- phpdoc/ja/functions/xml.xml:1.12 Sat Jul 7 18:26:17 2001 +++ phpdoc/ja/functions/xml.xml Sun Oct 14 09:53:20 2001 @@ -627,7 +627,7 @@ function xml() { $this->parser = xml_parser_create(); - xml_set_object($this->parser,&$this); + xml_set_object($this->parser,&$this); xml_set_element_handler($this->parser,"tag_open","tag_close"); xml_set_character_data_handler($this->parser,"cdata"); }
Index: phpdoc/ja/features/error-handling.xml diff -u phpdoc/ja/features/error-handling.xml:1.7 phpdoc/ja/features/error-handling.xml:1.8 --- phpdoc/ja/features/error-handling.xml:1.7 Mon Feb 26 10:40:18 2001 +++ phpdoc/ja/features/error-handling.xml Sun Oct 14 09:53:19 2001 @@ -104,13 +104,13 @@ ãããã¹ã¯ãããããããã«<link linkend="language.operators.bitwise">ãããæ¼ç®å</link>ã使ç¨ãã ãã¨ãå¯è½ã§ãã<filename>php.ini</filename>ã§ä½¿ç¨ã§ããã®ã¯ '|', - '~', '!', '&' ã®ã¿ã§ãããã¨ã«æ³¨æãã¦ä¸ããããããããããæ¼ç®å + '~', '!', '&' ã®ã¿ã§ãããã¨ã«æ³¨æãã¦ä¸ããããããããããæ¼ç®å ã§ãªããã®ã¯ã<filename>php3.ini</filename>ã®ä¸ã§ä½¿ç¨å¯è½ã§ãã </para> <para> PHP 4ã§ã¯ã <link linkend="ini.error-reporting">error_reporting</link> - ã®ããã©ã«ãè¨å®å¤ã¯ <literal>E_ALL & ~E_NOTICE</literal>ã§ããã + ã®ããã©ã«ãè¨å®å¤ã¯ <literal>E_ALL & ~E_NOTICE</literal>ã§ããã å ¨ã¦ã®ã¨ã©ã¼ã表示ãã¾ããPHP 3 ã§ã¯ãããã©ã«ãã®è¨å®ã¯ã <literal>(E_ERROR | E_WARNING | E_PARSE)</literal>ã§ããã åããã¨ãæå³ãã¾ããããããPHP 3 ã®<filename>php3.ini</filename> Index: phpdoc/ja/functions/array.xml diff -u phpdoc/ja/functions/array.xml:1.32 phpdoc/ja/functions/array.xml:1.33 --- phpdoc/ja/functions/array.xml:1.32 Sun Aug 12 20:33:48 2001 +++ phpdoc/ja/functions/array.xml Sun Oct 14 09:53:19 2001 @@ -1384,7 +1384,7 @@ <programlisting role="php"> $fruits = array ("d"=>"lemon", "a"=>"orange", "b"=>"banana", "c"=>"apple"); -function test_alter (&$item1, $key, $prefix) { +function test_alter (&$item1, $key, $prefix) { $item1 = "$prefix: $item1"; } Index: phpdoc/ja/functions/cpdf.xml diff -u phpdoc/ja/functions/cpdf.xml:1.15 phpdoc/ja/functions/cpdf.xml:1.16 --- phpdoc/ja/functions/cpdf.xml:1.15 Sun Aug 12 20:33:48 2001 +++ phpdoc/ja/functions/cpdf.xml Sun Oct 14 09:53:19 2001 @@ -119,7 +119,7 @@ /* 1åãã¤é²ã */ cpdf_setlinewidth($pdf, 2.0); - for ($alpha = 0; $alpha < 360; $alpha += 6) + for ($alpha = 0; $alpha < 360; $alpha += 6) { cpdf_rotate($pdf, 6.0); cpdf_moveto($pdf, $radius, 0.0); @@ -132,7 +132,7 @@ /* 5 åãã¤é²ã */ cpdf_setlinewidth($pdf, 3.0); - for ($alpha = 0; $alpha < 360; $alpha += 30) + for ($alpha = 0; $alpha < 360; $alpha += 30) { cpdf_rotate($pdf, 30.0); cpdf_moveto($pdf, $radius, 0.0); Index: phpdoc/ja/functions/dir.xml diff -u phpdoc/ja/functions/dir.xml:1.8 phpdoc/ja/functions/dir.xml:1.9 --- phpdoc/ja/functions/dir.xml:1.8 Sat Jul 7 18:25:34 2001 +++ phpdoc/ja/functions/dir.xml Sun Oct 14 09:53:20 2001 @@ -220,7 +220,7 @@ <?php $handle=opendir('.'); while (false!==($file = readdir($handle))) { - if ($file != "." && $file != "..") { + if ($file != "." && $file != "..") { echo "$file\n"; } } Index: phpdoc/ja/functions/filesystem.xml diff -u phpdoc/ja/functions/filesystem.xml:1.33 phpdoc/ja/functions/filesystem.xml:1.34 --- phpdoc/ja/functions/filesystem.xml:1.33 Sun Aug 12 20:33:48 2001 +++ phpdoc/ja/functions/filesystem.xml Sun Oct 14 09:53:20 2001 @@ -494,7 +494,7 @@ $num = count ($data); print "<p> $num fields in line $row: <br>"; $row++; - for ($c=0; $c<$num; $c++) { + for ($c=0; $c<$num; $c++) { print $data[$c] . "<br>"; } } @@ -2709,7 +2709,7 @@ </funcprototype> </funcsynopsis> <para> - <function>umask</function>ã¯PHPã®umaskãmask & 0777ã«ã»ãããã + <function>umask</function>ã¯PHPã®umaskãmask & 0777ã«ã»ãããã å ã®umaskå¤ãè¿ãã¾ãã PHPããµã¼ãã»ã¢ã¸ã¥ã¼ã«ã¨ãã¦åä½ä¸ã®å ´åãåãªã¯ã¨ã¹ãã çµäºãããã³ã«umaskã¯å ã®å¤ã«æ»ããã¾ãã Index: phpdoc/ja/functions/ifx.xml diff -u phpdoc/ja/functions/ifx.xml:1.10 phpdoc/ja/functions/ifx.xml:1.11 --- phpdoc/ja/functions/ifx.xml:1.10 Sun Aug 12 20:33:48 2001 +++ phpdoc/ja/functions/ifx.xml Sun Oct 14 09:53:20 2001 @@ -579,7 +579,7 @@ </funcprototype> </funcsynopsis> <para> - Informix ã¨ã©ã¼ã³ã¼ã (SQLSTATE & SQLCODE) ã¯æ¬¡ã®ãããªãã©ã¼ãã + Informix ã¨ã©ã¼ã³ã¼ã (SQLSTATE & SQLCODE) ã¯æ¬¡ã®ãããªãã©ã¼ãã ãã¨ãªãã¾ã : </para> <para> @@ -928,7 +928,7 @@ if (! isset ($types)) { ... ã¨ã©ã¼å¦ç ... } -for ($i = 0; $i < count($types); $i++) { +for ($i = 0; $i < count($types); $i++) { $fname = key($types); printf("%s :\t type = %s\n", $fname, $types[$fname]); next($types); @@ -970,7 +970,7 @@ if (! isset($properties)) { ... error ... } -for ($i = 0; $i < count($properties); $i++) { +for ($i = 0; $i < count($properties); $i++) { $fname = key ($properties); printf ("%s:\t type = %s\n", $fname, $properties[$fname]); next ($properties); Index: phpdoc/ja/functions/image.xml diff -u phpdoc/ja/functions/image.xml:1.25 phpdoc/ja/functions/image.xml:1.26 --- phpdoc/ja/functions/image.xml:1.25 Sat Jul 7 18:25:44 2001 +++ phpdoc/ja/functions/image.xml Sun Oct 14 09:53:20 2001 @@ -96,7 +96,7 @@ <title>IPTC ãè¿ã GetImageSize</title> <programlisting> <?php - $size = GetImageSize ("testimg.jpg",&$info); + $size = GetImageSize ("testimg.jpg",&$info); if (isset ($info["APP13"])) { $iptc = iptcparse ($info["APP13"]); var_dump ($iptc); Index: phpdoc/ja/functions/ldap.xml diff -u phpdoc/ja/functions/ldap.xml:1.21 phpdoc/ja/functions/ldap.xml:1.22 --- phpdoc/ja/functions/ldap.xml:1.21 Sun Aug 12 20:33:48 2001 +++ phpdoc/ja/functions/ldap.xml Sun Oct 14 09:53:20 2001 @@ -93,7 +93,7 @@ $info = ldap_get_entries($ds, $sr); echo "Data for ".$info["count"]." items returned:<p>"; - for ($i=0; $i<$info["count"]; $i++) { + for ($i=0; $i<$info["count"]; $i++) { echo "dn is: ". $info[$i]["dn"] ."<br>"; echo "first cn entry is: ". $info[$i]["cn"][0] ."<br>"; echo "first email entry is: ". $info[$i]["mail"][0] ."<p>"; @@ -1180,7 +1180,7 @@ $info = ldap_get_entries($ds, $sr); -for ($i=0; $i<$info["count"]; $i++) +for ($i=0; $i<$info["count"]; $i++) echo $info[$i]["ou"][0] ; </programlisting> </example> Index: phpdoc/ja/functions/mysql.xml diff -u phpdoc/ja/functions/mysql.xml:1.19 phpdoc/ja/functions/mysql.xml:1.20 --- phpdoc/ja/functions/mysql.xml:1.19 Sat Jul 7 18:25:57 2001 +++ phpdoc/ja/functions/mysql.xml Sun Oct 14 09:53:20 2001 @@ -421,7 +421,7 @@ $i = 0; $cnt = mysql_num_rows($db_list); -while ($i < $cnt) { +while ($i < $cnt) { echo mysql_db_name($db_list, $i) . "\n"; $i++; } Index: phpdoc/ja/functions/oci8.xml diff -u phpdoc/ja/functions/oci8.xml:1.16 phpdoc/ja/functions/oci8.xml:1.17 --- phpdoc/ja/functions/oci8.xml:1.16 Sun Aug 12 20:33:48 2001 +++ phpdoc/ja/functions/oci8.xml Sun Oct 14 09:53:20 2001 @@ -113,7 +113,7 @@ field2 = empty_clob()) returning field2 into :field2"; OCIParse($conn, $sql); $clob = OCINewDescriptor($conn, OCI_D_LOB); -OCIBindByName ($stmt, ":field2", &$clob, -1, OCI_B_CLOB); +OCIBindByName ($stmt, ":field2", &$clob, -1, OCI_B_CLOB); OCIExecute($stmt, OCI_DEFAULT); $clob->save ("some text"); @@ -191,7 +191,7 @@ <funcdef>int <function>OCIDefineByName</function></funcdef> <paramdef>int <parameter>stmt</parameter></paramdef> <paramdef>string <parameter>Column-Name</parameter></paramdef> - <paramdef>mixed &<parameter>variable</parameter></paramdef> + <paramdef>mixed &<parameter>variable</parameter></paramdef> <paramdef>int <parameter> <replaceable><optional>type</optional></replaceable> @@ -227,8 +227,8 @@ /* the define MUST be done BEFORE ociexecute! */ -OCIDefineByName($stmt,"EMPNO",&$empno); -OCIDefineByName($stmt,"ENAME",&$ename); +OCIDefineByName($stmt,"EMPNO",&$empno); +OCIDefineByName($stmt,"ENAME",&$ename); OCIExecute($stmt); @@ -256,7 +256,7 @@ <funcdef>int <function>OCIBindByName</function></funcdef> <paramdef>int <parameter>stmt</parameter></paramdef> <paramdef>string <parameter>ph_name</parameter></paramdef> - <paramdef>mixed &<parameter>variable</parameter></paramdef> + <paramdef>mixed &<parameter>variable</parameter></paramdef> <paramdef>int<parameter>length</parameter></paramdef> <paramdef>int <parameter> @@ -305,13 +305,13 @@ $rowid = OCINewDescriptor($conn,OCI_D_ROWID); -OCIBindByName($stmt,":empno",&$empno,32); -OCIBindByName($stmt,":ename",&$ename,32); -OCIBindByName($stmt,":rid",&$rowid,-1,OCI_B_ROWID); +OCIBindByName($stmt,":empno",&$empno,32); +OCIBindByName($stmt,":ename",&$ename,32); +OCIBindByName($stmt,":rid",&$rowid,-1,OCI_B_ROWID); $update = OCIParse($conn,"update emp set sal = :sal where ROWID = :rid"); -OCIBindByName($update,":rid",&$rowid,-1,OCI_B_ROWID); -OCIBindByName($update,":sal",&$sal,32); +OCIBindByName($update,":rid",&$rowid,-1,OCI_B_ROWID); +OCIBindByName($update,":sal",&$sal,32); $sal = 10000; @@ -327,7 +327,7 @@ $stmt = OCIParse($conn,"select * from emp where empno in (1111,2222,3333)"); OCIExecute($stmt); -while (OCIFetchInto($stmt,&$arr,OCI_ASSOC)) { +while (OCIFetchInto($stmt,&$arr,OCI_ASSOC)) { var_dump($arr); } OCIFreeStatement($stmt); @@ -793,12 +793,12 @@ $conn = OCILogon($user, $password); $stmt = OCIParse($conn,"select rowid from $table $where"); $rowid = OCINewDescriptor($conn,OCI_D_ROWID); - OCIDefineByName($stmt,"ROWID",&$rowid); + OCIDefineByName($stmt,"ROWID",&$rowid); OCIExecute($stmt); while ( OCIFetch($stmt) ) { $nrows = OCIRowCount($stmt); $delete = OCIParse($conn,"delete from $table where ROWID = :rid"); - OCIBindByName($delete,":rid",&$rowid,-1,OCI_B_ROWID); + OCIBindByName($delete,":rid",&$rowid,-1,OCI_B_ROWID); OCIExecute($delete); print "$nrows\n"; if ( ($nrows % $commitsize) == 0 ) { @@ -831,7 +831,7 @@ $lob = OCINewDescriptor($conn, OCI_D_LOB); $stmt = OCIParse($conn,"insert into $table (id, the_blob) values(my_seq.NEXTVAL, EMPTY_BLOB()) returning the_blob into :the_blob"); - OCIBindByName($stmt, ':the_blob', &$lob, -1, OCI_B_BLOB); + OCIBindByName($stmt, ':the_blob', &$lob, -1, OCI_B_BLOB); OCIExecute($stmt); if($lob->savefile($lob_upload)){ OCICommit($conn); @@ -922,7 +922,7 @@ while (OCIFetch ($stmt)) { print "\n"; $ncols = OCINumCols ($stmt); - for ( $i = 1; $i <= $ncols; $i++ ) { + for ( $i = 1; $i <= $ncols; $i++ ) { $column_name = OCIColumnName ($stmt, $i); $column_value = OCIResult ($stmt, $i); print $column_name . ': ' . $column_value . "\n"; @@ -994,7 +994,7 @@ <funcprototype> <funcdef>int <function>OCIFetchInto</function></funcdef> <paramdef>int <parameter>stmt</parameter></paramdef> - <paramdef>array &<parameter>result</parameter></paramdef> + <paramdef>array &<parameter>result</parameter></paramdef> <paramdef>int <parameter> <replaceable><optional>mode</optional></replaceable> @@ -1040,7 +1040,7 @@ <funcprototype> <funcdef>int <function>OCIFetchStatement</function></funcdef> <paramdef>int <parameter>stmt</parameter></paramdef> - <paramdef>array &<parameter>variable</parameter></paramdef> + <paramdef>array &<parameter>variable</parameter></paramdef> </funcprototype> </funcsynopsis> <para> @@ -1153,7 +1153,7 @@ print "<TH>Length</TH>"; print "</TR>"; $ncols = OCINumCols ($stmt); -for ( $i = 1; $i <= $ncols; $i++ ) { +for ( $i = 1; $i <= $ncols; $i++ ) { $column_name = OCIColumnName ($stmt, $i); $column_type = OCIColumnType ($stmt, $i); $column_size = OCIColumnSize ($stmt, $i); @@ -1328,11 +1328,11 @@ $curs = OCINewCursor ($conn); $stmt = OCIParse ($conn, "begin info.output(:data); end;"); -ocibindbyname ($stmt,"data",&$curs,-1,OCI_B_CURSOR); +ocibindbyname ($stmt,"data",&$curs,-1,OCI_B_CURSOR); ociexecute ($stmt); ociexecute ($curs); -while (OCIFetchInto($curs,&$data)) { +while (OCIFetchInto($curs,&$data)) { var_dump($data); } @@ -1362,14 +1362,14 @@ print "<TH># EMPLOYEES</TH>"; print "</TR>"; -while (OCIFetchInto($stmt,&$data,OCI_ASSOC)) { +while (OCIFetchInto($stmt,&$data,OCI_ASSOC)) { print "<TR>"; $dname = $data["DNAME"]; $deptno = $data["DEPTNO"]; print "<TD>$dname</TD>"; print "<TD>$deptno</TD>"; ociexecute($data[ "EMPCNT" ]); - while (OCIFetchInto($data[ "EMPCNT" ],&$subdata,OCI_ASSOC)) { + while (OCIFetchInto($data[ "EMPCNT" ],&$subdata,OCI_ASSOC)) { $num_emps = $subdata["NUM_EMPS"]; print "<TD>$num_emps</TD>"; } @@ -1480,7 +1480,7 @@ print "<TH>Length</TH>"; print "</TR>"; $ncols = OCINumCols ($stmt); -for ($i = 1; $i <= $ncols; $i++) { +for ($i = 1; $i <= $ncols; $i++) { $column_name = OCIColumnName ($stmt, $i); $column_type = OCIColumnType ($stmt, $i); $column_size = OCIColumnSize ($stmt, $i); @@ -1539,7 +1539,7 @@ print "<TH>Length</TH>"; print "</TR>"; $ncols = OCINumCols($stmt); - for ( $i = 1; $i <= $ncols; $i++ ) { + for ( $i = 1; $i <= $ncols; $i++ ) { $column_name = OCIColumnName($stmt,$i); $column_type = OCIColumnType($stmt,$i); $column_size = OCIColumnSize($stmt,$i); Index: phpdoc/ja/functions/pcre.xml diff -u phpdoc/ja/functions/pcre.xml:1.26 phpdoc/ja/functions/pcre.xml:1.27 --- phpdoc/ja/functions/pcre.xml:1.26 Sun Oct 14 00:05:01 2001 +++ phpdoc/ja/functions/pcre.xml Sun Oct 14 09:53:20 2001 @@ -197,7 +197,7 @@ ãã®ä¾ã®åºåã¯ä»¥ä¸ã®ããã«ãªãã¾ãã <informalexample> <programlisting> -<b>example: </b>, <div align=left>this is a test</div> +<b>example: </b>, <div align=left>this is a test</div> example: , this is a test </programlisting> </informalexample> @@ -264,7 +264,7 @@ // \\2 ã¯å¾æ¹åç §ã®ä¾ã§ããããã¯ãpcre ã«æ£è¦è¡¨ç¾èªä½ã®æ¬å¼§ã®2çªç®ã® // çµãã¤ã¾ããã®å ´åã¯([\w]+)ãã«ããããã¾ããæååãäºéå¼ç¨ç¬¦ã§æ¬ // ããã¦ãããããããã¯ã¹ã©ãã·ã¥ã®è¿½å ãå¿ è¦ã§ãã -$html = "<b>bold text</b><a href=howdy.html>click me</a>"; +$html = "<b>bold text</b><a href=howdy.html>click me</a>"; preg_match_all ("/(<([\w]+)[^>]*>)(.*)(<\/\\2>)/", $html, $matches); @@ -393,7 +393,7 @@ <example> <title>/e 修飾åã®ä½¿ç¨æ³</title> <programlisting role="php"> -preg_replace ("/(<\/?)(\w+)([^>]*>)/e", +preg_replace ("/(<\/?)(\w+)([^>]*>)/e", "'\\1'.strtoupper('\\2').'\\3'", $html_body); </programlisting> @@ -615,7 +615,7 @@ </para> <para> æ£è¦è¡¨ç¾ã®ç¹æ®æåã¯ã次ã®ãããªãã®ã§ãã - <screen>. \\ + * ? [ ^ ] $ ( ) { } = ! < > | :</screen> + <screen>. \\ + * ? [ ^ ] $ ( ) { } = ! < > | :</screen> </para> <para> <example> @@ -1721,7 +1721,7 @@ ã¯ã"bar" ãåã«ãããéã« "foo" ãåã«ãªã "baz" ã«ããããã¾ãã 䏿¹ã - (?<=\d{3}(?!999)...)foo + (?<=\d{3}(?!999)...)foo ã¯ã3æ¡ã®æ°ãå è¡ããä¸ã®3æåã"999"ã§ãªã"foo"ã«ãããããå¥ã® ãã¿ã¼ã³ã§ãã @@ -1807,7 +1807,7 @@ "a" ã®æ¤ç´¢ãæååå ¨ä½ã«å¯¾ãã¦å·¦ããå³ã«å度è¡ãããã å¹çã¯è¯ãããã¾ããããããããã¿ã¼ã³ã次ã®ããã«æ¸ããå ´åã - ^(?>.*)(?<=abcd) + ^(?>.*)(?<=abcd) ãã®å ´åã¯ã.* ã«é¢ããåæ¤ç´¢ã¯è¡ããããæååå ¨ä½ã«ã®ã¿ãã ããã¾ããç¶ã徿¹è¨æã¯ãæå¾ã®4æåã«å¯¾ãã試è¡ã1åã ãè¡ @@ -1820,10 +1820,10 @@ ä¸ã®ææ®µã§ãã ãã¿ã¼ã³ - (\D+|<\d+>)*[!?] + (\D+|<\d+>)*[!?] ã¯ãç¡å¶éã®æ°ã®å¯æååã«ããããã¾ãããã®å¯æååã¯éæ°å¤ãã - ãªãã<>ã§æ¬ãããæ°å¤ã®ã©ã¡ããã§ãå¾ã« ! ã¾ã㯠? ãç¶ããã®ã§ + ãªãã<>ã§æ¬ãããæ°å¤ã®ã©ã¡ããã§ãå¾ã« ! ã¾ã㯠? ãç¶ããã®ã§ ãããããããå ´åãå®è¡ã¯é«éã§ãããããã以ä¸ã®æååã«é©ç¨ã ãå ´åã @@ -1837,7 +1837,7 @@ ã¦ãããæååã«ããããªãå ´åã«æ©æã«å¤±æã¨å¤å®ãã¾ãã) ãã®ãã¿ã¼ã³ã次ã®ããã«å¤æ´ããå ´åã - ((?>\D+)|<\d+>)*[!?] + ((?>\D+)|<\d+>)*[!?] æ°å以å¤ã®ä¸¦ã³ã«ããä¸åãçãããã¨ããªããªãã失æã¯æ©æã«çã ã¾ãã Index: phpdoc/ja/functions/pgsql.xml diff -u phpdoc/ja/functions/pgsql.xml:1.25 phpdoc/ja/functions/pgsql.xml:1.26 --- phpdoc/ja/functions/pgsql.xml:1.25 Sun Aug 12 20:33:48 2001 +++ phpdoc/ja/functions/pgsql.xml Sun Oct 14 09:53:20 2001 @@ -422,10 +422,10 @@ } $arr = pg_fetch_array ($result, 0); -echo $arr[0] . " <- array\n"; +echo $arr[0] . " <- array\n"; $arr = pg_fetch_array ($result, 1); -echo $arr["author"] . " <- array\n"; +echo $arr["author"] . " <- array\n"; ?> </programlisting> </example> Index: phpdoc/ja/functions/strings.xml diff -u phpdoc/ja/functions/strings.xml:1.43 phpdoc/ja/functions/strings.xml:1.44 --- phpdoc/ja/functions/strings.xml:1.43 Sun Oct 14 06:21:15 2001 +++ phpdoc/ja/functions/strings.xml Sun Oct 14 09:53:20 2001 @@ -677,7 +677,7 @@ $original = strtr ($str, $trans); </programlisting> </informalexample> - <literal>$original</literal> ã®å å®¹ã¯æ¬¡ã®ããã«ãªãã¾ãã: "Hallo & + <literal>$original</literal> ã®å å®¹ã¯æ¬¡ã®ããã«ãªãã¾ãã: "Hallo & <Frau> & Krämer" <note> <para> @@ -1488,7 +1488,7 @@ <para> metaphone ã¯ãLawrence Philips <lphilips@verity.com> ã«ãã éçºããã¾ããã["Practical - Algorithms for Programmers", Binstock & Rex, Addison Wesley, + Algorithms for Programmers", Binstock & Rex, Addison Wesley, 1995] ã§è§£èª¬ããã¦ãã¾ãã <note> <para> @@ -2818,7 +2818,7 @@ // 4.0b3ããåã®ãã¼ã¸ã§ã³ã®å ´å: $pos = strpos ($mystring, "b"); -if (is_string ($pos) && !$pos) { +if (is_string ($pos) && !$pos) { // è¦ã¤ããã¾ããã§ãã... } </programlisting> Index: phpdoc/ja/functions/swf.xml diff -u phpdoc/ja/functions/swf.xml:1.9 phpdoc/ja/functions/swf.xml:1.10 --- phpdoc/ja/functions/swf.xml:1.9 Sun Aug 12 20:33:49 2001 +++ phpdoc/ja/functions/swf.xml Sun Oct 14 09:53:20 2001 @@ -42,7 +42,7 @@ swf_placeobject (11, 60); swf_popmatrix (); -for ($i = 0; $i < 30; $i++) { +for ($i = 0; $i < 30; $i++) { $p = $i/(30-1); swf_pushmatrix (); swf_scale (1-($p*.9), 1, 1); @@ -57,7 +57,7 @@ swf_showframe (); } -for ($i = 0; $i < 30; $i++) { +for ($i = 0; $i < 30; $i++) { swf_removeobject (50); if (($i%4) == 0) { swf_showframe (); @@ -73,7 +73,7 @@ </programlisting> </example> ãã®ã³ã¼ãã¯ã¢ãã¡ã¼ã·ã§ã³ãçæãã<ulink - url="&url.swf.test">url</ulink>ã§è¦ããã¨ãã§ãã¾ãã + url="&url.swf.test;">url</ulink>ã§è¦ããã¨ãã§ãã¾ãã </para> <note> <para> @@ -2382,4 +2382,4 @@ sgml-local-catalogs:nil sgml-local-ecat-files:nil End: ---> \ No newline at end of file +--> Index: phpdoc/ja/functions/var.xml diff -u phpdoc/ja/functions/var.xml:1.29 phpdoc/ja/functions/var.xml:1.30 --- phpdoc/ja/functions/var.xml:1.29 Sat Jul 7 18:26:17 2001 +++ phpdoc/ja/functions/var.xml Sun Oct 14 09:53:20 2001 @@ -1021,7 +1021,7 @@ $conn = odbc_connect("webdb", "php", "chicken"); $stmt = odbc_prepare($conn, "SELECT data FROM sessions WHERE id = ?"); $sqldata = array($PHP_AUTH_USER); -if (!odbc_execute($stmt, &$sqldata) || !odbc_fetch_into($stmt, &$tmp)) { +if (!odbc_execute($stmt, &$sqldata) || !odbc_fetch_into($stmt, &$tmp)) { // å®è¡ã¾ãã¯åå¾ã失æããå ´åã空ã®é åã§åæåãã¾ã $session_data = array(); } else { @@ -1120,7 +1120,7 @@ <function>unset</function>ãã³ã¼ã«ãããåã¨åãå¤ãä¿æãã¾ãã <informalexample> <programlisting role="php"> -function foo(&$bar) { +function foo(&$bar) { unset($bar); $bar = "blah"; } Index: phpdoc/ja/functions/xml.xml diff -u phpdoc/ja/functions/xml.xml:1.12 phpdoc/ja/functions/xml.xml:1.13 --- phpdoc/ja/functions/xml.xml:1.12 Sat Jul 7 18:26:17 2001 +++ phpdoc/ja/functions/xml.xml Sun Oct 14 09:53:20 2001 @@ -627,7 +627,7 @@ function xml() { $this->parser = xml_parser_create(); - xml_set_object($this->parser,&$this); + xml_set_object($this->parser,&$this); xml_set_element_handler($this->parser,"tag_open","tag_close"); xml_set_character_data_handler($this->parser,"cdata"); }