dams            Tue Feb  4 08:05:07 2003 EDT

  Modified files:              
    /phpdoc/en/features commandline.xml cookies.xml http-auth.xml 
                        persistent-connections.xml remote-files.xml 
  Log:
  php.ini, safemode entities, plus some cdata
  
Index: phpdoc/en/features/commandline.xml
diff -u phpdoc/en/features/commandline.xml:1.19 phpdoc/en/features/commandline.xml:1.20
--- phpdoc/en/features/commandline.xml:1.19     Sat Feb  1 08:32:56 2003
+++ phpdoc/en/features/commandline.xml  Tue Feb  4 08:05:06 2003
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.19 $ -->
+<!-- $Revision: 1.20 $ -->
 <chapter id="features.commandline">
  <title>Using PHP from the command line</title>
  <!-- NEW DOCUMENTATION STARTS -->
@@ -151,8 +151,8 @@
           arguments) in the <literal>CLI SAPI</literal>.
          </para>
          <para>
-          As of PHP 4.3.0, the <literal>PHP</literal> variables 
<literal>$argc</literal>
-          and <literal>$argv</literal> are registered and filled in with the 
appropriate 
+          As of PHP 4.3.0, the <literal>PHP</literal> variables 
+<varname>$argc</varname>
+          and <varname>$argv</varname> are registered and filled in with the 
+appropriate 
           values when using the <literal>CLI SAPI</literal>. Prior to this version,
           the creation of these variables behaved as they do in
           <literal>CGI</literal> and <literal>MODULE</literal> versions
@@ -201,7 +201,9 @@
          An already opened stream to <literal>stdin</literal>. This saves
          opening it with
          <programlisting role="php">
+<![CDATA[
 $stdin = fopen('php://stdin', 'r');
+]]>
          </programlisting>
          </entry>
         </row>
@@ -211,7 +213,9 @@
          An already opened stream to <literal>stdout</literal>. This saves
          opening it with
          <programlisting role="php">
+<![CDATA[
 $stdout = fopen('php://stdout', 'w');
+]]>
          </programlisting>
          </entry>
         </row>
@@ -221,7 +225,9 @@
          An already opened stream to <literal>stderr</literal>. This saves
          opening it with
          <programlisting role="php">
+<![CDATA[
 $stderr = fopen('php://stderr', 'w');
+]]>
          </programlisting>
          </entry>
         </row>
@@ -234,7 +240,9 @@
      <literal>stderr</literal> yourself but simply use the constant instead of
      the stream resource:
      <programlisting role="php">
+<![CDATA[
 php -r 'fwrite(STDERR, "stderr\n");'
+]]>
      </programlisting>
      You do not need to explicitly close these streams, as they are closed
      automatically by <literal>PHP</literal> when your script ends.
Index: phpdoc/en/features/cookies.xml
diff -u phpdoc/en/features/cookies.xml:1.13 phpdoc/en/features/cookies.xml:1.14
--- phpdoc/en/features/cookies.xml:1.13 Sat Dec 22 11:01:52 2001
+++ phpdoc/en/features/cookies.xml      Tue Feb  4 08:05:06 2003
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.13 $ -->
+<!-- $Revision: 1.14 $ -->
  <chapter id="features.cookies">
   <title>Cookies</title>
 
@@ -25,9 +25,9 @@
   </para>
 
   <para>
-   In PHP 4.1.0 and later, the <literal>$_COOKIE</literal> auto-global
+   In PHP 4.1.0 and later, the <varname>$_COOKIE</varname> auto-global
    array will always be set with any cookies sent from the client.
-   <literal>$HTTP_COOKIE_VARS</literal> is also set in earlier versions of PHP
+   <varname>$HTTP_COOKIE_VARS</varname> is also set in earlier versions of PHP
    when the <literal>track_vars</literal> configuration variable is set.
   </para>
 
Index: phpdoc/en/features/http-auth.xml
diff -u phpdoc/en/features/http-auth.xml:1.31 phpdoc/en/features/http-auth.xml:1.32
--- phpdoc/en/features/http-auth.xml:1.31       Sun Jan 19 04:46:52 2003
+++ phpdoc/en/features/http-auth.xml    Tue Feb  4 08:05:06 2003
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.31 $ -->
+<!-- $Revision: 1.32 $ -->
  <chapter id="features.http-auth">
   <title>HTTP authentication with PHP</title>
 
@@ -88,8 +88,8 @@
    reveals the password for a page that was authenticated through a
    traditional external mechanism, the PHP_AUTH variables will not be 
    set if external authentication is enabled for that particular
-   page and <link linkend="features.safe-mode">safe mode</link> is
-   enabled.  Regardless, <varname>REMOTE_USER</varname> can be used 
+   page and &safemode; is enabled.  Regardless, 
+   <varname>REMOTE_USER</varname> can be used 
    to identify the externally-authenticated user.  So, you can use  
    <varname>$_SERVER['REMOTE_USER']</varname>.
   </simpara>
Index: phpdoc/en/features/persistent-connections.xml
diff -u phpdoc/en/features/persistent-connections.xml:1.20 
phpdoc/en/features/persistent-connections.xml:1.21
--- phpdoc/en/features/persistent-connections.xml:1.20  Mon Nov 11 21:56:19 2002
+++ phpdoc/en/features/persistent-connections.xml       Tue Feb  4 08:05:06 2003
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.20 $ -->
+<!-- $Revision: 1.21 $ -->
  <chapter id="features.persistent-connections">
   <title>Persistent Database Connections</title>
 
@@ -136,8 +136,8 @@
    <function>ibase_pconnect</function>, <function>ifx_pconnect</function>,
    <function>imap_popen</function>, <function>ingres_pconnect</function>,
    <function>msql_pconnect</function>, <function>mssql_pconnect</function>,
-   <function>mysql_pconnect</function>, <function>OCIPLogon</function>,
-   <function>odbc_pconnect</function>, <function>Ora_pLogon</function>,
+   <function>mysql_pconnect</function>, <function>ociplogon</function>,
+   <function>odbc_pconnect</function>, <function>ora_plogon</function>,
    <function>pfsockopen</function>, <function>pg_pconnect</function>, and
    <function>sybase_pconnect</function>.
   </para>
Index: phpdoc/en/features/remote-files.xml
diff -u phpdoc/en/features/remote-files.xml:1.21 
phpdoc/en/features/remote-files.xml:1.22
--- phpdoc/en/features/remote-files.xml:1.21    Thu Sep 26 07:40:49 2002
+++ phpdoc/en/features/remote-files.xml Tue Feb  4 08:05:06 2003
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.21 $ -->
+<!-- $Revision: 1.22 $ -->
  <chapter id="features.remote-files">
   <title>Using remote files</title>
 
@@ -11,7 +11,7 @@
    <function>include_once</function>, <function>require</function> and
    <function>require_once</function> statements.
    See <xref linkend="wrappers"/> for more information about the protocols
-   supported by <literal>PHP</literal>.
+   supported by &php;.
   </para>
   <note>
    <para>



-- 
PHP Documentation Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to