didou Sun Jun 10 02:06:13 2007 UTC
Modified files:
/phpdoc/en/reference/network/functions dns-get-record.xml
header.xml openlog.xml
Log:
Fix various problems
# and now, time for bed
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/network/functions/dns-get-record.xml?r1=1.23&r2=1.24&diff_format=u
Index: phpdoc/en/reference/network/functions/dns-get-record.xml
diff -u phpdoc/en/reference/network/functions/dns-get-record.xml:1.23
phpdoc/en/reference/network/functions/dns-get-record.xml:1.24
--- phpdoc/en/reference/network/functions/dns-get-record.xml:1.23 Sun Jun
10 01:57:08 2007
+++ phpdoc/en/reference/network/functions/dns-get-record.xml Sun Jun 10
02:06:13 2007
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.23 $ -->
+<!-- $Revision: 1.24 $ -->
<refentry id="function.dns-get-record">
<refnamediv>
<refname>dns_get_record</refname>
@@ -311,16 +311,16 @@
]]>
</screen>
</example>
- <simpara>
- Since it's very common to want the IP address of a mail server
- once the MX record has been resolved, <function>dns_get_record</function>
- also returns an array in <parameter>addtl</parameter> which
- contains associate records. <parameter>authns</parameter>
- is returned as well containing a list of authoritative name
- servers.
- </simpara>
<example>
<title>Using <function>dns_get_record</function> and DNS_ANY</title>
+ <para>
+ Since it's very common to want the IP address of a mail server
+ once the MX record has been resolved, <function>dns_get_record</function>
+ also returns an array in <parameter>addtl</parameter> which
+ contains associate records. <parameter>authns</parameter>
+ is returned as well containing a list of authoritative name
+ servers.
+ </para>
<programlisting role="php">
<![CDATA[
<?php
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/network/functions/header.xml?r1=1.3&r2=1.4&diff_format=u
Index: phpdoc/en/reference/network/functions/header.xml
diff -u phpdoc/en/reference/network/functions/header.xml:1.3
phpdoc/en/reference/network/functions/header.xml:1.4
--- phpdoc/en/reference/network/functions/header.xml:1.3 Sun Jun 10
01:57:09 2007
+++ phpdoc/en/reference/network/functions/header.xml Sun Jun 10 02:06:13 2007
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
<refentry id="function.header">
<refnamediv>
<refname>header</refname>
@@ -213,22 +213,24 @@
?>
]]>
</programlisting>
- <note>
- <para>
- You may find that your pages aren't cached even if you don't
- output all of the headers above. There are a number of options
- that users may be able to set for their browser that change its
- default caching behavior. By sending the headers above, you should
- override any settings that may otherwise cause the output of your
- script to be cached.
- </para>
- <para>
- Additionally, <function>session_cache_limiter</function> and
- the <literal>session.cache_limiter</literal> configuration
- setting can be used to automatically generate the correct
- caching-related headers when sessions are being used.
- </para>
- </note>
+ <para>
+ <note>
+ <para>
+ You may find that your pages aren't cached even if you don't
+ output all of the headers above. There are a number of options
+ that users may be able to set for their browser that change its
+ default caching behavior. By sending the headers above, you should
+ override any settings that may otherwise cause the output of your
+ script to be cached.
+ </para>
+ <para>
+ Additionally, <function>session_cache_limiter</function> and
+ the <literal>session.cache_limiter</literal> configuration
+ setting can be used to automatically generate the correct
+ caching-related headers when sessions are being used.
+ </para>
+ </note>
+ </para>
</example>
</para>
</refsect1>
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/network/functions/openlog.xml?r1=1.9&r2=1.10&diff_format=u
Index: phpdoc/en/reference/network/functions/openlog.xml
diff -u phpdoc/en/reference/network/functions/openlog.xml:1.9
phpdoc/en/reference/network/functions/openlog.xml:1.10
--- phpdoc/en/reference/network/functions/openlog.xml:1.9 Sun Jun 10
01:57:09 2007
+++ phpdoc/en/reference/network/functions/openlog.xml Sun Jun 10 02:06:13 2007
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
+<!-- $Revision: 1.10 $ -->
<refentry id="function.openlog">
<refnamediv>
<refname>openlog</refname>
@@ -57,26 +57,26 @@
<row>
<entry><constant>LOG_CONS</constant></entry>
<entry>
- if there is an error while sending data to the system
<constant>LOGger,
+ if there is an error while sending data to the system logger,
write directly to the system console
</entry>
</row>
<row>
<entry><constant>LOG_NDELAY</constant></entry>
<entry>
- open the connection to the <constant>LOGger immediately
+ open the connection to the logger immediately
</entry>
</row>
<row>
<entry><constant>LOG_ODELAY</constant></entry>
<entry>
(default) delay opening the connection until the first
- message is <constant>LOGged
+ message is logged
</entry>
</row>
<row>
<entry><constant>LOG_PERROR</constant></entry>
- <entry>print <constant>LOG message also to standard error</entry>
+ <entry>print log message also to standard error</entry>
</row>
<row>
<entry><constant>LOG_PID</constant></entry>
