? en/allow_url_include.patch
? en/functions.xml
? en/reference/monetra/functions.xml
? en/reference/mysqli/mysqli/functions.xml
? en/reference/statistics/functions.xml
Index: en/faq/databases.xml
===================================================================
RCS file: /repository/phpdoc/en/faq/databases.xml,v
retrieving revision 1.30
diff -u -r1.30 databases.xml
--- en/faq/databases.xml	14 Feb 2006 04:11:07 -0000	1.30
+++ en/faq/databases.xml	18 Jan 2007 21:53:43 -0000
@@ -294,8 +294,12 @@
 <![CDATA[
 <?php
 
-$result = mysql_query("SELECT * FROM tables_priv")
-    or die("Bad query: " . mysql_error());
+if (($result = mysql_query("SELECT * FROM tables_priv")) === false) {
+
+    die("Bad query: " . mysql_error());
+
+}
+
 ?>
 ]]>
       </programlisting>
Index: en/reference/bzip2/functions/bzopen.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/bzip2/functions/bzopen.xml,v
retrieving revision 1.9
diff -u -r1.9 bzopen.xml
--- en/reference/bzip2/functions/bzopen.xml	6 Feb 2005 02:20:23 -0000	1.9
+++ en/reference/bzip2/functions/bzopen.xml	18 Jan 2007 21:53:45 -0000
@@ -58,7 +58,9 @@
 <?php
 
 $file = "/tmp/foo.bz2";
-$bz = bzopen($file, "r") or die("Couldn't open $file for reading");
+if (($bz = bzopen($file, "r")) === false) {
+    die("Couldn't open $file for reading");
+}
 
 bzclose($bz);
 
Index: en/reference/bzip2/functions/bzread.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/bzip2/functions/bzread.xml,v
retrieving revision 1.10
diff -u -r1.10 bzread.xml
--- en/reference/bzip2/functions/bzread.xml	6 Feb 2005 02:20:23 -0000	1.10
+++ en/reference/bzip2/functions/bzread.xml	18 Jan 2007 21:53:45 -0000
@@ -61,7 +61,9 @@
 <?php
 
 $file = "/tmp/foo.bz2";
-$bz = bzopen($file, "r") or die("Couldn't open $file");
+if (($bz = bzopen($file, "r")) === false) {
+    die("Couldn't open $file");
+}
 
 $decompressed_file = '';
 while (!feof($bz)) {
Index: en/reference/com/functions/class.com.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/com/functions/class.com.xml,v
retrieving revision 1.10
diff -u -r1.10 class.com.xml
--- en/reference/com/functions/class.com.xml	4 Feb 2005 08:24:52 -0000	1.10
+++ en/reference/com/functions/class.com.xml	18 Jan 2007 21:53:45 -0000
@@ -260,7 +260,10 @@
 <![CDATA[
 <?php
 // starting word
-$word = new COM("word.application") or die("Unable to instantiate Word");
+if (($word = new COM("word.application")) === false) {
+    die("Unable to instantiate Word");
+}
+
 echo "Loaded Word, version {$word->Version}\n";
 
 //bring it to front
@@ -290,7 +293,12 @@
 <![CDATA[
 <?php
 
-$conn = new COM("ADODB.Connection") or die("Cannot start ADO");
+if (($conn = new COM("ADODB.Connection")) === false) {
+
+    die("Cannot start ADO");
+
+}
+
 $conn->Open("Provider=SQLOLEDB; Data Source=localhost;
 Initial Catalog=database; User ID=user; Password=password");
 
Index: en/reference/crack/reference.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/crack/reference.xml,v
retrieving revision 1.12
diff -u -r1.12 reference.xml
--- en/reference/crack/reference.xml	7 Jan 2007 02:39:58 -0000	1.12
+++ en/reference/crack/reference.xml	18 Jan 2007 21:53:45 -0000
@@ -60,8 +60,9 @@
 <![CDATA[
 <?php
 // Open CrackLib Dictionary
-$dictionary = crack_opendict('/usr/local/lib/pw_dict')
-     or die('Unable to open CrackLib dictionary');
+if (($dictionary = crack_opendict('/usr/local/lib/pw_dict')) === false) {
+    die('Unable to open CrackLib dictionary');
+}
 
 // Perform password check
 $check = crack_check($dictionary, 'gx9A2s0x');
Index: en/reference/dbase/functions/dbase-get-header-info.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/dbase/functions/dbase-get-header-info.xml,v
retrieving revision 1.8
diff -u -r1.8 dbase-get-header-info.xml
--- en/reference/dbase/functions/dbase-get-header-info.xml	12 Feb 2005 17:25:23 -0000	1.8
+++ en/reference/dbase/functions/dbase-get-header-info.xml	18 Jan 2007 21:53:46 -0000
@@ -109,8 +109,9 @@
 $db_path = "/tmp/test.dbf";
 
 // Open dbase file
-$dbh = dbase_open($db_path, 0)
-  or die("Error! Could not open dbase database file '$db_path'.");
+if (($dbh = dbase_open($db_path, 0)) === false) {
+    die("Error! Could not open dbase database file '$db_path'.");
+}
 
 // Get column information
 $column_info = dbase_get_header_info($dbh);
Index: en/reference/dbx/functions/dbx-close.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/dbx/functions/dbx-close.xml,v
retrieving revision 1.9
diff -u -r1.9 dbx-close.xml
--- en/reference/dbx/functions/dbx-close.xml	13 Jan 2007 20:17:40 -0000	1.9
+++ en/reference/dbx/functions/dbx-close.xml	18 Jan 2007 21:53:46 -0000
@@ -41,8 +41,9 @@
     <programlisting role="php">
 <![CDATA[
 <?php
-$link = dbx_connect(DBX_MYSQL, "localhost", "db", "username", "password")
-    or die("Could not connect");
+if (($link = dbx_connect(DBX_MYSQL, "localhost", "db", "username", "password")) === false) {
+    die("Could not connect");
+}
 
 echo "Connected successfully";
 dbx_close($link);
Index: en/reference/dbx/functions/dbx-compare.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/dbx/functions/dbx-compare.xml,v
retrieving revision 1.6
diff -u -r1.6 dbx-compare.xml
--- en/reference/dbx/functions/dbx-compare.xml	8 Jan 2007 02:00:40 -0000	1.6
+++ en/reference/dbx/functions/dbx-compare.xml	18 Jan 2007 21:53:46 -0000
@@ -121,8 +121,11 @@
     return $rv;
 }
 
-$link   = dbx_connect(DBX_ODBC, "", "db", "username", "password")
-    or die("Could not connect");
+if (($link   = dbx_connect(DBX_ODBC, "", "db", "username", "password")) === false) {
+
+    die("Could not connect");
+
+}
 
 $result = dbx_query($link, "SELECT id, parentid, description FROM table ORDER BY id");
     // data in $result is now ordered by id
Index: en/reference/dbx/functions/dbx-connect.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/dbx/functions/dbx-connect.xml,v
retrieving revision 1.13
diff -u -r1.13 dbx-connect.xml
--- en/reference/dbx/functions/dbx-connect.xml	8 Jan 2007 02:00:40 -0000	1.13
+++ en/reference/dbx/functions/dbx-connect.xml	18 Jan 2007 21:53:46 -0000
@@ -194,8 +194,9 @@
     <programlisting role="php">
 <![CDATA[
 <?php
-$link = dbx_connect(DBX_ODBC, "", "db", "username", "password", DBX_PERSISTENT)
-    or die("Could not connect");
+if (($link = dbx_connect(DBX_ODBC, "", "db", "username", "password", DBX_PERSISTENT)) === false) {
+    die("Could not connect");
+}
 
 echo "Connected successfully";
 dbx_close($link);
Index: en/reference/dbx/functions/dbx-error.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/dbx/functions/dbx-error.xml,v
retrieving revision 1.6
diff -u -r1.6 dbx-error.xml
--- en/reference/dbx/functions/dbx-error.xml	8 Jan 2007 02:00:40 -0000	1.6
+++ en/reference/dbx/functions/dbx-error.xml	18 Jan 2007 21:53:46 -0000
@@ -50,8 +50,9 @@
     <programlisting role="php">
 <![CDATA[
 <?php
-$link   = dbx_connect(DBX_MYSQL, "localhost", "db", "username", "password")
-    or die("Could not connect");
+if (($link   = dbx_connect(DBX_MYSQL, "localhost", "db", "username", "password")) === false) {
+    die("Could not connect");
+}
 
 $result = dbx_query($link, "select id from non_existing_table");
 if ($result == 0) {
Index: en/reference/dbx/functions/dbx-escape-string.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/dbx/functions/dbx-escape-string.xml,v
retrieving revision 1.8
diff -u -r1.8 dbx-escape-string.xml
--- en/reference/dbx/functions/dbx-escape-string.xml	8 Jan 2007 02:00:40 -0000	1.8
+++ en/reference/dbx/functions/dbx-escape-string.xml	18 Jan 2007 21:53:46 -0000
@@ -56,8 +56,9 @@
     <programlisting role="php">
 <![CDATA[
 <?php
-$link   = dbx_connect(DBX_MYSQL, "localhost", "db", "username", "password")
-    or die("Could not connect");
+if (($link   = dbx_connect(DBX_MYSQL, "localhost", "db", "username", "password")) === false) {
+    die("Could not connect");
+}
 
 $text = dbx_escape_string($link, "It\'s quoted and backslashed (\\).");
 $result = dbx_query($link, "insert into tbl (txt) values ('" . $text . "')");
Index: en/reference/dbx/functions/dbx-query.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/dbx/functions/dbx-query.xml,v
retrieving revision 1.20
diff -u -r1.20 dbx-query.xml
--- en/reference/dbx/functions/dbx-query.xml	8 Jan 2007 02:00:40 -0000	1.20
+++ en/reference/dbx/functions/dbx-query.xml	18 Jan 2007 21:53:47 -0000
@@ -335,8 +335,9 @@
     <programlisting role="php">
 <![CDATA[
 <?php
-$link   = dbx_connect(DBX_ODBC, "", "db", "username", "password")
-    or die("Could not connect");
+if (($link   = dbx_connect(DBX_ODBC, "", "db", "username", "password")) === false) {
+    die("Could not connect");
+}
 
 $result = dbx_query($link, 'SELECT id, parentid, description FROM table');
 
Index: en/reference/dbx/functions/dbx-sort.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/dbx/functions/dbx-sort.xml,v
retrieving revision 1.7
diff -u -r1.7 dbx-sort.xml
--- en/reference/dbx/functions/dbx-sort.xml	8 Jan 2007 02:00:40 -0000	1.7
+++ en/reference/dbx/functions/dbx-sort.xml	18 Jan 2007 21:53:47 -0000
@@ -68,8 +68,11 @@
     return $rv;
 }
 
-$link   = dbx_connect(DBX_ODBC, "", "db", "username", "password")
-    or die("Could not connect");
+if (($link   = dbx_connect(DBX_ODBC, "", "db", "username", "password")) === false) {
+
+    die("Could not connect");
+
+}
 
 $result = dbx_query($link, "SELECT id, parentid, description FROM tbl ORDER BY id");
     // data in $result is now ordered by id
Index: en/reference/fbsql/functions/fbsql-close.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/fbsql/functions/fbsql-close.xml,v
retrieving revision 1.5
diff -u -r1.5 fbsql-close.xml
--- en/reference/fbsql/functions/fbsql-close.xml	1 Nov 2004 16:34:38 -0000	1.5
+++ en/reference/fbsql/functions/fbsql-close.xml	18 Jan 2007 21:53:47 -0000
@@ -33,8 +33,10 @@
      <programlisting role="php">
 <![CDATA[
 <?php
-    $link = fbsql_connect("localhost", "_SYSTEM", "secret")
-        or die("Could not connect");
+    if (($link = fbsql_connect("localhost", "_SYSTEM", "secret")) === false) {
+        die("Could not connect");
+    }
+
     echo "Connected successfully";
     fbsql_close($link);
 ?>
Index: en/reference/fbsql/functions/fbsql-connect.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/fbsql/functions/fbsql-connect.xml,v
retrieving revision 1.5
diff -u -r1.5 fbsql-connect.xml
--- en/reference/fbsql/functions/fbsql-connect.xml	1 Nov 2004 16:34:38 -0000	1.5
+++ en/reference/fbsql/functions/fbsql-connect.xml	18 Jan 2007 21:53:47 -0000
@@ -42,8 +42,12 @@
 <![CDATA[
 <?php
 
-    $link = fbsql_connect("localhost", "_SYSTEM", "secret")
-        or die("Could not connect");
+    if (($link = fbsql_connect("localhost", "_SYSTEM", "secret")) === false) {
+
+        die("Could not connect");
+
+    }
+
     echo "Connected successfully";
     fbsql_close($link);
 
Index: en/reference/fbsql/functions/fbsql-create-blob.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/fbsql/functions/fbsql-create-blob.xml,v
retrieving revision 1.4
diff -u -r1.4 fbsql-create-blob.xml
--- en/reference/fbsql/functions/fbsql-create-blob.xml	1 Nov 2004 16:34:38 -0000	1.4
+++ en/reference/fbsql/functions/fbsql-create-blob.xml	18 Jan 2007 21:53:47 -0000
@@ -28,8 +28,10 @@
      <programlisting role="php">
 <![CDATA[
 <?php
-    $link = fbsql_pconnect("localhost", "_SYSTEM", "secret")
-        or die("Could not connect");
+    if (($link = fbsql_pconnect("localhost", "_SYSTEM", "secret")) === false) {
+        die("Could not connect");
+    }
+
     $filename = "blobfile.bin";
     $fp = fopen($filename, "rb");
     $blobdata = fread($fp, filesize($filename));
Index: en/reference/fbsql/functions/fbsql-create-clob.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/fbsql/functions/fbsql-create-clob.xml,v
retrieving revision 1.4
diff -u -r1.4 fbsql-create-clob.xml
--- en/reference/fbsql/functions/fbsql-create-clob.xml	1 Nov 2004 16:34:38 -0000	1.4
+++ en/reference/fbsql/functions/fbsql-create-clob.xml	18 Jan 2007 21:53:47 -0000
@@ -28,8 +28,10 @@
      <programlisting role="php">
 <![CDATA[
 <?php
-    $link = fbsql_pconnect("localhost", "_SYSTEM", "secret")
-        or die("Could not connect");
+    if (($link = fbsql_pconnect("localhost", "_SYSTEM", "secret")) === false) {
+        die("Could not connect");
+    }
+
     $filename = "clob_file.txt";
     $fp = fopen($filename, "rb");
     $clobdata = fread($fp, filesize($filename));
Index: en/reference/fbsql/functions/fbsql-create-db.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/fbsql/functions/fbsql-create-db.xml,v
retrieving revision 1.8
diff -u -r1.8 fbsql-create-db.xml
--- en/reference/fbsql/functions/fbsql-create-db.xml	11 Nov 2004 14:54:24 -0000	1.8
+++ en/reference/fbsql/functions/fbsql-create-db.xml	18 Jan 2007 21:53:48 -0000
@@ -25,8 +25,10 @@
      <programlisting role="php">
 <![CDATA[
 <?php
-    $link = fbsql_pconnect("localhost", "_SYSTEM", "secret")
-        or die("Could not connect");
+    if (($link = fbsql_pconnect("localhost", "_SYSTEM", "secret")) === false) {
+        die("Could not connect");
+    }
+
     if (fbsql_create_db("my_db")) {
         echo "Database created successfully\n";
     } else {
Index: en/reference/fbsql/functions/fbsql-data-seek.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/fbsql/functions/fbsql-data-seek.xml,v
retrieving revision 1.5
diff -u -r1.5 fbsql-data-seek.xml
--- en/reference/fbsql/functions/fbsql-data-seek.xml	1 Nov 2004 16:34:39 -0000	1.5
+++ en/reference/fbsql/functions/fbsql-data-seek.xml	18 Jan 2007 21:53:48 -0000
@@ -31,15 +31,20 @@
      <programlisting role="php">
 <![CDATA[
 <?php
-    $link = fbsql_pconnect("localhost", "_SYSTEM", "secret")
-        or die("Could not connect");
+    if (($link = fbsql_pconnect("localhost", "_SYSTEM", "secret")) === false) {
+        die("Could not connect");
+    }
+
+    if ((fbsql_select_db("samp_db")) === false) {
 
-    fbsql_select_db("samp_db")
-        or die("Could not select database");
+        die("Could not select database");
+
+    }
 
     $query = "SELECT last_name, first_name FROM friends;";
-    $result = fbsql_query($query)
-        or die("Query failed");
+    if (($result = fbsql_query($query)) === false) {
+        die("Query failed");
+    }
 
     // fetch rows in reverse order
 
Index: en/reference/fbsql/functions/fbsql-database-password.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/fbsql/functions/fbsql-database-password.xml,v
retrieving revision 1.5
diff -u -r1.5 fbsql-database-password.xml
--- en/reference/fbsql/functions/fbsql-database-password.xml	1 Nov 2004 16:34:39 -0000	1.5
+++ en/reference/fbsql/functions/fbsql-database-password.xml	18 Jan 2007 21:53:48 -0000
@@ -40,8 +40,10 @@
      <programlisting role="php">
 <![CDATA[
 <?php
-    $link = fbsql_pconnect("localhost", "_SYSTEM", "secret")
-        or die("Could not connect");
+    if (($link = fbsql_pconnect("localhost", "_SYSTEM", "secret")) === false) {
+        die("Could not connect");
+    }
+
     fbsql_database_password($link, "secret db password");
     fbsql_select_db($database, $link);
 ?>
Index: en/reference/fbsql/functions/fbsql-fetch-field.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/fbsql/functions/fbsql-fetch-field.xml,v
retrieving revision 1.4
diff -u -r1.4 fbsql-fetch-field.xml
--- en/reference/fbsql/functions/fbsql-fetch-field.xml	1 Nov 2004 16:38:34 -0000	1.4
+++ en/reference/fbsql/functions/fbsql-fetch-field.xml	18 Jan 2007 21:53:48 -0000
@@ -61,10 +61,14 @@
      <programlisting role="php">
 <![CDATA[
 <?php 
-fbsql_connect($host, $user, $password)
-    or die("Could not connect");
-$result = fbsql_db_query("database", "select * from table")
-    or die("Query failed");
+if ((fbsql_connect($host, $user, $password)) === false) {
+    die("Could not connect");
+}
+
+if (($result = fbsql_db_query("database", "select * from table")) === false) {
+    die("Query failed");
+}
+
 # get column metadata
 $i = 0;
 while ($i < fbsql_num_fields($result)) {
Index: en/reference/fbsql/functions/fbsql-read-blob.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/fbsql/functions/fbsql-read-blob.xml,v
retrieving revision 1.6
diff -u -r1.6 fbsql-read-blob.xml
--- en/reference/fbsql/functions/fbsql-read-blob.xml	22 Apr 2005 15:39:27 -0000	1.6
+++ en/reference/fbsql/functions/fbsql-read-blob.xml	18 Jan 2007 21:53:48 -0000
@@ -33,8 +33,10 @@
      <programlisting role="php">
 <![CDATA[
 <?php
-    $link = fbsql_pconnect("localhost", "_SYSTEM", "secret")
-        or die("Could not connect");
+    if (($link = fbsql_pconnect("localhost", "_SYSTEM", "secret")) === false) {
+        die("Could not connect");
+    }
+
     $sql = "SELECT BLOB_COLUMN FROM BLOB_TABLE;";
     $rs = fbsql_query($sql, $link);
     $row_data = fbsql_fetch_row($rs);
Index: en/reference/fbsql/functions/fbsql-read-clob.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/fbsql/functions/fbsql-read-clob.xml,v
retrieving revision 1.6
diff -u -r1.6 fbsql-read-clob.xml
--- en/reference/fbsql/functions/fbsql-read-clob.xml	22 Apr 2005 15:39:27 -0000	1.6
+++ en/reference/fbsql/functions/fbsql-read-clob.xml	18 Jan 2007 21:53:48 -0000
@@ -33,8 +33,10 @@
      <programlisting role="php">
 <![CDATA[
 <?php
-    $link = fbsql_pconnect("localhost", "_SYSTEM", "secret")
-        or die("Could not connect");
+    if (($link = fbsql_pconnect("localhost", "_SYSTEM", "secret")) === false) {
+        die("Could not connect");
+    }
+
     $sql = "SELECT CLOB_COLUMN FROM CLOB_TABLE;";
     $rs = fbsql_query($sql, $link);
     $row_data = fbsql_fetch_row($rs);
Index: en/reference/ftp/functions/ftp-connect.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/ftp/functions/ftp-connect.xml,v
retrieving revision 1.8
diff -u -r1.8 ftp-connect.xml
--- en/reference/ftp/functions/ftp-connect.xml	16 Jan 2005 05:09:23 -0000	1.8
+++ en/reference/ftp/functions/ftp-connect.xml	18 Jan 2007 21:53:48 -0000
@@ -72,7 +72,9 @@
 $ftp_server = "ftp.example.com";
 
 // set up a connection or die
-$conn_id = ftp_connect($ftp_server) or die("Couldn't connect to $ftp_server"); 
+if (($conn_id = ftp_connect($ftp_server)) === false) {
+    die("Couldn't connect to $ftp_server");
+}
 
 ?>
 ]]>  
Index: en/reference/ftp/functions/ftp-login.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/ftp/functions/ftp-login.xml,v
retrieving revision 1.8
diff -u -r1.8 ftp-login.xml
--- en/reference/ftp/functions/ftp-login.xml	16 Jan 2005 05:09:23 -0000	1.8
+++ en/reference/ftp/functions/ftp-login.xml	18 Jan 2007 21:53:48 -0000
@@ -69,7 +69,9 @@
 $ftp_pass = "bar";
 
 // set up a connection or die
-$conn_id = ftp_connect($ftp_server) or die("Couldn't connect to $ftp_server"); 
+if (($conn_id = ftp_connect($ftp_server)) === false) {
+    die("Couldn't connect to $ftp_server");
+}
 
 // try to login
 if (@ftp_login($conn_id, $ftp_user, $ftp_pass)) {
Index: en/reference/ibase/functions/ibase-query.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/ibase/functions/ibase-query.xml,v
retrieving revision 1.6
diff -u -r1.6 ibase-query.xml
--- en/reference/ibase/functions/ibase-query.xml	24 Jan 2004 15:34:50 -0000	1.6
+++ en/reference/ibase/functions/ibase-query.xml	18 Jan 2007 21:53:49 -0000
@@ -32,7 +32,11 @@
     $dbh = ibase_connect($host, $username, $password);
     $stmt = 'SELECT * FROM tblname';
 
-    $sth = ibase_query($dbh, $stmt) or die(ibase_errmsg());
+    if (($sth = ibase_query($dbh, $stmt)) === false) {
+
+        die(ibase_errmsg());
+
+    }
 
 ?>
 ]]>
Index: en/reference/image/functions/imagecreate.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/image/functions/imagecreate.xml,v
retrieving revision 1.10
diff -u -r1.10 imagecreate.xml
--- en/reference/image/functions/imagecreate.xml	14 Jan 2007 03:15:21 -0000	1.10
+++ en/reference/image/functions/imagecreate.xml	18 Jan 2007 21:53:50 -0000
@@ -60,8 +60,10 @@
 <![CDATA[
 <?php
 header("Content-type: image/png");
-$im = @imagecreate(100, 50)
-    or die("Cannot Initialize new GD image stream");
+if (($im = @imagecreate(100, 50)) === false) {
+    die("Cannot Initialize new GD image stream");
+}
+
 $background_color = imagecolorallocate($im, 255, 255, 255);
 $text_color = imagecolorallocate($im, 233, 14, 91);
 imagestring($im, 1, 5, 5,  "A Simple Text String", $text_color);
Index: en/reference/image/functions/imagecreatetruecolor.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/image/functions/imagecreatetruecolor.xml,v
retrieving revision 1.12
diff -u -r1.12 imagecreatetruecolor.xml
--- en/reference/image/functions/imagecreatetruecolor.xml	14 Jan 2007 03:15:21 -0000	1.12
+++ en/reference/image/functions/imagecreatetruecolor.xml	18 Jan 2007 21:53:50 -0000
@@ -65,8 +65,10 @@
 <![CDATA[
 <?php
 header ("Content-type: image/png");
-$im = @imagecreatetruecolor(50, 100)
-      or die("Cannot Initialize new GD image stream");
+if (($im = @imagecreatetruecolor(50, 100)) === false) {
+    die("Cannot Initialize new GD image stream");
+}
+
 $text_color = imagecolorallocate($im, 233, 14, 91);
 imagestring($im, 1, 5, 5,  "A Simple Text String", $text_color);
 imagepng($im);
Index: en/reference/imap/functions/imap-createmailbox.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/imap/functions/imap-createmailbox.xml,v
retrieving revision 1.12
diff -u -r1.12 imap-createmailbox.xml
--- en/reference/imap/functions/imap-createmailbox.xml	15 Jan 2007 00:05:58 -0000	1.12
+++ en/reference/imap/functions/imap-createmailbox.xml	18 Jan 2007 21:53:50 -0000
@@ -48,8 +48,9 @@
     <programlisting role="php">
 <![CDATA[
 <?php
-$mbox = imap_open("{imap.example.org}", "username", "password", OP_HALFOPEN)
-     or die("can't connect: " . imap_last_error());
+if (($mbox = imap_open("{imap.example.org}", "username", "password", OP_HALFOPEN)) === false) {
+    die("can't connect: " . imap_last_error());
+}
 
 $name1 = "phpnewbox";
 $name2 = imap_utf7_encode("phpnewb&ouml;x");
Index: en/reference/imap/functions/imap-delete.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/imap/functions/imap-delete.xml,v
retrieving revision 1.11
diff -u -r1.11 imap-delete.xml
--- en/reference/imap/functions/imap-delete.xml	15 Jan 2007 00:05:58 -0000	1.11
+++ en/reference/imap/functions/imap-delete.xml	18 Jan 2007 21:53:50 -0000
@@ -62,8 +62,11 @@
 <![CDATA[
 <?php
 
-$mbox = imap_open("{imap.example.org}INBOX", "username", "password")
-    or die("Can't connect: " . imap_last_error());
+if (($mbox = imap_open("{imap.example.org}INBOX", "username", "password")) === false) {
+
+    die("Can't connect: " . imap_last_error());
+
+}
 
 $check = imap_mailboxmsginfo($mbox);
 echo "Messages before delete: " . $check->Nmsgs . "<br />\n";
Index: en/reference/imap/functions/imap-fetch-overview.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/imap/functions/imap-fetch-overview.xml,v
retrieving revision 1.13
diff -u -r1.13 imap-fetch-overview.xml
--- en/reference/imap/functions/imap-fetch-overview.xml	15 Jan 2007 00:54:40 -0000	1.13
+++ en/reference/imap/functions/imap-fetch-overview.xml	18 Jan 2007 21:53:50 -0000
@@ -145,8 +145,9 @@
     <programlisting role="php">
 <![CDATA[
 <?php
-$mbox = imap_open("{imap.example.org:143}INBOX", "username", "password")
-     or die("can't connect: " . imap_last_error());
+if (($mbox = imap_open("{imap.example.org:143}INBOX", "username", "password")) === false) {
+    die("can't connect: " . imap_last_error());
+}
 
 $MC = imap_check($mbox);
 
Index: en/reference/imap/functions/imap-get-quota.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/imap/functions/imap-get-quota.xml,v
retrieving revision 1.17
diff -u -r1.17 imap-get-quota.xml
--- en/reference/imap/functions/imap-get-quota.xml	15 Jan 2007 00:05:58 -0000	1.17
+++ en/reference/imap/functions/imap-get-quota.xml	18 Jan 2007 21:53:50 -0000
@@ -67,8 +67,9 @@
     <programlisting role="php">
 <![CDATA[
 <?php
-$mbox = imap_open("{imap.example.org}", "mailadmin", "password", OP_HALFOPEN)
-      or die("can't connect: " . imap_last_error());
+if (($mbox = imap_open("{imap.example.org}", "mailadmin", "password", OP_HALFOPEN)) === false) {
+    die("can't connect: " . imap_last_error());
+}
 
 $quota_value = imap_get_quota($mbox, "user.kalowsky");
 if (is_array($quota_value)) {
@@ -88,8 +89,9 @@
     <programlisting role="php">
 <![CDATA[
 <?php
-$mbox = imap_open("{imap.example.org}", "mailadmin", "password", OP_HALFOPEN)
-      or die("can't connect: " . imap_last_error());
+if (($mbox = imap_open("{imap.example.org}", "mailadmin", "password", OP_HALFOPEN)) === false) {
+    die("can't connect: " . imap_last_error());
+}
 
 $quota_values = imap_get_quota($mbox, "user.kalowsky");
 if (is_array($quota_values)) {
Index: en/reference/imap/functions/imap-get-quotaroot.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/imap/functions/imap-get-quotaroot.xml,v
retrieving revision 1.8
diff -u -r1.8 imap-get-quotaroot.xml
--- en/reference/imap/functions/imap-get-quotaroot.xml	15 Jan 2007 00:05:58 -0000	1.8
+++ en/reference/imap/functions/imap-get-quotaroot.xml	18 Jan 2007 21:53:50 -0000
@@ -56,8 +56,9 @@
     <programlisting role="php">
 <![CDATA[
 <?php
-$mbox = imap_open("{imap.example.org}", "kalowsky", "password", OP_HALFOPEN)
-      or die("can't connect: " . imap_last_error());
+if (($mbox = imap_open("{imap.example.org}", "kalowsky", "password", OP_HALFOPEN)) === false) {
+    die("can't connect: " . imap_last_error());
+}
 
 $quota = imap_get_quotaroot($mbox, "INBOX");
 if (is_array($quota)) {
Index: en/reference/imap/functions/imap-getmailboxes.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/imap/functions/imap-getmailboxes.xml,v
retrieving revision 1.10
diff -u -r1.10 imap-getmailboxes.xml
--- en/reference/imap/functions/imap-getmailboxes.xml	15 Jan 2007 00:05:58 -0000	1.10
+++ en/reference/imap/functions/imap-getmailboxes.xml	18 Jan 2007 21:53:51 -0000
@@ -99,8 +99,9 @@
     <programlisting role="php">
 <![CDATA[
 <?php
-$mbox = imap_open("{imap.example.org}", "username", "password", OP_HALFOPEN)
-      or die("can't connect: " . imap_last_error());
+if (($mbox = imap_open("{imap.example.org}", "username", "password", OP_HALFOPEN)) === false) {
+    die("can't connect: " . imap_last_error());
+}
 
 $list = imap_getmailboxes($mbox, "{imap.example.org}", "*");
 if (is_array($list)) {
Index: en/reference/imap/functions/imap-list.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/imap/functions/imap-list.xml,v
retrieving revision 1.9
diff -u -r1.9 imap-list.xml
--- en/reference/imap/functions/imap-list.xml	15 Jan 2007 00:54:40 -0000	1.9
+++ en/reference/imap/functions/imap-list.xml	18 Jan 2007 21:53:51 -0000
@@ -67,8 +67,9 @@
     <programlisting role="php">
 <![CDATA[
 <?php
-$mbox = imap_open("{imap.example.org}", "username", "password", OP_HALFOPEN)
-      or die("can't connect: " . imap_last_error());
+if (($mbox = imap_open("{imap.example.org}", "username", "password", OP_HALFOPEN)) === false) {
+    die("can't connect: " . imap_last_error());
+}
 
 $list = imap_list($mbox, "{imap.example.org}", "*");
 if (is_array($list)) {
Index: en/reference/imap/functions/imap-mailboxmsginfo.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/imap/functions/imap-mailboxmsginfo.xml,v
retrieving revision 1.7
diff -u -r1.7 imap-mailboxmsginfo.xml
--- en/reference/imap/functions/imap-mailboxmsginfo.xml	15 Jan 2007 00:05:58 -0000	1.7
+++ en/reference/imap/functions/imap-mailboxmsginfo.xml	18 Jan 2007 21:53:51 -0000
@@ -83,8 +83,11 @@
 <![CDATA[
 <?php
 
-$mbox = imap_open("{imap.example.org}INBOX", "username", "password")
-      or die("can't connect: " . imap_last_error());
+if (($mbox = imap_open("{imap.example.org}INBOX", "username", "password")) === false) {
+
+    die("can't connect: " . imap_last_error());
+
+}
 
 $check = imap_mailboxmsginfo($mbox);
 
Index: en/reference/imap/functions/imap-reopen.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/imap/functions/imap-reopen.xml,v
retrieving revision 1.11
diff -u -r1.11 imap-reopen.xml
--- en/reference/imap/functions/imap-reopen.xml	15 Jan 2007 00:05:58 -0000	1.11
+++ en/reference/imap/functions/imap-reopen.xml	18 Jan 2007 21:53:51 -0000
@@ -84,9 +84,15 @@
     <programlisting role="php">
 <![CDATA[
 <?php
-$mbox = imap_open("{imap.example.org:143}INBOX", "username", "password") or die(implode(", ", imap_errors()));
+if (($mbox = imap_open("{imap.example.org:143}INBOX", "username", "password")) === false) {
+    die(implode(", ", imap_errors()));
+}
+
 // ...
-imap_reopen($mbox, "{imap.example.org:143}INBOX.Sent") or die(implode(", ", imap_errors()));
+if ((imap_reopen($mbox, "{imap.example.org:143}INBOX.Sent")) === false) {
+    die(implode(", ", imap_errors()));
+}
+
 // ..
 ?>
 ]]>
Index: en/reference/imap/functions/imap-setflag-full.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/imap/functions/imap-setflag-full.xml,v
retrieving revision 1.13
diff -u -r1.13 imap-setflag-full.xml
--- en/reference/imap/functions/imap-setflag-full.xml	15 Jan 2007 00:05:59 -0000	1.13
+++ en/reference/imap/functions/imap-setflag-full.xml	18 Jan 2007 21:53:51 -0000
@@ -79,8 +79,9 @@
     <programlisting role="php">
 <![CDATA[
 <?php
-$mbox = imap_open("{imap.example.org:143}", "username", "password")
-     or die("can't connect: " . imap_last_error());
+if (($mbox = imap_open("{imap.example.org:143}", "username", "password")) === false) {
+    die("can't connect: " . imap_last_error());
+}
 
 $status = imap_setflag_full($mbox, "2,5", "\\Seen \\Flagged");
 
Index: en/reference/imap/functions/imap-status.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/imap/functions/imap-status.xml,v
retrieving revision 1.11
diff -u -r1.11 imap-status.xml
--- en/reference/imap/functions/imap-status.xml	15 Jan 2007 00:05:59 -0000	1.11
+++ en/reference/imap/functions/imap-status.xml	18 Jan 2007 21:53:51 -0000
@@ -101,8 +101,9 @@
     <programlisting role="php">
 <![CDATA[
 <?php
-$mbox = imap_open("{imap.example.com}", "username", "password", OP_HALFOPEN)
-      or die("can't connect: " . imap_last_error());
+if (($mbox = imap_open("{imap.example.com}", "username", "password", OP_HALFOPEN)) === false) {
+    die("can't connect: " . imap_last_error());
+}
 
 $status = imap_status($mbox, "{imap.example.org}INBOX", SA_ALL);
 if ($status) {
Index: en/reference/ingres-ii/reference.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/ingres-ii/reference.xml,v
retrieving revision 1.10
diff -u -r1.10 reference.xml
--- en/reference/ingres-ii/reference.xml	25 Oct 2006 17:34:56 -0000	1.10
+++ en/reference/ingres-ii/reference.xml	18 Jan 2007 21:53:51 -0000
@@ -57,8 +57,10 @@
 <![CDATA[
 <?php
 // Connecting, selecting database
-$link = ingres_connect('database', 'user', 'password')
-    or die('Could not connect: ' . ingres_error($link));
+if (($link = ingres_connect('database', 'user', 'password')) === false) {
+    die('Could not connect: ' . ingres_error($link));
+}
+
 echo 'Connected successfully';
 
 // Select from a table that exists in all Ingres databases
Index: en/reference/ingres-ii/functions/ingres-connect.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/ingres-ii/functions/ingres-connect.xml,v
retrieving revision 1.6
diff -u -r1.6 ingres-connect.xml
--- en/reference/ingres-ii/functions/ingres-connect.xml	25 Oct 2006 17:34:56 -0000	1.6
+++ en/reference/ingres-ii/functions/ingres-connect.xml	18 Jan 2007 21:53:51 -0000
@@ -191,8 +191,10 @@
       <programlisting role="php">
 <![CDATA[
 <?php
-    $link = ingres_connect("mydb", "user", "pass")
-        or die("Could not connect");
+    if (($link = ingres_connect("mydb", "user", "pass")) === false) {
+        die("Could not connect");
+    }
+
     echo "Connected successfully";
     ingres_close($link);
 ?>
@@ -206,8 +208,10 @@
       <programlisting role="php">
 <![CDATA[
 <?php
-    ingres_connect("mydb", "user", "pass")
-        or die("Could not connect");
+    if ((ingres_connect("mydb", "user", "pass")) === false) {
+        die("Could not connect");
+    }
+
     echo "Connected successfully";
     ingres_close();
 ?>
Index: en/reference/ldap/functions/ldap-bind.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/ldap/functions/ldap-bind.xml,v
retrieving revision 1.5
diff -u -r1.5 ldap-bind.xml
--- en/reference/ldap/functions/ldap-bind.xml	9 Dec 2002 20:25:54 -0000	1.5
+++ en/reference/ldap/functions/ldap-bind.xml	18 Jan 2007 21:53:52 -0000
@@ -34,8 +34,9 @@
 $ldappass = 'password';  // associated password
 
 // connect to ldap server
-$ldapconn = ldap_connect("ldap.example.com")
-    or die("Could not connect to LDAP server.");
+if (($ldapconn = ldap_connect("ldap.example.com")) === false) {
+    die("Could not connect to LDAP server.");
+}
 
 if ($ldapconn) {
 
@@ -64,8 +65,9 @@
 //using ldap bind anonymously
 
 // connect to ldap server
-$ldapconn = ldap_connect("ldap.example.com")
-    or die("Could not connect to LDAP server.");
+if (($ldapconn = ldap_connect("ldap.example.com")) === false) {
+    die("Could not connect to LDAP server.");
+}
 
 if ($ldapconn) {
 
Index: en/reference/ldap/functions/ldap-connect.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/ldap/functions/ldap-connect.xml,v
retrieving revision 1.5
diff -u -r1.5 ldap-connect.xml
--- en/reference/ldap/functions/ldap-connect.xml	5 Aug 2004 05:54:19 -0000	1.5
+++ en/reference/ldap/functions/ldap-connect.xml	18 Jan 2007 21:53:52 -0000
@@ -51,8 +51,9 @@
 $ldapport = 389;                 // your ldap server's port number
 
 // Connecting to LDAP
-$ldapconn = ldap_connect($ldaphost, $ldapport) 
-          or die("Could not connect to $ldaphost");
+if (($ldapconn = ldap_connect($ldaphost, $ldapport) ) === false) {
+    die("Could not connect to $ldaphost");
+}
 
 ?>
 ]]>
@@ -69,8 +70,9 @@
 $ldaphost = "ldaps://ldap.example.com/";
 
 // Connecting to LDAP
-$ldapconn = ldap_connect($ldaphost) 
-          or die("Could not connect to {$ldaphost}");
+if (($ldapconn = ldap_connect($ldaphost) ) === false) {
+    die("Could not connect to {$ldaphost}");
+}
 
 ?>
 ]]>
Index: en/reference/maxdb/reference.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/maxdb/reference.xml,v
retrieving revision 1.10
diff -u -r1.10 reference.xml
--- en/reference/maxdb/reference.xml	8 Sep 2005 17:05:12 -0000	1.10
+++ en/reference/maxdb/reference.xml	18 Jan 2007 21:53:52 -0000
@@ -395,7 +395,9 @@
 
 /* Performing SQL query */
 $query = "SELECT * FROM hotel.city";
-$result = maxdb_query($link, $query) or die("Query failed : " . maxdb_error());
+if (($result = maxdb_query($link, $query)) === false) {
+    die("Query failed : " . maxdb_error());
+}
 
 /* Printing results in HTML */
 echo "<table>\n";
Index: en/reference/msql/reference.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/msql/reference.xml,v
retrieving revision 1.13
diff -u -r1.13 reference.xml
--- en/reference/msql/reference.xml	4 Sep 2005 19:39:20 -0000	1.13
+++ en/reference/msql/reference.xml	18 Jan 2007 21:53:53 -0000
@@ -43,15 +43,21 @@
 <![CDATA[
 <?php
 /* Connecting, selecting database */
-$link = msql_connect('localhost', 'username', 'password')
-    or die('Could not connect : ' . msql_error($link));
+if (($link = msql_connect('localhost', 'username', 'password')) === false) {
+    die('Could not connect : ' . msql_error($link));
+}
+
+if ((msql_select_db('database', $link)) === false) {
 
-msql_select_db('database', $link)
-    or die('Could not select database');
+    die('Could not select database');
+
+}
 
 /* Issue SQL query */
 $query = 'SELECT * FROM my_table';
-$result = msql_query($query, $link) or die('Query failed : ' . msql_error($link));
+if (($result = msql_query($query, $link)) === false) {
+    die('Query failed : ' . msql_error($link));
+}
 
 /* Printing results in HTML */
 echo "<table>\n";
Index: en/reference/msql/functions/msql-query.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/msql/functions/msql-query.xml,v
retrieving revision 1.7
diff -u -r1.7 msql-query.xml
--- en/reference/msql/functions/msql-query.xml	4 Apr 2005 22:07:59 -0000	1.7
+++ en/reference/msql/functions/msql-query.xml	18 Jan 2007 21:53:54 -0000
@@ -49,10 +49,13 @@
     <programlisting role="php">
 <![CDATA[
 <?php 
-$link = msql_connect("dbserver")
-   or die("unable to connect to msql server: " . msql_error());
-msql_select_db("db", $link)
-   or die("unable to select database 'db': " . msql_error());
+if (($link = msql_connect("dbserver")) === false) {
+    die("unable to connect to msql server: " . msql_error());
+}
+
+if ((msql_select_db("db", $link)) === false) {
+    die("unable to select database 'db': " . msql_error());
+}
 
 $result = msql_query("SELECT * FROM table WHERE id=1", $link);
 if (!$result) {
Index: en/reference/mysql/reference.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/mysql/reference.xml,v
retrieving revision 1.22
diff -u -r1.22 reference.xml
--- en/reference/mysql/reference.xml	4 Sep 2005 19:39:20 -0000	1.22
+++ en/reference/mysql/reference.xml	18 Jan 2007 21:53:54 -0000
@@ -68,14 +68,20 @@
 <![CDATA[
 <?php
 // Connecting, selecting database
-$link = mysql_connect('mysql_host', 'mysql_user', 'mysql_password')
-    or die('Could not connect: ' . mysql_error());
+if (($link = mysql_connect('mysql_host', 'mysql_user', 'mysql_password')) === false) {
+    die('Could not connect: ' . mysql_error());
+}
+
 echo 'Connected successfully';
-mysql_select_db('my_database') or die('Could not select database');
+if ((mysql_select_db('my_database')) === false) {
+    die('Could not select database');
+}
 
 // Performing SQL query
 $query = 'SELECT * FROM my_table';
-$result = mysql_query($query) or die('Query failed: ' . mysql_error());
+if (($result = mysql_query($query)) === false) {
+    die('Query failed: ' . mysql_error());
+}
 
 // Printing results in HTML
 echo "<table>\n";
Index: en/reference/pcre/functions/preg-replace-callback.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/pcre/functions/preg-replace-callback.xml,v
retrieving revision 1.13
diff -u -r1.13 preg-replace-callback.xml
--- en/reference/pcre/functions/preg-replace-callback.xml	21 Jun 2006 17:08:39 -0000	1.13
+++ en/reference/pcre/functions/preg-replace-callback.xml	18 Jan 2007 21:53:55 -0000
@@ -70,7 +70,10 @@
 <?php
 /* a unix-style command line filter to convert uppercase
  * letters at the beginning of paragraphs to lowercase */
-$fp = fopen("php://stdin", "r") or die("can't read stdin");
+if (($fp = fopen("php://stdin", "r")) === false) {
+    die("can't read stdin");
+}
+
 while (!feof($fp)) {
     $line = fgets($fp);
     $line = preg_replace_callback(
Index: en/reference/pdo/functions/PDO-exec.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/pdo/functions/PDO-exec.xml,v
retrieving revision 1.10
diff -u -r1.10 PDO-exec.xml
--- en/reference/pdo/functions/PDO-exec.xml	7 Jan 2007 20:57:47 -0000	1.10
+++ en/reference/pdo/functions/PDO-exec.xml	18 Jan 2007 21:53:56 -0000
@@ -63,7 +63,10 @@
    <programlisting role="php">
 <![CDATA[
 <?php
-$db->exec() or die($db->errorInfo());
+if (($db->exec()) === false) {
+    die($db->errorInfo());
+}
+
 ?>
 ]]>
    </programlisting>
Index: en/reference/pgsql/reference.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/pgsql/reference.xml,v
retrieving revision 1.29
diff -u -r1.29 reference.xml
--- en/reference/pgsql/reference.xml	6 Oct 2005 04:09:23 -0000	1.29
+++ en/reference/pgsql/reference.xml	18 Jan 2007 21:53:56 -0000
@@ -98,12 +98,15 @@
 <![CDATA[
 <?php
 // Connecting, selecting database
-$dbconn = pg_connect("host=localhost dbname=publishing user=www password=foo")
-    or die('Could not connect: ' . pg_last_error());
+if (($dbconn = pg_connect("host=localhost dbname=publishing user=www password=foo")) === false) {
+    die('Could not connect: ' . pg_last_error());
+}
 
 // Performing SQL query
 $query = 'SELECT * FROM authors';
-$result = pg_query($query) or die('Query failed: ' . pg_last_error());
+if (($result = pg_query($query)) === false) {
+    die('Query failed: ' . pg_last_error());
+}
 
 // Printing results in HTML
 echo "<table>\n";
Index: en/reference/pgsql/functions/pg-cancel-query.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/pgsql/functions/pg-cancel-query.xml,v
retrieving revision 1.9
diff -u -r1.9 pg-cancel-query.xml
--- en/reference/pgsql/functions/pg-cancel-query.xml	28 Apr 2005 21:21:59 -0000	1.9
+++ en/reference/pgsql/functions/pg-cancel-query.xml	18 Jan 2007 21:53:56 -0000
@@ -54,7 +54,9 @@
     <programlisting role="php">
 <![CDATA[
 <?php
-  $dbconn = pg_connect("dbname=publisher") or die("Could not connect");
+  if (($dbconn = pg_connect("dbname=publisher")) === false) {
+      die("Could not connect");
+  }
 
   if (!pg_connection_busy($dbconn)) {
       pg_send_query($dbconn, "select * from authors; select count(*) from authors;");
Index: en/reference/pgsql/functions/pg-close.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/pgsql/functions/pg-close.xml,v
retrieving revision 1.13
diff -u -r1.13 pg-close.xml
--- en/reference/pgsql/functions/pg-close.xml	15 Apr 2005 08:40:12 -0000	1.13
+++ en/reference/pgsql/functions/pg-close.xml	18 Jan 2007 21:53:56 -0000
@@ -65,8 +65,10 @@
     <programlisting role="php">
 <![CDATA[
 <?php
-$dbconn = pg_connect("host=localhost port=5432 dbname=mary")
-   or die("Could not connect");
+if (($dbconn = pg_connect("host=localhost port=5432 dbname=mary")) === false) {
+    die("Could not connect");
+}
+
 echo "Connected successfully";
 pg_close($dbconn);
 ?>
Index: en/reference/pgsql/functions/pg-connection-busy.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/pgsql/functions/pg-connection-busy.xml,v
retrieving revision 1.9
diff -u -r1.9 pg-connection-busy.xml
--- en/reference/pgsql/functions/pg-connection-busy.xml	25 Apr 2005 08:59:03 -0000	1.9
+++ en/reference/pgsql/functions/pg-connection-busy.xml	18 Jan 2007 21:53:56 -0000
@@ -53,7 +53,10 @@
     <programlisting role="php">
 <![CDATA[
 <?php
-  $dbconn = pg_connect("dbname=publisher") or die("Could not connect");
+  if (($dbconn = pg_connect("dbname=publisher")) === false) {
+      die("Could not connect");
+  }
+
   $bs = pg_connection_busy($dbconn);
   if ($bs) {
       echo 'connection is busy';
Index: en/reference/pgsql/functions/pg-connection-reset.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/pgsql/functions/pg-connection-reset.xml,v
retrieving revision 1.8
diff -u -r1.8 pg-connection-reset.xml
--- en/reference/pgsql/functions/pg-connection-reset.xml	25 Apr 2005 08:59:03 -0000	1.8
+++ en/reference/pgsql/functions/pg-connection-reset.xml	18 Jan 2007 21:53:56 -0000
@@ -52,7 +52,10 @@
     <programlisting role="php">
 <![CDATA[
 <?php
-  $dbconn = pg_connect("dbname=publisher") or die("Could not connect");
+  if (($dbconn = pg_connect("dbname=publisher")) === false) {
+      die("Could not connect");
+  }
+
   $dbconn2 = pg_connection_reset($dbconn);
   if ($dbconn2) {
       echo "reset successful\n";
Index: en/reference/pgsql/functions/pg-connection-status.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/pgsql/functions/pg-connection-status.xml,v
retrieving revision 1.11
diff -u -r1.11 pg-connection-status.xml
--- en/reference/pgsql/functions/pg-connection-status.xml	15 Jun 2005 04:37:55 -0000	1.11
+++ en/reference/pgsql/functions/pg-connection-status.xml	18 Jan 2007 21:53:56 -0000
@@ -53,7 +53,10 @@
     <programlisting role="php">
 <![CDATA[
 <?php
-  $dbconn = pg_connect("dbname=publisher") or die("Could not connect");
+  if (($dbconn = pg_connect("dbname=publisher")) === false) {
+      die("Could not connect");
+  }
+
   $stat = pg_connection_status($dbconn);
   if ($stat === PGSQL_CONNECTION_OK) {
       echo 'Connection status ok';
Index: en/reference/pgsql/functions/pg-copy-from.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/pgsql/functions/pg-copy-from.xml,v
retrieving revision 1.9
diff -u -r1.9 pg-copy-from.xml
--- en/reference/pgsql/functions/pg-copy-from.xml	25 Apr 2005 09:00:51 -0000	1.9
+++ en/reference/pgsql/functions/pg-copy-from.xml	18 Jan 2007 21:53:56 -0000
@@ -94,8 +94,10 @@
     <programlisting role="php">
 <![CDATA[
 <?php
-   $db = pg_connect("dbname=publisher") or die("Could not connect");
-   
+   if (($db = pg_connect("dbname=publisher")) === false) {
+       die("Could not connect");
+   }
+
    $rows = pg_copy_to($db, $table_name);
    
    pg_query($db, "DELETE FROM $table_name");
Index: en/reference/pgsql/functions/pg-copy-to.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/pgsql/functions/pg-copy-to.xml,v
retrieving revision 1.9
diff -u -r1.9 pg-copy-to.xml
--- en/reference/pgsql/functions/pg-copy-to.xml	25 Apr 2005 09:00:51 -0000	1.9
+++ en/reference/pgsql/functions/pg-copy-to.xml	18 Jan 2007 21:53:56 -0000
@@ -83,8 +83,10 @@
     <programlisting role="php">
 <![CDATA[
 <?php
-   $db = pg_connect("dbname=publisher") or die("Could not connect");
-   
+   if (($db = pg_connect("dbname=publisher")) === false) {
+       die("Could not connect");
+   }
+
    $rows = pg_copy_to($db, $table_name);
    
    pg_query($db, "DELETE FROM $table_name");
Index: en/reference/pgsql/functions/pg-field-name.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/pgsql/functions/pg-field-name.xml,v
retrieving revision 1.10
diff -u -r1.10 pg-field-name.xml
--- en/reference/pgsql/functions/pg-field-name.xml	21 Apr 2005 09:29:05 -0000	1.10
+++ en/reference/pgsql/functions/pg-field-name.xml	18 Jan 2007 21:53:57 -0000
@@ -68,7 +68,9 @@
     <programlisting role="php">
 <![CDATA[
 <?php
-  $dbconn = pg_connect("dbname=publisher") or die("Could not connect");
+  if (($dbconn = pg_connect("dbname=publisher")) === false) {
+      die("Could not connect");
+  }
 
   $res = pg_query($dbconn, "select * from authors where author = 'Orwell'");
   $i = pg_num_fields($res);
Index: en/reference/pgsql/functions/pg-field-num.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/pgsql/functions/pg-field-num.xml,v
retrieving revision 1.7
diff -u -r1.7 pg-field-num.xml
--- en/reference/pgsql/functions/pg-field-num.xml	21 Apr 2005 09:29:05 -0000	1.7
+++ en/reference/pgsql/functions/pg-field-num.xml	18 Jan 2007 21:53:57 -0000
@@ -68,7 +68,9 @@
     <programlisting role="php">
 <![CDATA[
 <?php
-  $dbconn = pg_connect("dbname=publisher") or die("Could not connect");
+  if (($dbconn = pg_connect("dbname=publisher")) === false) {
+      die("Could not connect");
+  }
 
   $res = pg_query($dbconn, "select author, year, title from authors where author = 'Orwell'");
   
Index: en/reference/pgsql/functions/pg-field-prtlen.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/pgsql/functions/pg-field-prtlen.xml,v
retrieving revision 1.11
diff -u -r1.11 pg-field-prtlen.xml
--- en/reference/pgsql/functions/pg-field-prtlen.xml	5 Sep 2005 04:07:19 -0000	1.11
+++ en/reference/pgsql/functions/pg-field-prtlen.xml	18 Jan 2007 21:53:57 -0000
@@ -84,7 +84,9 @@
     <programlisting role="php">
 <![CDATA[
 <?php
-  $dbconn = pg_connect("dbname=publisher") or die("Could not connect");
+  if (($dbconn = pg_connect("dbname=publisher")) === false) {
+      die("Could not connect");
+  }
 
   $res = pg_query($dbconn, "select * from authors where author = 'Orwell'");
   $i = pg_num_fields($res);
Index: en/reference/pgsql/functions/pg-field-size.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/pgsql/functions/pg-field-size.xml,v
retrieving revision 1.9
diff -u -r1.9 pg-field-size.xml
--- en/reference/pgsql/functions/pg-field-size.xml	21 Apr 2005 09:29:05 -0000	1.9
+++ en/reference/pgsql/functions/pg-field-size.xml	18 Jan 2007 21:53:57 -0000
@@ -70,7 +70,9 @@
     <programlisting role="php">
 <![CDATA[
 <?php
-  $dbconn = pg_connect("dbname=publisher") or die("Could not connect");
+  if (($dbconn = pg_connect("dbname=publisher")) === false) {
+      die("Could not connect");
+  }
 
   $res = pg_query($dbconn, "select * from authors where author = 'Orwell'");
   $i = pg_num_fields($res);
Index: en/reference/pgsql/functions/pg-field-table.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/pgsql/functions/pg-field-table.xml,v
retrieving revision 1.2
diff -u -r1.2 pg-field-table.xml
--- en/reference/pgsql/functions/pg-field-table.xml	12 May 2006 09:16:31 -0000	1.2
+++ en/reference/pgsql/functions/pg-field-table.xml	18 Jan 2007 21:53:57 -0000
@@ -71,7 +71,9 @@
     <programlisting role="php">
 <![CDATA[
 <?php
-$dbconn = pg_connect("dbname=publisher") or die("Could not connect");
+if (($dbconn = pg_connect("dbname=publisher")) === false) {
+    die("Could not connect");
+}
 
 $res = pg_query($dbconn, "SELECT bar FROM foo");
 
Index: en/reference/pgsql/functions/pg-field-type-oid.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/pgsql/functions/pg-field-type-oid.xml,v
retrieving revision 1.5
diff -u -r1.5 pg-field-type-oid.xml
--- en/reference/pgsql/functions/pg-field-type-oid.xml	21 Apr 2005 09:29:05 -0000	1.5
+++ en/reference/pgsql/functions/pg-field-type-oid.xml	18 Jan 2007 21:53:57 -0000
@@ -76,7 +76,9 @@
     <programlisting role="php">
 <![CDATA[
 <?php
-  $dbconn = pg_connect("dbname=publisher") or die("Could not connect");
+  if (($dbconn = pg_connect("dbname=publisher")) === false) {
+      die("Could not connect");
+  }
 
   // Assume 'title' is a varchar type
   $res = pg_query($dbconn, "select title from authors where author = 'Orwell'");
Index: en/reference/pgsql/functions/pg-field-type.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/pgsql/functions/pg-field-type.xml,v
retrieving revision 1.11
diff -u -r1.11 pg-field-type.xml
--- en/reference/pgsql/functions/pg-field-type.xml	21 Apr 2005 09:29:05 -0000	1.11
+++ en/reference/pgsql/functions/pg-field-type.xml	18 Jan 2007 21:53:57 -0000
@@ -77,7 +77,9 @@
     <programlisting role="php">
 <![CDATA[
 <?php
-  $dbconn = pg_connect("dbname=publisher") or die("Could not connect");
+  if (($dbconn = pg_connect("dbname=publisher")) === false) {
+      die("Could not connect");
+  }
 
   // Assume 'title' is a varchar type
   $res = pg_query($dbconn, "select title from authors where author = 'Orwell'");
Index: en/reference/pgsql/functions/pg-get-result.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/pgsql/functions/pg-get-result.xml,v
retrieving revision 1.6
diff -u -r1.6 pg-get-result.xml
--- en/reference/pgsql/functions/pg-get-result.xml	4 Jul 2005 04:50:58 -0000	1.6
+++ en/reference/pgsql/functions/pg-get-result.xml	18 Jan 2007 21:53:57 -0000
@@ -60,7 +60,9 @@
     <programlisting role="php">
 <![CDATA[
 <?php
-  $dbconn = pg_connect("dbname=publisher") or die("Could not connect");
+  if (($dbconn = pg_connect("dbname=publisher")) === false) {
+      die("Could not connect");
+  }
 
   if (!pg_connection_busy($dbconn)) {
       pg_send_query($dbconn, "select * from authors; select count(*) from authors;");
Index: en/reference/pgsql/functions/pg-last-error.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/pgsql/functions/pg-last-error.xml,v
retrieving revision 1.9
diff -u -r1.9 pg-last-error.xml
--- en/reference/pgsql/functions/pg-last-error.xml	1 Dec 2005 01:29:56 -0000	1.9
+++ en/reference/pgsql/functions/pg-last-error.xml	18 Jan 2007 21:53:57 -0000
@@ -69,7 +69,9 @@
     <programlisting role="php">
 <![CDATA[
 <?php
-  $dbconn = pg_connect("dbname=publisher") or die("Could not connect");
+  if (($dbconn = pg_connect("dbname=publisher")) === false) {
+      die("Could not connect");
+  }
 
   // Query that fails
   $res = pg_query($dbconn, "select * from doesnotexist");
Index: en/reference/pgsql/functions/pg-meta-data.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/pgsql/functions/pg-meta-data.xml,v
retrieving revision 1.8
diff -u -r1.8 pg-meta-data.xml
--- en/reference/pgsql/functions/pg-meta-data.xml	29 Apr 2005 00:00:46 -0000	1.8
+++ en/reference/pgsql/functions/pg-meta-data.xml	18 Jan 2007 21:53:57 -0000
@@ -62,7 +62,9 @@
     <programlisting role="php">
 <![CDATA[
 <?php
-  $dbconn = pg_connect("dbname=publisher") or die("Could not connect");
+  if (($dbconn = pg_connect("dbname=publisher")) === false) {
+      die("Could not connect");
+  }
 
   $meta = pg_meta_data($dbconn, 'authors');
   if (is_array($meta)) {
Index: en/reference/pgsql/functions/pg-parameter-status.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/pgsql/functions/pg-parameter-status.xml,v
retrieving revision 1.9
diff -u -r1.9 pg-parameter-status.xml
--- en/reference/pgsql/functions/pg-parameter-status.xml	4 Apr 2005 16:16:47 -0000	1.9
+++ en/reference/pgsql/functions/pg-parameter-status.xml	18 Jan 2007 21:53:57 -0000
@@ -98,7 +98,9 @@
     <programlisting role="php">
 <![CDATA[
 <?php
-  $dbconn = pg_connect("dbname=publisher") or die("Could not connect");
+  if (($dbconn = pg_connect("dbname=publisher")) === false) {
+      die("Could not connect");
+  }
 
   echo "Server encoding: ", pg_parameter_status($dbconn, "server_encoding");
 ?>
Index: en/reference/pgsql/functions/pg-result-error-field.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/pgsql/functions/pg-result-error-field.xml,v
retrieving revision 1.7
diff -u -r1.7 pg-result-error-field.xml
--- en/reference/pgsql/functions/pg-result-error-field.xml	24 Jun 2005 09:11:45 -0000	1.7
+++ en/reference/pgsql/functions/pg-result-error-field.xml	18 Jan 2007 21:53:58 -0000
@@ -79,7 +79,9 @@
     <programlisting role="php">
 <![CDATA[
 <?php
-  $dbconn = pg_connect("dbname=publisher") or die("Could not connect");
+  if (($dbconn = pg_connect("dbname=publisher")) === false) {
+      die("Could not connect");
+  }
 
   if (!pg_connection_busy($dbconn)) {
       pg_send_query($dbconn, "select * from doesnotexist;");
Index: en/reference/pgsql/functions/pg-result-error.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/pgsql/functions/pg-result-error.xml,v
retrieving revision 1.10
diff -u -r1.10 pg-result-error.xml
--- en/reference/pgsql/functions/pg-result-error.xml	4 Jul 2006 11:13:25 -0000	1.10
+++ en/reference/pgsql/functions/pg-result-error.xml	18 Jan 2007 21:53:58 -0000
@@ -66,7 +66,9 @@
     <programlisting role="php">
 <![CDATA[
 <?php
-  $dbconn = pg_connect("dbname=publisher") or die("Could not connect");
+  if (($dbconn = pg_connect("dbname=publisher")) === false) {
+      die("Could not connect");
+  }
 
   if (!pg_connection_busy($dbconn)) {
       pg_send_query($dbconn, "select * from doesnotexist;");
Index: en/reference/pgsql/functions/pg-send-execute.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/pgsql/functions/pg-send-execute.xml,v
retrieving revision 1.4
diff -u -r1.4 pg-send-execute.xml
--- en/reference/pgsql/functions/pg-send-execute.xml	4 Apr 2005 16:16:47 -0000	1.4
+++ en/reference/pgsql/functions/pg-send-execute.xml	18 Jan 2007 21:53:58 -0000
@@ -83,7 +83,9 @@
     <programlisting role="php">
 <![CDATA[
 <?php
-  $dbconn = pg_connect("dbname=publisher") or die("Could not connect");
+  if (($dbconn = pg_connect("dbname=publisher")) === false) {
+      die("Could not connect");
+  }
 
   // Prepare a query for execution
   if (!pg_connection_busy($dbconn)) {
Index: en/reference/pgsql/functions/pg-send-prepare.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/pgsql/functions/pg-send-prepare.xml,v
retrieving revision 1.4
diff -u -r1.4 pg-send-prepare.xml
--- en/reference/pgsql/functions/pg-send-prepare.xml	4 Apr 2005 16:16:47 -0000	1.4
+++ en/reference/pgsql/functions/pg-send-prepare.xml	18 Jan 2007 21:53:58 -0000
@@ -82,7 +82,9 @@
     <programlisting role="php">
 <![CDATA[
 <?php
-  $dbconn = pg_connect("dbname=publisher") or die("Could not connect");
+  if (($dbconn = pg_connect("dbname=publisher")) === false) {
+      die("Could not connect");
+  }
 
   // Prepare a query for execution
   if (!pg_connection_busy($dbconn)) {
Index: en/reference/pgsql/functions/pg-send-query-params.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/pgsql/functions/pg-send-query-params.xml,v
retrieving revision 1.4
diff -u -r1.4 pg-send-query-params.xml
--- en/reference/pgsql/functions/pg-send-query-params.xml	25 Apr 2005 08:59:03 -0000	1.4
+++ en/reference/pgsql/functions/pg-send-query-params.xml	18 Jan 2007 21:53:58 -0000
@@ -81,7 +81,9 @@
     <programlisting role="php">
 <![CDATA[
 <?php
-  $dbconn = pg_connect("dbname=publisher") or die("Could not connect");
+  if (($dbconn = pg_connect("dbname=publisher")) === false) {
+      die("Could not connect");
+  }
 
   // Using parameters.  Note that it is not necessary to quote or escape
   // the parameter.
Index: en/reference/pgsql/functions/pg-send-query.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/pgsql/functions/pg-send-query.xml,v
retrieving revision 1.14
diff -u -r1.14 pg-send-query.xml
--- en/reference/pgsql/functions/pg-send-query.xml	16 May 2006 02:01:47 -0000	1.14
+++ en/reference/pgsql/functions/pg-send-query.xml	18 Jan 2007 21:53:58 -0000
@@ -77,7 +77,9 @@
     <programlisting role="php">
 <![CDATA[
 <?php
-  $dbconn = pg_connect("dbname=publisher") or die("Could not connect");
+  if (($dbconn = pg_connect("dbname=publisher")) === false) {
+      die("Could not connect");
+  }
 
   if (!pg_connection_busy($dbconn)) {
       pg_send_query($dbconn, "select * from authors; select count(*) from authors;");
Index: en/reference/pgsql/functions/pg-set-error-verbosity.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/pgsql/functions/pg-set-error-verbosity.xml,v
retrieving revision 1.6
diff -u -r1.6 pg-set-error-verbosity.xml
--- en/reference/pgsql/functions/pg-set-error-verbosity.xml	6 Apr 2005 09:04:49 -0000	1.6
+++ en/reference/pgsql/functions/pg-set-error-verbosity.xml	18 Jan 2007 21:53:58 -0000
@@ -82,7 +82,9 @@
     <programlisting role="php">
 <![CDATA[
 <?php
-  $dbconn = pg_connect("dbname=publisher") or die("Could not connect");
+  if (($dbconn = pg_connect("dbname=publisher")) === false) {
+      die("Could not connect");
+  }
 
   if (!pg_connection_busy($dbconn)) {
       pg_send_query($dbconn, "select * from doesnotexist;");
Index: en/reference/pgsql/functions/pg-transaction-status.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/pgsql/functions/pg-transaction-status.xml,v
retrieving revision 1.5
diff -u -r1.5 pg-transaction-status.xml
--- en/reference/pgsql/functions/pg-transaction-status.xml	4 May 2005 09:39:11 -0000	1.5
+++ en/reference/pgsql/functions/pg-transaction-status.xml	18 Jan 2007 21:53:58 -0000
@@ -62,7 +62,10 @@
     <programlisting role="php">
 <![CDATA[
 <?php
-  $dbconn = pg_connect("dbname=publisher") or die("Could not connect");
+  if (($dbconn = pg_connect("dbname=publisher")) === false) {
+      die("Could not connect");
+  }
+
   $stat = pg_transaction_status($dbconn);
   if ($stat === PGSQL_TRANSACTION_UNKNOWN) {
       echo 'Connection is bad';
Index: en/reference/pgsql/functions/pg-version.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/pgsql/functions/pg-version.xml,v
retrieving revision 1.4
diff -u -r1.4 pg-version.xml
--- en/reference/pgsql/functions/pg-version.xml	4 Jul 2005 14:42:12 -0000	1.4
+++ en/reference/pgsql/functions/pg-version.xml	18 Jan 2007 21:53:58 -0000
@@ -60,9 +60,10 @@
     <programlisting role="php">
 <![CDATA[
 <?php
-  $dbconn = pg_connect("host=localhost port=5432 dbname=mary")
-     or die("Could not connect");
-     
+  if (($dbconn = pg_connect("host=localhost port=5432 dbname=mary")) === false) {
+      die("Could not connect");
+  }
+
   $v = pg_version($dbconn);
   
   echo $v['client'];
Index: en/reference/rar/reference.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/rar/reference.xml,v
retrieving revision 1.4
diff -u -r1.4 reference.xml
--- en/reference/rar/reference.xml	25 Jul 2006 13:38:36 -0000	1.4
+++ en/reference/rar/reference.xml	18 Jan 2007 21:53:59 -0000
@@ -139,7 +139,11 @@
 <![CDATA[
 <?php
 
-$rar_file = rar_open('example.rar') or die("Can't open Rar archive");
+if (($rar_file = rar_open('example.rar')) === false) {
+
+    die("Can't open Rar archive");
+
+}
 
 $entries = rar_list($rar_file);
 
Index: en/reference/rar/functions/rar-entry-get.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/rar/functions/rar-entry-get.xml,v
retrieving revision 1.2
diff -u -r1.2 rar-entry-get.xml
--- en/reference/rar/functions/rar-entry-get.xml	12 Nov 2004 12:38:06 -0000	1.2
+++ en/reference/rar/functions/rar-entry-get.xml	18 Jan 2007 21:53:59 -0000
@@ -21,9 +21,17 @@
 <![CDATA[
 <?php
 
-$rar_file = rar_open('example.rar') or die("Failed to open Rar archive");
+if (($rar_file = rar_open('example.rar')) === false) {
 
-$entry = rar_entry_get($rar_file, 'Dir/file.txt') or die("Failed to find such entry");
+    die("Failed to open Rar archive");
+
+}
+
+if (($entry = rar_entry_get($rar_file, 'Dir/file.txt')) === false) {
+
+    die("Failed to find such entry");
+
+}
 
 print_r($entry);
 
Index: en/reference/rar/functions/rar-extract.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/rar/functions/rar-extract.xml,v
retrieving revision 1.2
diff -u -r1.2 rar-extract.xml
--- en/reference/rar/functions/rar-extract.xml	17 Sep 2006 21:24:21 -0000	1.2
+++ en/reference/rar/functions/rar-extract.xml	18 Jan 2007 21:53:59 -0000
@@ -26,9 +26,17 @@
 <![CDATA[
 <?php
 
-$rar_file = rar_open('example.rar') or die("Failed to open Rar archive");
+if (($rar_file = rar_open('example.rar')) === false) {
 
-$entry = rar_entry_get($rar_file, 'Dir/file.txt') or die("Failed to find such entry");
+    die("Failed to open Rar archive");
+
+}
+
+if (($entry = rar_entry_get($rar_file, 'Dir/file.txt')) === false) {
+
+    die("Failed to find such entry");
+
+}
 
 $entry->extract('/dir/to'); // create /dir/to/Dir/file.txt
 $entry->extract(false, '/dir/to/new_name.txt'); // create /dir/to/new_name.txt
Index: en/reference/rar/functions/rar-getattr.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/rar/functions/rar-getattr.xml,v
retrieving revision 1.1
diff -u -r1.1 rar-getattr.xml
--- en/reference/rar/functions/rar-getattr.xml	28 Sep 2004 12:23:27 -0000	1.1
+++ en/reference/rar/functions/rar-getattr.xml	18 Jan 2007 21:53:59 -0000
@@ -21,9 +21,17 @@
 <![CDATA[
 <?php
 
-$rar_file = rar_open('example.rar') or die("Can't open Rar archive");
+if (($rar_file = rar_open('example.rar')) === false) {
 
-$entry = rar_entry_get($rar_file, 'dir/in/the/archive') or die("Can't find such entry");
+    die("Can't open Rar archive");
+
+}
+
+if (($entry = rar_entry_get($rar_file, 'dir/in/the/archive')) === false) {
+
+    die("Can't find such entry");
+
+}
 
 $host_os = $entry->getHostOs();
 $attr = $entry->getAttr();
Index: en/reference/rar/functions/rar-gethostos.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/rar/functions/rar-gethostos.xml,v
retrieving revision 1.1
diff -u -r1.1 rar-gethostos.xml
--- en/reference/rar/functions/rar-gethostos.xml	28 Sep 2004 12:23:27 -0000	1.1
+++ en/reference/rar/functions/rar-gethostos.xml	18 Jan 2007 21:53:59 -0000
@@ -21,9 +21,17 @@
 <![CDATA[
 <?php
 
-$rar_file = rar_open('example.rar') or die("Failed to open Rar archive");
+if (($rar_file = rar_open('example.rar')) === false) {
 
-$entry = rar_entry_get($rar_file, 'Dir/file.txt') or die("Failed to find such entry");
+    die("Failed to open Rar archive");
+
+}
+
+if (($entry = rar_entry_get($rar_file, 'Dir/file.txt')) === false) {
+
+    die("Failed to find such entry");
+
+}
 
 switch ($entry->getHostOs()) {
     case RAR_HOST_MSDOS:
Index: en/reference/rar/functions/rar-getmethod.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/rar/functions/rar-getmethod.xml,v
retrieving revision 1.1
diff -u -r1.1 rar-getmethod.xml
--- en/reference/rar/functions/rar-getmethod.xml	28 Sep 2004 12:23:27 -0000	1.1
+++ en/reference/rar/functions/rar-getmethod.xml	18 Jan 2007 21:53:59 -0000
@@ -21,9 +21,17 @@
 <![CDATA[
 <?php
 
-$rar_file = rar_open('example.rar') or die("Failed to open Rar archive");
+if (($rar_file = rar_open('example.rar')) === false) {
 
-$entry = rar_entry_get($rar_file, 'Dir/file.txt') or die("Failed to find such entry");
+    die("Failed to open Rar archive");
+
+}
+
+if (($entry = rar_entry_get($rar_file, 'Dir/file.txt')) === false) {
+
+    die("Failed to find such entry");
+
+}
 
 echo "Method number: " . $entry->getMethod();
 
Index: en/reference/rar/functions/rar-getname.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/rar/functions/rar-getname.xml,v
retrieving revision 1.1
diff -u -r1.1 rar-getname.xml
--- en/reference/rar/functions/rar-getname.xml	28 Sep 2004 12:23:27 -0000	1.1
+++ en/reference/rar/functions/rar-getname.xml	18 Jan 2007 21:53:59 -0000
@@ -20,9 +20,17 @@
 <![CDATA[
 <?php
 
-$rar_file = rar_open('example.rar') or die("Failed to open Rar archive");
+if (($rar_file = rar_open('example.rar')) === false) {
 
-$entry = rar_entry_get($rar_file, 'Dir/file.txt') or die("Failed to find such entry");
+    die("Failed to open Rar archive");
+
+}
+
+if (($entry = rar_entry_get($rar_file, 'Dir/file.txt')) === false) {
+
+    die("Failed to find such entry");
+
+}
 
 echo "Entry name: " . $entry->getName();
 
Index: en/reference/rar/functions/rar-getpackedsize.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/rar/functions/rar-getpackedsize.xml,v
retrieving revision 1.1
diff -u -r1.1 rar-getpackedsize.xml
--- en/reference/rar/functions/rar-getpackedsize.xml	28 Sep 2004 12:23:27 -0000	1.1
+++ en/reference/rar/functions/rar-getpackedsize.xml	18 Jan 2007 21:53:59 -0000
@@ -20,9 +20,17 @@
 <![CDATA[
 <?php
 
-$rar_file = rar_open('example.rar') or die("Failed to open Rar archive");
+if (($rar_file = rar_open('example.rar')) === false) {
 
-$entry = rar_entry_get($rar_file, 'Dir/file.txt') or die("Failed to find such entry");
+    die("Failed to open Rar archive");
+
+}
+
+if (($entry = rar_entry_get($rar_file, 'Dir/file.txt')) === false) {
+
+    die("Failed to find such entry");
+
+}
 
 echo "Packed size of " . $entry->getName() . " = " . $entry->getPackedSize() . " bytes";
 
Index: en/reference/rar/functions/rar-getunpackedsize.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/rar/functions/rar-getunpackedsize.xml,v
retrieving revision 1.1
diff -u -r1.1 rar-getunpackedsize.xml
--- en/reference/rar/functions/rar-getunpackedsize.xml	28 Sep 2004 12:23:27 -0000	1.1
+++ en/reference/rar/functions/rar-getunpackedsize.xml	18 Jan 2007 21:53:59 -0000
@@ -20,9 +20,17 @@
 <![CDATA[
 <?php
 
-$rar_file = rar_open('example.rar') or die("Failed to open Rar archive");
+if (($rar_file = rar_open('example.rar')) === false) {
 
-$entry = rar_entry_get($rar_file, 'Dir/file.txt') or die("Failed to find such entry");
+    die("Failed to open Rar archive");
+
+}
+
+if (($entry = rar_entry_get($rar_file, 'Dir/file.txt')) === false) {
+
+    die("Failed to find such entry");
+
+}
 
 echo "Unpacked size of " . $entry->getName() . " = " . $entry->getPackedSize() . " bytes";
 
Index: en/reference/rar/functions/rar-getversion.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/rar/functions/rar-getversion.xml,v
retrieving revision 1.1
diff -u -r1.1 rar-getversion.xml
--- en/reference/rar/functions/rar-getversion.xml	28 Sep 2004 12:23:27 -0000	1.1
+++ en/reference/rar/functions/rar-getversion.xml	18 Jan 2007 21:53:59 -0000
@@ -20,9 +20,17 @@
 <![CDATA[
 <?php
 
-$rar_file = rar_open('example.rar') or die("Failed to open Rar archive");
+if (($rar_file = rar_open('example.rar')) === false) {
 
-$entry = rar_entry_get($rar_file, 'Dir/file.txt') or die("Failed to find such entry");
+    die("Failed to open Rar archive");
+
+}
+
+if (($entry = rar_entry_get($rar_file, 'Dir/file.txt')) === false) {
+
+    die("Failed to find such entry");
+
+}
 
 echo "Rar (WinRAR) version used: " . $entry->getVersion();
 
Index: en/reference/rar/functions/rar-list.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/rar/functions/rar-list.xml,v
retrieving revision 1.1
diff -u -r1.1 rar-list.xml
--- en/reference/rar/functions/rar-list.xml	22 Sep 2004 15:51:30 -0000	1.1
+++ en/reference/rar/functions/rar-list.xml	18 Jan 2007 21:53:59 -0000
@@ -20,7 +20,11 @@
 <![CDATA[
 <?php
 
-$rar_file = rar_open('example.rar') or die("Failed to open Rar archive");
+if (($rar_file = rar_open('example.rar')) === false) {
+
+    die("Failed to open Rar archive");
+
+}
 
 $entries_list = rar_list($rar_file);
 
Index: en/reference/stream/functions/stream-filter-register.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/stream/functions/stream-filter-register.xml,v
retrieving revision 1.12
diff -u -r1.12 stream-filter-register.xml
--- en/reference/stream/functions/stream-filter-register.xml	6 Jun 2005 14:22:09 -0000	1.12
+++ en/reference/stream/functions/stream-filter-register.xml	18 Jan 2007 21:54:01 -0000
@@ -172,8 +172,9 @@
 } 
 
 /* Register our filter with PHP */
-stream_filter_register("strtoupper", "strtoupper_filter")
-    or die("Failed to register filter");
+if ((stream_filter_register("strtoupper", "strtoupper_filter")) === false) {
+    die("Failed to register filter");
+}
 
 $fp = fopen("foo-bar.txt", "w");
 
@@ -246,8 +247,9 @@
 } 
 
 /* Register our filter with PHP */
-stream_filter_register("str.*", "string_filter")
-    or die("Failed to register filter");
+if ((stream_filter_register("str.*", "string_filter")) === false) {
+    die("Failed to register filter");
+}
 
 $fp = fopen("foo-bar.txt", "w");
 
Index: en/reference/stream/functions/stream-wrapper-register.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/stream/functions/stream-wrapper-register.xml,v
retrieving revision 1.13
diff -u -r1.13 stream-wrapper-register.xml
--- en/reference/stream/functions/stream-wrapper-register.xml	10 Aug 2004 16:30:21 -0000	1.13
+++ en/reference/stream/functions/stream-wrapper-register.xml	18 Jan 2007 21:54:02 -0000
@@ -475,8 +475,11 @@
     }
 }
 
-stream_wrapper_register("var", "VariableStream")
-    or die("Failed to register protocol");
+if ((stream_wrapper_register("var", "VariableStream")) === false) {
+
+    die("Failed to register protocol");
+
+}
 
 $myvar = "";
     
Index: en/reference/sybase/functions/sybase-connect.xml
===================================================================
RCS file: /repository/phpdoc/en/reference/sybase/functions/sybase-connect.xml,v
retrieving revision 1.6
diff -u -r1.6 sybase-connect.xml
--- en/reference/sybase/functions/sybase-connect.xml	30 Mar 2005 16:03:26 -0000	1.6
+++ en/reference/sybase/functions/sybase-connect.xml	18 Jan 2007 21:54:03 -0000
@@ -42,8 +42,10 @@
     <programlisting role="php">
 <![CDATA[
 <?php
-$link = sybase_connect('SYBASE', '', '')
-        or die("Could not connect !");
+if (($link = sybase_connect('SYBASE', '', '')) === false) {
+    die("Could not connect !");
+}
+
 echo "Connected successfully";
 sybase_close($link);
 ?>