dave Sat Dec 20 23:22:01 2003 EDT
Modified files:
/phpdoc/en/appendices debugger.xml transports.xml
/phpdoc/en/chapters config.xml install.iplanet.xml install.unix.xml
streams.common.xml streams.socket.xml
/phpdoc/en/faq build.xml databases.xml general.xml installation.xml
/phpdoc/en/features commandline.xml
/phpdoc/en/reference/calendar/functions easter-date.xml
easter-days.xml
jdtounix.xml unixtojd.xml
/phpdoc/en/reference/curl/functions curl-setopt.xml
/phpdoc/en/reference/datetime/functions gmmktime.xml microtime.xml
mktime.xml strftime.xml
strtotime.xml time.xml
/phpdoc/en/reference/dbplus reference.xml
/phpdoc/en/reference/errorfunc ini.xml
/phpdoc/en/reference/filesystem/functions chmod.xml fnmatch.xml
linkinfo.xml stat.xml
/phpdoc/en/reference/ftp/functions ftp-mdtm.xml ftp-systype.xml
/phpdoc/en/reference/http/functions setcookie.xml
/phpdoc/en/reference/ibase/functions ibase-fetch-assoc.xml
ibase-fetch-object.xml
ibase-fetch-row.xml
/phpdoc/en/reference/info/functions dl.xml
/phpdoc/en/reference/ming configure.xml
/phpdoc/en/reference/ming/functions swfaction.xml
/phpdoc/en/reference/mnogosearch/functions udm-set-agent-param.xml
/phpdoc/en/reference/nsapi/functions nsapi-virtual.xml
/phpdoc/en/reference/oracle/functions ora-error.xml
/phpdoc/en/reference/sem reference.xml
/phpdoc/en/reference/session reference.xml
/phpdoc/en/reference/shmop reference.xml
/phpdoc/en/reference/sockets reference.xml
/phpdoc/en/reference/sockets/functions socket-connect.xml
socket-getpeername.xml
socket-getsockname.xml
/phpdoc/en/reference/stream/functions stream-socket-client.xml
stream-socket-server.xml
/phpdoc/en/reference/xslt configure.xml
Log:
- Standardize the Unix acronym. Unix is the preferred capitalization
as UNIX is a registered trademark by the Open Group. References to UNIX
were left in where it made sense, like example outputs, and so forth.
You can read the Trademark User Guide for "UNIX" at:
http://www.unix.org/tmug2.ps or http://www.unix.org/tmug2.pdf
Index: phpdoc/en/appendices/debugger.xml
diff -u phpdoc/en/appendices/debugger.xml:1.25 phpdoc/en/appendices/debugger.xml:1.26
--- phpdoc/en/appendices/debugger.xml:1.25 Wed Jun 25 01:44:36 2003
+++ phpdoc/en/appendices/debugger.xml Sat Dec 20 23:21:39 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.25 $ -->
+<!-- $Revision: 1.26 $ -->
<appendix id="debugger">
<title>Debugging PHP</title>
@@ -47,7 +47,7 @@
<listitem>
<simpara>
Set up a TCP listener on that port somewhere (for example
- <command>socket -l -s 1400</command> on UNIX).
+ <command>socket -l -s 1400</command> on Unix systems).
</simpara>
</listitem>
<listitem>
Index: phpdoc/en/appendices/transports.xml
diff -u phpdoc/en/appendices/transports.xml:1.5 phpdoc/en/appendices/transports.xml:1.6
--- phpdoc/en/appendices/transports.xml:1.5 Fri Dec 12 14:56:04 2003
+++ phpdoc/en/appendices/transports.xml Sat Dec 20 23:21:39 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
<appendix id="transports">
<title>List of Supported Socket Transports</title>
<para>
@@ -168,7 +168,7 @@
</section>
<section id="transports.unix">
- <title>Unix Domain: UNIX and UDG</title>
+ <title>Unix Domain: Unix and UDG</title>
<simpara>
<literal>unix://</literal> since <literal>PHP 3</literal>,
<literal>udg://</literal> since <literal>PHP 5</literal>
@@ -181,13 +181,13 @@
<simpara>
<literal>unix://</literal> provides access to a socket stream
- connection in the unix domain. <literal>udg://</literal> provides
- an alternate transport to a unix domain socket using the user datagram
+ connection in the Unix domain. <literal>udg://</literal> provides
+ an alternate transport to a Unix domain socket using the user datagram
protocol.
</simpara>
<simpara>
- Unix Domain sockets, unlike Internet Domain sockets, do not expect
+ Unix domain sockets, unlike Internet domain sockets, do not expect
a port number. In the case of <function>fsockopen</function> the
<parameter>portno</parameter> parameter should be set to 0.
</simpara>
Index: phpdoc/en/chapters/config.xml
diff -u phpdoc/en/chapters/config.xml:1.113 phpdoc/en/chapters/config.xml:1.114
--- phpdoc/en/chapters/config.xml:1.113 Sat Dec 20 20:22:45 2003
+++ phpdoc/en/chapters/config.xml Sat Dec 20 23:21:40 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.113 $ -->
+<!-- $Revision: 1.114 $ -->
<chapter id="configuration">
<title>Runtime Configuration</title>
@@ -1010,11 +1010,11 @@
and <function>fopen_with_path</function> functions look for
files. The format is like the system's <envar>PATH</envar>
environment variable: a list of directories separated with a
- colon in UNIX or semicolon in Windows.
+ colon in Unix or semicolon in Windows.
</para>
<para>
<example>
- <title>UNIX include_path</title>
+ <title>Unix include_path</title>
<programlisting role="php.ini">
<![CDATA[
include_path=".:/php/includes"
Index: phpdoc/en/chapters/install.iplanet.xml
diff -u phpdoc/en/chapters/install.iplanet.xml:1.12
phpdoc/en/chapters/install.iplanet.xml:1.13
--- phpdoc/en/chapters/install.iplanet.xml:1.12 Sat Dec 20 20:22:46 2003
+++ phpdoc/en/chapters/install.iplanet.xml Sat Dec 20 23:21:40 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.12 $ -->
+<!-- $Revision: 1.13 $ -->
<sect1 id="install.netscape-enterprise">
<title>Servers-Netscape, iPlanet and SunONE</title>
<para>
@@ -386,7 +386,7 @@
script of the webserver, you wanted to start, as a CGI script
(a CGI script inside of the admin server!). This is why the environment of the
started webserver
has some CGI environment variables in it. You can test this by
- starting the webserver not from the administration server. Use the unix command
line as root user and
+ starting the webserver not from the administration server. Use the Unix command
line as root user and
start it manually - you will see there are no CGI-like environment variables.
</para>
</note>
Index: phpdoc/en/chapters/install.unix.xml
diff -u phpdoc/en/chapters/install.unix.xml:1.3 phpdoc/en/chapters/install.unix.xml:1.4
--- phpdoc/en/chapters/install.unix.xml:1.3 Wed Jun 18 02:08:49 2003
+++ phpdoc/en/chapters/install.unix.xml Sat Dec 20 23:21:40 2003
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
<sect1 id="install.unix">
- <title>Installation on UNIX systems</title>
+ <title>Installation on Unix systems</title>
<para>
This section will guide you through the general configuration and
installation of PHP on Unix systems. Be sure to investigate any
@@ -13,7 +13,7 @@
<itemizedlist>
<listitem>
<simpara>
- Basic UNIX skills (being able to operate "make" and a C
+ Basic Unix skills (being able to operate "make" and a C
compiler, if compiling)
</simpara>
</listitem>
Index: phpdoc/en/chapters/streams.common.xml
diff -u phpdoc/en/chapters/streams.common.xml:1.10
phpdoc/en/chapters/streams.common.xml:1.11
--- phpdoc/en/chapters/streams.common.xml:1.10 Fri Dec 12 14:56:02 2003
+++ phpdoc/en/chapters/streams.common.xml Sat Dec 20 23:21:40 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.10 $ -->
+<!-- $Revision: 1.11 $ -->
<!-- Author: Wez Furlong <[EMAIL PROTECTED]>
Please contact me before making any major amendments to the
content of this section. Splitting/Merging are fine if they are
@@ -87,7 +87,7 @@
</para>
<para>
Any local files created by the streams API will have their initial permissions
set
- according to the operating system defaults - under UNIX based systems
+ according to the operating system defaults - under Unix based systems
this means that the umask of the process will be used. Under Windows,
the file will be owned by the creating process.
Any remote files will be created according to the URL wrapper that was
Index: phpdoc/en/chapters/streams.socket.xml
diff -u phpdoc/en/chapters/streams.socket.xml:1.1
phpdoc/en/chapters/streams.socket.xml:1.2
--- phpdoc/en/chapters/streams.socket.xml:1.1 Sat Aug 10 19:38:41 2002
+++ phpdoc/en/chapters/streams.socket.xml Sat Dec 20 23:21:40 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
<!-- Author: Wez Furlong <[EMAIL PROTECTED]>
Please contact me before making any major amendments to the
content of this section. Splitting/Merging are fine if they are
@@ -86,7 +86,7 @@
<refentry id="streams.php-stream-sock-open-unix">
<refnamediv>
<refname>php_stream_sock_open_unix</refname>
- <refpurpose>Open a UNIX domain socket and convert into a stream</refpurpose>
+ <refpurpose>Open a Unix domain socket and convert into a stream</refpurpose>
</refnamediv>
<refsect1>
<title>Description</title>
@@ -98,7 +98,7 @@
<methodparam><type>struct timeval
*</type><parameter>timeout</parameter></methodparam>
</methodsynopsis>
<para>
- <function>php_stream_sock_open_unix</function> attempts to open the UNIX domain
socket
+ <function>php_stream_sock_open_unix</function> attempts to open the Unix domain
socket
specified by <parameter>path</parameter>. <parameter>pathlen</parameter>
specifies the
length of <parameter>path</parameter>.
If <parameter>timeout</parameter> is not NULL, it specifies a timeout period
for the connection attempt.
@@ -107,7 +107,7 @@
</para>
<note>
<simpara>
- This function will not work under Windows, which does not implement unix
domain sockets.
+ This function will not work under Windows, which does not implement Unix
domain sockets.
A possible exception to this rule is if your PHP binary was built using
cygwin. You are encouraged
to consider this aspect of the portability of your extension before it's
release.
</simpara>
Index: phpdoc/en/faq/build.xml
diff -u phpdoc/en/faq/build.xml:1.28 phpdoc/en/faq/build.xml:1.29
--- phpdoc/en/faq/build.xml:1.28 Tue Sep 30 04:41:52 2003
+++ phpdoc/en/faq/build.xml Sat Dec 20 23:21:40 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.28 $ -->
+<!-- $Revision: 1.29 $ -->
<chapter id="faq.build">
<title>Build Problems</title>
<titleabbrev>Build Problems</titleabbrev>
@@ -262,7 +262,7 @@
<question>
<para>
I have followed all the steps to install the Apache module version on
- UNIX, and my PHP scripts show up in my browser or I am being asked to
+ Unix, and my PHP scripts show up in my browser or I am being asked to
save the file.
</para>
</question>
Index: phpdoc/en/faq/databases.xml
diff -u phpdoc/en/faq/databases.xml:1.22 phpdoc/en/faq/databases.xml:1.23
--- phpdoc/en/faq/databases.xml:1.22 Fri Dec 12 14:56:01 2003
+++ phpdoc/en/faq/databases.xml Sat Dec 20 23:21:40 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.22 $ -->
+<!-- $Revision: 1.23 $ -->
<chapter id="faq.databases">
<title>Database issues</title>
<titleabbrev>Database issues</titleabbrev>
@@ -63,7 +63,7 @@
Using another database as an intermediary is not a good idea, when you can
use ODBC from PHP straight to your database - i.e. with OpenLink's drivers. If
you do need to use an intermediary file format, OpenLink have now released
- Virtuoso (a virtual database engine) for NT, Linux and other unix platforms.
+ Virtuoso (a virtual database engine) for NT, Linux and other Unix platforms.
Please visit our <ulink url="&url.openlink;">website</ulink> for a free
download.
</programlisting>
</para>
@@ -206,7 +206,7 @@
and PHP against another, and then enable both in Apache, you get a
nice fat crash. Also, the bundled library didn't always play well
with the installed server version. The most obvious symptom of this
- being disagreement over where to find the mysql.socket unix domain
+ being disagreement over where to find the mysql.socket Unix domain
socket file.
</para>
</listitem>
@@ -226,7 +226,7 @@
</listitem>
</itemizedlist>
<para>
- This won't actually affect that many people. UNIX users, at least the
+ This won't actually affect that many people. Unix users, at least the
ones who know what they are doing, tend to always build PHP against
their system's libmyqlclient library simply by doing --with-mysql=/usr
when building PHP. Windows users may enable the extension
Index: phpdoc/en/faq/general.xml
diff -u phpdoc/en/faq/general.xml:1.19 phpdoc/en/faq/general.xml:1.20
--- phpdoc/en/faq/general.xml:1.19 Tue Feb 4 04:38:22 2003
+++ phpdoc/en/faq/general.xml Sat Dec 20 23:21:40 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.19 $ -->
+<!-- $Revision: 1.20 $ -->
<chapter id="faq.general">
<title>General Information</title>
<titleabbrev>General Information</titleabbrev>
@@ -93,7 +93,7 @@
<simpara>Extended API module</simpara>
</listitem>
<listitem>
- <simpara>Generalized build process under UNIX</simpara>
+ <simpara>Generalized build process under Unix</simpara>
</listitem>
<listitem>
<simpara>Generic web server interface that also supports
Index: phpdoc/en/faq/installation.xml
diff -u phpdoc/en/faq/installation.xml:1.25 phpdoc/en/faq/installation.xml:1.26
--- phpdoc/en/faq/installation.xml:1.25 Sat Dec 20 20:05:37 2003
+++ phpdoc/en/faq/installation.xml Sat Dec 20 23:21:40 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.25 $ -->
+<!-- $Revision: 1.26 $ -->
<chapter id="faq.installation">
<title>Installation</title>
<titleabbrev>Installation</titleabbrev>
@@ -28,7 +28,7 @@
</question>
<answer>
<para>
- By default on UNIX it should be in <filename>/usr/local/lib</filename>
+ By default on Unix it should be in <filename>/usr/local/lib</filename>
which is <filename><install-path>/lib</filename>.
Most people will want to change this at compile-time with the
<link
linkend="install.configure.with-config-file-path">--with-config-file-path</link>
Index: phpdoc/en/features/commandline.xml
diff -u phpdoc/en/features/commandline.xml:1.25 phpdoc/en/features/commandline.xml:1.26
--- phpdoc/en/features/commandline.xml:1.25 Sat Dec 20 20:22:46 2003
+++ phpdoc/en/features/commandline.xml Sat Dec 20 23:21:41 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.25 $ -->
+<!-- $Revision: 1.26 $ -->
<chapter id="features.commandline">
<title>Using PHP from the command line</title>
<!-- NEW DOCUMENTATION STARTS -->
@@ -75,7 +75,7 @@
<para>
<note>
<para>
- A unix <literal>man</literal>ual page was added in PHP 4.3.2. You may
+ A Unix <literal>man</literal>ual page was added in PHP 4.3.2. You may
view this by typing <literal>man php</literal> in your shell environment.
</para>
</note>
Index: phpdoc/en/reference/calendar/functions/easter-date.xml
diff -u phpdoc/en/reference/calendar/functions/easter-date.xml:1.10
phpdoc/en/reference/calendar/functions/easter-date.xml:1.11
--- phpdoc/en/reference/calendar/functions/easter-date.xml:1.10 Mon Dec 15 13:41:57
2003
+++ phpdoc/en/reference/calendar/functions/easter-date.xml Sat Dec 20 23:21:42
2003
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.10 $ -->
+<!-- $Revision: 1.11 $ -->
<!-- splitted from ./en/functions/calendar.xml, last change in rev 1.2 -->
<refentry id="function.easter-date">
<refnamediv>
<refname>easter_date</refname>
<refpurpose>
- Get UNIX timestamp for midnight on Easter of a given year
+ Get Unix timestamp for midnight on Easter of a given year
</refpurpose>
</refnamediv>
<refsect1>
@@ -15,7 +15,7 @@
<methodparam
choice="opt"><type>int</type><parameter>year</parameter></methodparam>
</methodsynopsis>
<para>
- Returns the UNIX timestamp corresponding to midnight on Easter of
+ Returns the Unix timestamp corresponding to midnight on Easter of
the given year.
</para>
<para>
@@ -42,7 +42,7 @@
<warning>
<para>
This function will generate a warning if the year is outside
- of the range for UNIX timestamps (i.e. before 1970 or after 2037).
+ of the range for Unix timestamps (i.e. before 1970 or after 2037).
</para>
</warning>
<para>
Index: phpdoc/en/reference/calendar/functions/easter-days.xml
diff -u phpdoc/en/reference/calendar/functions/easter-days.xml:1.9
phpdoc/en/reference/calendar/functions/easter-days.xml:1.10
--- phpdoc/en/reference/calendar/functions/easter-days.xml:1.9 Mon Dec 15 13:41:57
2003
+++ phpdoc/en/reference/calendar/functions/easter-days.xml Sat Dec 20 23:21:42
2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
+<!-- $Revision: 1.10 $ -->
<!-- splitted from ./en/functions/calendar.xml, last change in rev 1.2 -->
<refentry id="function.easter-days">
<refnamediv>
@@ -37,7 +37,7 @@
<para>
This function can be used instead of
<function>easter_date</function> to calculate Easter for years
- which fall outside the range of UNIX timestamps (i.e. before 1970
+ which fall outside the range of Unix timestamps (i.e. before 1970
or after 2037).
<example>
<title><function>easter_days</function> example</title>
Index: phpdoc/en/reference/calendar/functions/jdtounix.xml
diff -u phpdoc/en/reference/calendar/functions/jdtounix.xml:1.5
phpdoc/en/reference/calendar/functions/jdtounix.xml:1.6
--- phpdoc/en/reference/calendar/functions/jdtounix.xml:1.5 Mon Oct 6 23:49:01
2003
+++ phpdoc/en/reference/calendar/functions/jdtounix.xml Sat Dec 20 23:21:42 2003
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
<!-- splitted from ./en/functions/calendar.xml, last change in rev 1.3 -->
<refentry id="function.jdtounix">
<refnamediv>
<refname>jdtounix</refname>
- <refpurpose>Convert Julian Day to UNIX timestamp</refpurpose>
+ <refpurpose>Convert Julian Day to Unix timestamp</refpurpose>
</refnamediv>
<refsect1>
<title>Description</title>
@@ -13,9 +13,9 @@
<methodparam><type>int</type><parameter>jday</parameter></methodparam>
</methodsynopsis>
<para>
- This function will return a UNIX timestamp corresponding to the
+ This function will return a Unix timestamp corresponding to the
Julian Day given in <parameter>jday</parameter> or &false; if
- <parameter>jday</parameter> is not inside the UNIX epoch
+ <parameter>jday</parameter> is not inside the Unix epoch
(Gregorian years between 1970 and 2037 or 2440588 <=
<parameter>jday</parameter> <= 2465342 ). The time returned is
localtime (and not GMT).
Index: phpdoc/en/reference/calendar/functions/unixtojd.xml
diff -u phpdoc/en/reference/calendar/functions/unixtojd.xml:1.4
phpdoc/en/reference/calendar/functions/unixtojd.xml:1.5
--- phpdoc/en/reference/calendar/functions/unixtojd.xml:1.4 Mon Oct 6 23:49:01
2003
+++ phpdoc/en/reference/calendar/functions/unixtojd.xml Sat Dec 20 23:21:42 2003
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
<!-- splitted from ./en/functions/calendar.xml, last change in rev 1.3 -->
<refentry id="function.unixtojd">
<refnamediv>
<refname>unixtojd</refname>
- <refpurpose>Convert UNIX timestamp to Julian Day</refpurpose>
+ <refpurpose>Convert Unix timestamp to Julian Day</refpurpose>
</refnamediv>
<refsect1>
<title>Description</title>
@@ -13,7 +13,7 @@
<methodparam
choice="opt"><type>int</type><parameter>timestamp</parameter></methodparam>
</methodsynopsis>
<para>
- Return the Julian Day for a UNIX <parameter>timestamp</parameter>
+ Return the Julian Day for a Unix <parameter>timestamp</parameter>
(seconds since 1.1.1970), or for the current day if no
<parameter>timestamp</parameter> is given.
</para>
Index: phpdoc/en/reference/curl/functions/curl-setopt.xml
diff -u phpdoc/en/reference/curl/functions/curl-setopt.xml:1.7
phpdoc/en/reference/curl/functions/curl-setopt.xml:1.8
--- phpdoc/en/reference/curl/functions/curl-setopt.xml:1.7 Sun Dec 14 06:59:58
2003
+++ phpdoc/en/reference/curl/functions/curl-setopt.xml Sat Dec 20 23:21:42 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
<!-- splitted from ./en/functions/curl.xml, last change in rev 1.1 -->
<refentry id="function.curl-setopt">
<refnamediv>
@@ -295,7 +295,7 @@
for the ftp "POST" instruction. The POST instruction tells
the remote server to connect to our specified IP address. The
string may be a plain IP address, a hostname, a network
- interface name (under UNIX), or just a plain '-' to use the
+ interface name (under Unix), or just a plain '-' to use the
systems default IP address.
</simpara>
</listitem>
Index: phpdoc/en/reference/datetime/functions/gmmktime.xml
diff -u phpdoc/en/reference/datetime/functions/gmmktime.xml:1.3
phpdoc/en/reference/datetime/functions/gmmktime.xml:1.4
--- phpdoc/en/reference/datetime/functions/gmmktime.xml:1.3 Tue Apr 8 16:12:41
2003
+++ phpdoc/en/reference/datetime/functions/gmmktime.xml Sat Dec 20 23:21:43 2003
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
<!-- splitted from ./en/functions/datetime.xml, last change in rev 1.2 -->
<refentry id="function.gmmktime">
<refnamediv>
<refname>gmmktime</refname>
- <refpurpose>Get UNIX timestamp for a GMT date</refpurpose>
+ <refpurpose>Get Unix timestamp for a GMT date</refpurpose>
</refnamediv>
<refsect1>
<title>Description</title>
Index: phpdoc/en/reference/datetime/functions/microtime.xml
diff -u phpdoc/en/reference/datetime/functions/microtime.xml:1.6
phpdoc/en/reference/datetime/functions/microtime.xml:1.7
--- phpdoc/en/reference/datetime/functions/microtime.xml:1.6 Fri Dec 19 08:25:30
2003
+++ phpdoc/en/reference/datetime/functions/microtime.xml Sat Dec 20 23:21:43
2003
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
<!-- splitted from ./en/functions/datetime.xml, last change in rev 1.2 -->
<refentry id="function.microtime">
<refnamediv>
<refname>microtime</refname>
<refpurpose>
- Return current UNIX timestamp with microseconds
+ Return current Unix timestamp with microseconds
</refpurpose>
</refnamediv>
<refsect1>
Index: phpdoc/en/reference/datetime/functions/mktime.xml
diff -u phpdoc/en/reference/datetime/functions/mktime.xml:1.7
phpdoc/en/reference/datetime/functions/mktime.xml:1.8
--- phpdoc/en/reference/datetime/functions/mktime.xml:1.7 Thu Dec 18 12:43:32
2003
+++ phpdoc/en/reference/datetime/functions/mktime.xml Sat Dec 20 23:21:43 2003
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
<!-- splitted from ./en/functions/datetime.xml, last change in rev 1.2 -->
<refentry id="function.mktime">
<refnamediv>
<refname>mktime</refname>
- <refpurpose>Get UNIX timestamp for a date</refpurpose>
+ <refpurpose>Get Unix timestamp for a date</refpurpose>
</refnamediv>
<refsect1>
<title>Description</title>
@@ -21,7 +21,7 @@
<para>
<emphasis>Warning:</emphasis> Note the strange order of
arguments, which differs from the order of arguments in a regular
- UNIX mktime() call and which does not lend itself well to leaving
+ Unix mktime() call and which does not lend itself well to leaving
out parameters from right to left (see below). It is a common
error to mix these values up in a script.
</para>
Index: phpdoc/en/reference/datetime/functions/strftime.xml
diff -u phpdoc/en/reference/datetime/functions/strftime.xml:1.12
phpdoc/en/reference/datetime/functions/strftime.xml:1.13
--- phpdoc/en/reference/datetime/functions/strftime.xml:1.12 Mon Dec 15 13:41:59
2003
+++ phpdoc/en/reference/datetime/functions/strftime.xml Sat Dec 20 23:21:43 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.12 $ -->
+<!-- $Revision: 1.13 $ -->
<!-- splitted from ./en/functions/datetime.xml, last change in rev 1.2 -->
<refentry id="function.strftime">
<refnamediv>
@@ -239,7 +239,7 @@
library, in which case they will not be supported by PHP's
<function>strftime</function>. Additionally, not all platforms
support negative timestamps, therefore your date range may
- be limited to no earlier than the unix epoch. This means that
+ be limited to no earlier than the Unix epoch. This means that
e.g. %e, %T, %R and %D (there might be more) and dates prior to
<literal>Jan 1, 1970</literal> will not work on Windows, some Linux
distributions, and a few other operating systems. For Windows systems a
Index: phpdoc/en/reference/datetime/functions/strtotime.xml
diff -u phpdoc/en/reference/datetime/functions/strtotime.xml:1.6
phpdoc/en/reference/datetime/functions/strtotime.xml:1.7
--- phpdoc/en/reference/datetime/functions/strtotime.xml:1.6 Thu Dec 18 12:43:32
2003
+++ phpdoc/en/reference/datetime/functions/strtotime.xml Sat Dec 20 23:21:43
2003
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
<!-- splitted from ./en/functions/datetime.xml, last change in rev 1.8 -->
<refentry id="function.strtotime">
<refnamediv>
<refname>strtotime</refname>
<refpurpose>
- Parse about any English textual datetime description into a UNIX
+ Parse about any English textual datetime description into a Unix
timestamp
</refpurpose>
</refnamediv>
@@ -18,7 +18,7 @@
</methodsynopsis>
<simpara>
The function expects to be given a string containing an English date
- format and will try to parse that format into a UNIX timestamp relative
+ format and will try to parse that format into a Unix timestamp relative
to the timestamp given in <parameter>now</parameter>, or the current time
if none is supplied. Upon failure, <literal>-1</literal> is returned.
</simpara>
@@ -71,7 +71,7 @@
the dates that correspond to the minimum and maximum values for
a 32-bit signed integer.)
Additionally, not all platforms support negative timestamps, therefore
- your date range may be limited to no earlier than the unix epoch. This
+ your date range may be limited to no earlier than the Unix epoch. This
means that e.g. dates prior to Jan 1, 1970 will not work on Windows,
some Linux distributions, and a few other operating systems.
</para>
Index: phpdoc/en/reference/datetime/functions/time.xml
diff -u phpdoc/en/reference/datetime/functions/time.xml:1.3
phpdoc/en/reference/datetime/functions/time.xml:1.4
--- phpdoc/en/reference/datetime/functions/time.xml:1.3 Mon Nov 3 14:12:25 2003
+++ phpdoc/en/reference/datetime/functions/time.xml Sat Dec 20 23:21:43 2003
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
<!-- splitted from ./en/functions/datetime.xml, last change in rev 1.2 -->
<refentry id="function.time">
<refnamediv>
<refname>time</refname>
- <refpurpose>Return current UNIX timestamp</refpurpose>
+ <refpurpose>Return current Unix timestamp</refpurpose>
</refnamediv>
<refsect1>
<title>Description</title>
Index: phpdoc/en/reference/dbplus/reference.xml
diff -u phpdoc/en/reference/dbplus/reference.xml:1.6
phpdoc/en/reference/dbplus/reference.xml:1.7
--- phpdoc/en/reference/dbplus/reference.xml:1.6 Tue May 13 07:17:18 2003
+++ phpdoc/en/reference/dbplus/reference.xml Sat Dec 20 23:21:44 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
<reference id="ref.dbplus">
<title>DB++ Functions</title>
<titleabbrev>DB++</titleabbrev>
@@ -36,7 +36,7 @@
<ulink url="&url.dbplus.company;">Concept asa</ulink> provides
<ulink url="&url.dbplus.download;">db++ Demo versions</ulink>
and <ulink url="&url.dbplus.documentation;">documentation</ulink>
- for Linux, some other UNIX versions. There is also a Windows
+ for Linux, some other Unix versions. There is also a Windows
version of db++, but this extension doesn't support it (yet).
</para>
</section>
Index: phpdoc/en/reference/errorfunc/ini.xml
diff -u phpdoc/en/reference/errorfunc/ini.xml:1.18
phpdoc/en/reference/errorfunc/ini.xml:1.19
--- phpdoc/en/reference/errorfunc/ini.xml:1.18 Sat Dec 20 20:05:37 2003
+++ phpdoc/en/reference/errorfunc/ini.xml Sat Dec 20 23:21:45 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.18 $ -->
+<!-- $Revision: 1.19 $ -->
<section id="errorfunc.configuration">
&reftitle.runtime;
&extension.runtime;
@@ -383,7 +383,7 @@
<para>
Name of the file where script errors should be logged. If the
special value <literal>syslog</literal> is used, the errors
- are sent to the system logger instead. On UNIX, this means
+ are sent to the system logger instead. On Unix, this means
syslog(3) and on Windows NT it means the event log. The
system logger is not supported on Windows 95. See also:
<function>syslog</function>.
Index: phpdoc/en/reference/filesystem/functions/chmod.xml
diff -u phpdoc/en/reference/filesystem/functions/chmod.xml:1.9
phpdoc/en/reference/filesystem/functions/chmod.xml:1.10
--- phpdoc/en/reference/filesystem/functions/chmod.xml:1.9 Mon Dec 15 11:49:45
2003
+++ phpdoc/en/reference/filesystem/functions/chmod.xml Sat Dec 20 23:21:46 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
+<!-- $Revision: 1.10 $ -->
<!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.2 -->
<refentry id="function.chmod">
<refnamediv>
@@ -46,7 +46,7 @@
grant execute rights, number 2 means that you make the file
writeable, number 4 means that you make the file readable. Add
up these numbers to specify needed rights. You can also read more
- about modes on UNIX systems with 'man 1 chmod' and 'man 2 chmod'.
+ about modes on Unix systems with 'man 1 chmod' and 'man 2 chmod'.
</para>
<para>
<informalexample>
Index: phpdoc/en/reference/filesystem/functions/fnmatch.xml
diff -u phpdoc/en/reference/filesystem/functions/fnmatch.xml:1.5
phpdoc/en/reference/filesystem/functions/fnmatch.xml:1.6
--- phpdoc/en/reference/filesystem/functions/fnmatch.xml:1.5 Wed Dec 17 09:32:15
2003
+++ phpdoc/en/reference/filesystem/functions/fnmatch.xml Sat Dec 20 23:21:46
2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
<refentry id="function.fnmatch">
<refnamediv>
<refname>fnmatch</refname>
@@ -43,7 +43,7 @@
See also <function>glob</function>,
<function>ereg</function>,
<function>preg_match</function>
- and the unix manpage on <literal>fnmatch(3)</literal> for flag names
+ and the Unix manpage on <literal>fnmatch(3)</literal> for flag names
(as long as they are not documented here <!-- TODO hartmut -->).
</para>
</refsect1>
Index: phpdoc/en/reference/filesystem/functions/linkinfo.xml
diff -u phpdoc/en/reference/filesystem/functions/linkinfo.xml:1.4
phpdoc/en/reference/filesystem/functions/linkinfo.xml:1.5
--- phpdoc/en/reference/filesystem/functions/linkinfo.xml:1.4 Sat Aug 16 17:42:13
2003
+++ phpdoc/en/reference/filesystem/functions/linkinfo.xml Sat Dec 20 23:21:46
2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
<!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.2 -->
<refentry id="function.linkinfo">
<refnamediv>
@@ -14,7 +14,7 @@
</methodsynopsis>
<para>
<function>linkinfo</function> returns the st_dev field of the
- UNIX C stat structure returned by the lstat system call. This
+ Unix C stat structure returned by the lstat system call. This
function is used to verify if a link (pointed to by
<parameter>path</parameter>) really exists (using the same method
as the S_ISLNK macro defined in stat.h). Returns 0 or &false; in
Index: phpdoc/en/reference/filesystem/functions/stat.xml
diff -u phpdoc/en/reference/filesystem/functions/stat.xml:1.9
phpdoc/en/reference/filesystem/functions/stat.xml:1.10
--- phpdoc/en/reference/filesystem/functions/stat.xml:1.9 Sat Nov 29 11:39:55
2003
+++ phpdoc/en/reference/filesystem/functions/stat.xml Sat Dec 20 23:21:46 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
+<!-- $Revision: 1.10 $ -->
<!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.2 -->
<refentry id="function.stat">
<refnamediv>
@@ -87,17 +87,17 @@
<row>
<entry>8</entry>
<entry>atime</entry>
- <entry>time of last access (unix timestamp)</entry>
+ <entry>time of last access (Unix timestamp)</entry>
</row>
<row>
<entry>9</entry>
<entry>mtime</entry>
- <entry>time of last modification (unix timestamp)</entry>
+ <entry>time of last modification (Unix timestamp)</entry>
</row>
<row>
<entry>10</entry>
<entry>ctime</entry>
- <entry>time of last change (unix timestamp)</entry>
+ <entry>time of last change (Unix timestamp)</entry>
</row>
<row>
<entry>11</entry>
Index: phpdoc/en/reference/ftp/functions/ftp-mdtm.xml
diff -u phpdoc/en/reference/ftp/functions/ftp-mdtm.xml:1.7
phpdoc/en/reference/ftp/functions/ftp-mdtm.xml:1.8
--- phpdoc/en/reference/ftp/functions/ftp-mdtm.xml:1.7 Fri Dec 19 09:40:54 2003
+++ phpdoc/en/reference/ftp/functions/ftp-mdtm.xml Sat Dec 20 23:21:47 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
<!-- splitted from ./en/functions/ftp.xml, last change in rev 1.2 -->
<refentry id="function.ftp-mdtm">
<refnamediv>
@@ -15,11 +15,11 @@
</methodsynopsis>
<para>
<function>ftp_mdtm</function> checks the last modified time for a
- file, and returns it as a UNIX timestamp. If an error occurs, or
+ file, and returns it as a Unix timestamp. If an error occurs, or
the file does not exist, -1 is returned.
</para>
<para>
- Returns a UNIX timestamp on success, or -1 on error.
+ Returns a Unix timestamp on success, or -1 on error.
</para>
<para>
<example>
Index: phpdoc/en/reference/ftp/functions/ftp-systype.xml
diff -u phpdoc/en/reference/ftp/functions/ftp-systype.xml:1.4
phpdoc/en/reference/ftp/functions/ftp-systype.xml:1.5
--- phpdoc/en/reference/ftp/functions/ftp-systype.xml:1.4 Fri Dec 19 09:40:54
2003
+++ phpdoc/en/reference/ftp/functions/ftp-systype.xml Sat Dec 20 23:21:47 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
<!-- splitted from ./en/functions/ftp.xml, last change in rev 1.2 -->
<refentry id="function.ftp-systype">
<refnamediv>
@@ -23,12 +23,12 @@
<?php
// ftp connection
-$ftp = ftp_connect('ftp.keliglia.com');
+$ftp = ftp_connect('ftp.example.com');
ftp_login($ftp, 'user', 'password');
// get the system type
if ($type = ftp_systype($ftp)) {
- echo "Keliglia is powered by $type\n";
+ echo "Example.com is powered by $type\n";
} else {
echo "Couldn't get the systype";
}
@@ -41,7 +41,7 @@
</para>
<screen>
<![CDATA[
-Keliglia is powered by UNIX
+Example.com is powered by UNIX
]]>
</screen>
</example>
Index: phpdoc/en/reference/http/functions/setcookie.xml
diff -u phpdoc/en/reference/http/functions/setcookie.xml:1.26
phpdoc/en/reference/http/functions/setcookie.xml:1.27
--- phpdoc/en/reference/http/functions/setcookie.xml:1.26 Mon Dec 15 11:50:35
2003
+++ phpdoc/en/reference/http/functions/setcookie.xml Sat Dec 20 23:21:48 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.26 $ -->
+<!-- $Revision: 1.27 $ -->
<!-- splitted from ./en/functions/http.xml, last change in rev 1.2 -->
<refentry id="function.setcookie">
<refnamediv>
@@ -88,7 +88,7 @@
<row>
<entry><parameter>expire</parameter></entry>
<entry>
- The time the cookie expires. This is a unix timestamp so is
+ The time the cookie expires. This is a Unix timestamp so is
in number of seconds since the epoch. In otherwords, you'll
most likely set this with the <function>time</function> function
plus the number of seconds before you want it to expire. Or
@@ -311,7 +311,7 @@
</para>
<para>
You may notice the <parameter>expire</parameter> parameter takes on a
- unix timestamp, as opposed to the date format <literal>Wdy, DD-Mon-YYYY
+ Unix timestamp, as opposed to the date format <literal>Wdy, DD-Mon-YYYY
HH:MM:SS GMT</literal>, this is because PHP does this conversion
internally.
</para>
Index: phpdoc/en/reference/ibase/functions/ibase-fetch-assoc.xml
diff -u phpdoc/en/reference/ibase/functions/ibase-fetch-assoc.xml:1.2
phpdoc/en/reference/ibase/functions/ibase-fetch-assoc.xml:1.3
--- phpdoc/en/reference/ibase/functions/ibase-fetch-assoc.xml:1.2 Mon Sep 1
20:05:00 2003
+++ phpdoc/en/reference/ibase/functions/ibase-fetch-assoc.xml Sat Dec 20 23:21:48
2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.ibase-fetch-assoc">
<refnamediv>
<refname>ibase_fetch_assoc</refname>
@@ -32,7 +32,7 @@
<parameter>fetch_flag</parameter> is a combination of the constants IBASE_TEXT
and IBASE_UNIXTIME
ORed together. Passing IBASE_TEXT will cause this function to return BLOB contents
instead of BLOB ids. Passing IBASE_UNIXTIME will cause this function to return
- date/time values as UNIX timestamps instead of as formatted strings.
+ date/time values as Unix timestamps instead of as formatted strings.
</para>
<para>
See also
Index: phpdoc/en/reference/ibase/functions/ibase-fetch-object.xml
diff -u phpdoc/en/reference/ibase/functions/ibase-fetch-object.xml:1.7
phpdoc/en/reference/ibase/functions/ibase-fetch-object.xml:1.8
--- phpdoc/en/reference/ibase/functions/ibase-fetch-object.xml:1.7 Mon Dec 15
11:50:36 2003
+++ phpdoc/en/reference/ibase/functions/ibase-fetch-object.xml Sat Dec 20 23:21:48
2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
<!-- splitted from ./en/functions/ibase.xml, last change in rev 1.9 -->
<refentry id="function.ibase-fetch-object">
<refnamediv>
@@ -43,7 +43,7 @@
<parameter>fetch_flag</parameter> is a combination of the constants IBASE_TEXT
and IBASE_UNIXTIME
ORed together. Passing IBASE_TEXT will cause this function to return BLOB contents
instead of BLOB ids. Passing IBASE_UNIXTIME will cause this function to return
- date/time values as UNIX timestamps instead of as formatted strings.
+ date/time values as Unix timestamps instead of as formatted strings.
</para>
<para>
See also
Index: phpdoc/en/reference/ibase/functions/ibase-fetch-row.xml
diff -u phpdoc/en/reference/ibase/functions/ibase-fetch-row.xml:1.5
phpdoc/en/reference/ibase/functions/ibase-fetch-row.xml:1.6
--- phpdoc/en/reference/ibase/functions/ibase-fetch-row.xml:1.5 Tue Sep 2 07:56:13
2003
+++ phpdoc/en/reference/ibase/functions/ibase-fetch-row.xml Sat Dec 20 23:21:48
2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
<!-- splitted from ./en/functions/ibase.xml, last change in rev 1.2 -->
<refentry id="function.ibase-fetch-row">
<refnamediv>
@@ -33,7 +33,7 @@
<parameter>fetch_flag</parameter> is a combination of the constants IBASE_TEXT
and IBASE_UNIXTIME
ORed together. Passing IBASE_TEXT will cause this function to return BLOB contents
instead of BLOB ids. Passing IBASE_UNIXTIME will cause this function to return
- date/time values as UNIX timestamps instead of as formatted strings.
+ date/time values as Unix timestamps instead of as formatted strings.
</para>
<para>
See also
Index: phpdoc/en/reference/info/functions/dl.xml
diff -u phpdoc/en/reference/info/functions/dl.xml:1.15
phpdoc/en/reference/info/functions/dl.xml:1.16
--- phpdoc/en/reference/info/functions/dl.xml:1.15 Thu Dec 18 12:45:15 2003
+++ phpdoc/en/reference/info/functions/dl.xml Sat Dec 20 23:21:49 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.15 $ -->
+<!-- $Revision: 1.16 $ -->
<!-- splitted from ./en/functions/info.xml, last change in rev 1.29 -->
<refentry id="function.dl">
<refnamediv>
@@ -19,7 +19,7 @@
load which also depends on your platform. For example, the <link
linkend="ref.sockets">sockets</link> extension (if compiled as a shared
module, not the default!) would be called <filename>sockets.so</filename>
- on unix platforms whereas it is called
+ on Unix platforms whereas it is called
<filename>php_sockets.dll</filename> on the Windows platform.
</para>
<para>
@@ -111,7 +111,7 @@
</note>
<note>
<para>
- <function>dl</function> is case sensitive on unix platforms.
+ <function>dl</function> is case sensitive on Unix platforms.
</para>
</note>
¬e.sm.disabled;
Index: phpdoc/en/reference/ming/configure.xml
diff -u phpdoc/en/reference/ming/configure.xml:1.2
phpdoc/en/reference/ming/configure.xml:1.3
--- phpdoc/en/reference/ming/configure.xml:1.2 Sat Dec 20 20:22:53 2003
+++ phpdoc/en/reference/ming/configure.xml Sat Dec 20 23:21:50 2003
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
<section id="ming.install">
&reftitle.install;
<para>
<example>
- <title>built into PHP (unix)</title>
+ <title>built into PHP (Unix)</title>
<literallayout>
<