[DOC-CVS] [doc-en] master: geoip: fix XML to get remove of useless wrapping para tags (#5119)
[email protected] (Gina Peter Banyard via GitHub)
| Newsgroups | php.doc.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: Gina Peter Banyard (Girgias)
Committer: GitHub (web-flow)
Pusher: Girgias
Date: 2026-01-16T06:24:12Z
Commit: https://github.com/php/doc-en/commit/66458042beed566a850f91dde06a6b8311233ade
Raw diff: https://github.com/php/doc-en/commit/66458042beed566a850f91dde06a6b8311233ade.diff
geoip: fix XML to get remove of useless wrapping para tags (#5119)
Changed paths:
M reference/geoip/functions/geoip-asnum-by-name.xml
M reference/geoip/functions/geoip-continent-code-by-name.xml
M reference/geoip/functions/geoip-country-code-by-name.xml
M reference/geoip/functions/geoip-country-code3-by-name.xml
M reference/geoip/functions/geoip-country-name-by-name.xml
M reference/geoip/functions/geoip-database-info.xml
M reference/geoip/functions/geoip-db-avail.xml
M reference/geoip/functions/geoip-db-filename.xml
M reference/geoip/functions/geoip-db-get-all-info.xml
M reference/geoip/functions/geoip-domain-by-name.xml
M reference/geoip/functions/geoip-id-by-name.xml
M reference/geoip/functions/geoip-isp-by-name.xml
M reference/geoip/functions/geoip-netspeedcell-by-name.xml
M reference/geoip/functions/geoip-org-by-name.xml
M reference/geoip/functions/geoip-record-by-name.xml
M reference/geoip/functions/geoip-region-by-name.xml
M reference/geoip/functions/geoip-region-name-by-code.xml
M reference/geoip/functions/geoip-setup-custom-directory.xml
M reference/geoip/functions/geoip-time-zone-by-country-and-region.xml
M reference/geoip/ini.xml
Diff:
diff --git a/reference/geoip/functions/geoip-asnum-by-name.xml b/reference/geoip/functions/geoip-asnum-by-name.xml
index f9be2a5ec358..cb275b6450fe 100644
--- a/reference/geoip/functions/geoip-asnum-by-name.xml
+++ b/reference/geoip/functions/geoip-asnum-by-name.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<refentry xml:id="function.geoip-asnum-by-name" xmlns="http://docbook.org/ns/docbook">
+<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.geoip-asnum-by-name">
<refnamediv>
<refname>geoip_asnum_by_name</refname>
<refpurpose>Get the Autonomous System Numbers (ASN)</refpurpose>
@@ -16,22 +16,20 @@
The <function>geoip_asnum_by_name</function> function will return the Autonomous
System Numbers (ASN) associated with an IP address.
</para>
-
+
</refsect1>
<refsect1 role="parameters">
&reftitle.parameters;
- <para>
- <variablelist>
- <varlistentry>
- <term><parameter>hostname</parameter></term>
- <listitem>
- <para>
- The hostname or IP address.
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- </para>
+ <variablelist>
+ <varlistentry>
+ <term><parameter>hostname</parameter></term>
+ <listitem>
+ <para>
+ The hostname or IP address.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
</refsect1>
<refsect1 role="returnvalues">
&reftitle.returnvalues;
@@ -43,13 +41,12 @@
<refsect1 role="examples">
&reftitle.examples;
- <para>
- <example>
- <title>A <function>geoip_asnum_by_name</function> example</title>
- <para>
- This will output the ASN of the host www.example.com.
- </para>
- <programlisting role="php">
+ <example>
+ <title>A <function>geoip_asnum_by_name</function> example</title>
+ <para>
+ This will output the ASN of the host www.example.com.
+ </para>
+ <programlisting role="php">
<![CDATA[
<?php
$asn = geoip_asnum_by_name('www.example.com');
@@ -59,19 +56,17 @@ if ($asn) {
}
?>
]]>
- </programlisting>
- &example.outputs;
- <screen>
+ </programlisting>
+ &example.outputs;
+ <screen>
<![CDATA[
The ASN is: AS15133 EdgeCast Networks, Inc
]]>
- </screen>
- </example>
- </para>
+ </screen>
+ </example>
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/geoip/functions/geoip-continent-code-by-name.xml b/reference/geoip/functions/geoip-continent-code-by-name.xml
index dc909a9d532d..d3195617c086 100644
--- a/reference/geoip/functions/geoip-continent-code-by-name.xml
+++ b/reference/geoip/functions/geoip-continent-code-by-name.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<refentry xml:id="function.geoip-continent-code-by-name" xmlns="http://docbook.org/ns/docbook">
+<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.geoip-continent-code-by-name">
<refnamediv>
<refname>geoip_continent_code_by_name</refname>
<refpurpose>Get the two letter continent code</refpurpose>
@@ -20,18 +20,16 @@
</refsect1>
<refsect1 role="parameters">
&reftitle.parameters;
- <para>
- <variablelist>
- <varlistentry>
- <term><parameter>hostname</parameter></term>
- <listitem>
- <para>
- The hostname or IP address whose location is to be looked-up.
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- </para>
+ <variablelist>
+ <varlistentry>
+ <term><parameter>hostname</parameter></term>
+ <listitem>
+ <para>
+ The hostname or IP address whose location is to be looked-up.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
</refsect1>
<refsect1 role="returnvalues">
&reftitle.returnvalues;
@@ -84,13 +82,12 @@
<refsect1 role="examples">
&reftitle.examples;
- <para>
- <example>
- <title>A <function>geoip_continent_code_by_name</function> example</title>
- <para>
- This will print where the host example.com is located.
- </para>
- <programlisting role="php">
+ <example>
+ <title>A <function>geoip_continent_code_by_name</function> example</title>
+ <para>
+ This will print where the host example.com is located.
+ </para>
+ <programlisting role="php">
<![CDATA[
<?php
$continent = geoip_continent_code_by_name('www.example.com');
@@ -99,28 +96,24 @@ if ($continent) {
}
?>
]]>
- </programlisting>
- &example.outputs;
- <screen>
+ </programlisting>
+ &example.outputs;
+ <screen>
<![CDATA[
This host is located in: NA
]]>
- </screen>
- </example>
- </para>
+ </screen>
+ </example>
</refsect1>
<refsect1 role="seealso">
&reftitle.seealso;
- <para>
- <simplelist>
- <member><function>geoip_country_code_by_name</function></member>
- </simplelist>
- </para>
+ <simplelist>
+ <member><function>geoip_country_code_by_name</function></member>
+ </simplelist>
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/geoip/functions/geoip-country-code-by-name.xml b/reference/geoip/functions/geoip-country-code-by-name.xml
index 1b2370713080..93f65903d44c 100644
--- a/reference/geoip/functions/geoip-country-code-by-name.xml
+++ b/reference/geoip/functions/geoip-country-code-by-name.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<refentry xml:id="function.geoip-country-code-by-name" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.geoip-country-code-by-name">
<refnamediv>
<refname>geoip_country_code_by_name</refname>
<refpurpose>Get the two letter country code</refpurpose>
@@ -20,36 +20,33 @@
</refsect1>
<refsect1 role="parameters">
&reftitle.parameters;
- <para>
- <variablelist>
- <varlistentry>
- <term><parameter>hostname</parameter></term>
- <listitem>
- <para>
- The hostname or IP address whose location is to be looked-up.
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- </para>
+ <variablelist>
+ <varlistentry>
+ <term><parameter>hostname</parameter></term>
+ <listitem>
+ <para>
+ The hostname or IP address whose location is to be looked-up.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
</refsect1>
<refsect1 role="returnvalues">
&reftitle.returnvalues;
<para>
- Returns the two letter ISO country code on success, or &false;
+ Returns the two letter ISO country code on success, or &false;
if the address cannot be found in the database.
</para>
</refsect1>
<refsect1 role="examples">
&reftitle.examples;
- <para>
- <example>
- <title>A <function>geoip_country_code_by_name</function> example</title>
- <para>
- This will print where the host example.com is located.
- </para>
- <programlisting role="php">
+ <example>
+ <title>A <function>geoip_country_code_by_name</function> example</title>
+ <para>
+ This will print where the host example.com is located.
+ </para>
+ <programlisting role="php">
<![CDATA[
<?php
$country = geoip_country_code_by_name('www.example.com');
@@ -58,17 +55,16 @@ if ($country) {
}
?>
]]>
- </programlisting>
- &example.outputs;
- <screen>
+ </programlisting>
+ &example.outputs;
+ <screen>
<![CDATA[
This host is located in: US
]]>
- </screen>
- </example>
- </para>
+ </screen>
+ </example>
</refsect1>
-
+
<refsect1 role="notes">
&reftitle.notes;
<caution>
@@ -82,16 +78,13 @@ This host is located in: US
<refsect1 role="seealso">
&reftitle.seealso;
- <para>
- <simplelist>
- <member><function>geoip_country_code3_by_name</function></member>
- <member><function>geoip_country_name_by_name</function></member>
- </simplelist>
- </para>
+ <simplelist>
+ <member><function>geoip_country_code3_by_name</function></member>
+ <member><function>geoip_country_name_by_name</function></member>
+ </simplelist>
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/geoip/functions/geoip-country-code3-by-name.xml b/reference/geoip/functions/geoip-country-code3-by-name.xml
index a7b941d25814..6a23f4fb0785 100644
--- a/reference/geoip/functions/geoip-country-code3-by-name.xml
+++ b/reference/geoip/functions/geoip-country-code3-by-name.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<refentry xml:id="function.geoip-country-code3-by-name" xmlns="http://docbook.org/ns/docbook">
+<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.geoip-country-code3-by-name">
<refnamediv>
<refname>geoip_country_code3_by_name</refname>
<refpurpose>Get the three letter country code</refpurpose>
@@ -20,36 +20,33 @@
</refsect1>
<refsect1 role="parameters">
&reftitle.parameters;
- <para>
- <variablelist>
- <varlistentry>
- <term><parameter>hostname</parameter></term>
- <listitem>
- <para>
- The hostname or IP address whose location is to be looked-up.
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- </para>
+ <variablelist>
+ <varlistentry>
+ <term><parameter>hostname</parameter></term>
+ <listitem>
+ <para>
+ The hostname or IP address whose location is to be looked-up.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
</refsect1>
<refsect1 role="returnvalues">
&reftitle.returnvalues;
<para>
- Returns the three letter country code on success, or &false;
+ Returns the three letter country code on success, or &false;
if the address cannot be found in the database.
</para>
</refsect1>
<refsect1 role="examples">
&reftitle.examples;
- <para>
- <example>
- <title>A <function>geoip_country_code3_by_name</function> example</title>
- <para>
- This will print where the host example.com is located.
- </para>
- <programlisting role="php">
+ <example>
+ <title>A <function>geoip_country_code3_by_name</function> example</title>
+ <para>
+ This will print where the host example.com is located.
+ </para>
+ <programlisting role="php">
<![CDATA[
<?php
$country = geoip_country_code3_by_name('www.example.com');
@@ -58,29 +55,25 @@ if ($country) {
}
?>
]]>
- </programlisting>
- &example.outputs;
- <screen>
+ </programlisting>
+ &example.outputs;
+ <screen>
<![CDATA[
This host is located in: USA
]]>
- </screen>
- </example>
- </para>
+ </screen>
+ </example>
</refsect1>
<refsect1 role="seealso">
&reftitle.seealso;
- <para>
- <simplelist>
- <member><function>geoip_country_code_by_name</function></member>
- <member><function>geoip_country_name_by_name</function></member>
- </simplelist>
- </para>
+ <simplelist>
+ <member><function>geoip_country_code_by_name</function></member>
+ <member><function>geoip_country_name_by_name</function></member>
+ </simplelist>
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/geoip/functions/geoip-country-name-by-name.xml b/reference/geoip/functions/geoip-country-name-by-name.xml
index f5897f46c4aa..39d74942ff10 100644
--- a/reference/geoip/functions/geoip-country-name-by-name.xml
+++ b/reference/geoip/functions/geoip-country-name-by-name.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<refentry xml:id="function.geoip-country-name-by-name" xmlns="http://docbook.org/ns/docbook">
+<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.geoip-country-name-by-name">
<refnamediv>
<refname>geoip_country_name_by_name</refname>
<refpurpose>Get the full country name</refpurpose>
@@ -20,36 +20,33 @@
</refsect1>
<refsect1 role="parameters">
&reftitle.parameters;
- <para>
- <variablelist>
- <varlistentry>
- <term><parameter>hostname</parameter></term>
- <listitem>
- <para>
- The hostname or IP address whose location is to be looked-up.
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- </para>
+ <variablelist>
+ <varlistentry>
+ <term><parameter>hostname</parameter></term>
+ <listitem>
+ <para>
+ The hostname or IP address whose location is to be looked-up.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
</refsect1>
<refsect1 role="returnvalues">
&reftitle.returnvalues;
<para>
- Returns the country name on success, or &false; if the address cannot
+ Returns the country name on success, or &false; if the address cannot
be found in the database.
</para>
</refsect1>
<refsect1 role="examples">
&reftitle.examples;
- <para>
- <example>
- <title>A <function>geoip_country_name_by_name</function> example</title>
- <para>
- This will print where the host example.com is located.
- </para>
- <programlisting role="php">
+ <example>
+ <title>A <function>geoip_country_name_by_name</function> example</title>
+ <para>
+ This will print where the host example.com is located.
+ </para>
+ <programlisting role="php">
<![CDATA[
<?php
$country = geoip_country_name_by_name('www.example.com');
@@ -58,29 +55,25 @@ if ($country) {
}
?>
]]>
- </programlisting>
- &example.outputs;
- <screen>
+ </programlisting>
+ &example.outputs;
+ <screen>
<![CDATA[
This host is located in: United States
]]>
- </screen>
- </example>
- </para>
+ </screen>
+ </example>
</refsect1>
<refsect1 role="seealso">
&reftitle.seealso;
- <para>
- <simplelist>
- <member><function>geoip_country_code_by_name</function></member>
- <member><function>geoip_country_code3_by_name</function></member>
- </simplelist>
- </para>
+ <simplelist>
+ <member><function>geoip_country_code_by_name</function></member>
+ <member><function>geoip_country_code3_by_name</function></member>
+ </simplelist>
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/geoip/functions/geoip-database-info.xml b/reference/geoip/functions/geoip-database-info.xml
index 0abe009bba8c..27397da2f1e4 100644
--- a/reference/geoip/functions/geoip-database-info.xml
+++ b/reference/geoip/functions/geoip-database-info.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<refentry xml:id="function.geoip-database-info" xmlns="http://docbook.org/ns/docbook">
+<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.geoip-database-info">
<refnamediv>
<refname>geoip_database_info</refname>
<refpurpose>Get GeoIP Database information</refpurpose>
@@ -16,7 +16,7 @@
The <function>geoip_database_info</function> function returns the corresponding
GeoIP Database version as it is defined inside the binary file.
</para>
-
+
<para>
If this function is called without arguments, it returns the version
of the GeoIP Free Country Edition.
@@ -25,21 +25,19 @@
</refsect1>
<refsect1 role="parameters">
&reftitle.parameters;
- <para>
- <variablelist>
- <varlistentry>
- <term><parameter>database</parameter></term>
- <listitem>
- <para>
- The database type as an integer. You can use the
- <link linkend="geoip.constants">various constants</link> defined with
- this extension (ie: GEOIP_*_EDITION).
- </para>
+ <variablelist>
+ <varlistentry>
+ <term><parameter>database</parameter></term>
+ <listitem>
+ <para>
+ The database type as an integer. You can use the
+ <link linkend="geoip.constants">various constants</link> defined with
+ this extension (ie: GEOIP_*_EDITION).
+ </para>
- </listitem>
- </varlistentry>
- </variablelist>
- </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
</refsect1>
<refsect1 role="returnvalues">
&reftitle.returnvalues;
@@ -50,31 +48,28 @@
<refsect1 role="examples">
&reftitle.examples;
- <para>
- <example>
- <title>A <function>geoip_database_info</function> example</title>
- <para>
- This will output information regarding the database.
- </para>
- <programlisting role="php">
+ <example>
+ <title>A <function>geoip_database_info</function> example</title>
+ <para>
+ This will output information regarding the database.
+ </para>
+ <programlisting role="php">
<![CDATA[
<?php
print geoip_database_info(GEOIP_COUNTRY_EDITION);
?>
]]>
- </programlisting>
- &example.outputs;
- <screen>
+ </programlisting>
+ &example.outputs;
+ <screen>
<![CDATA[
GEO-106FREE 20060801 Build 1 Copyright (c) 2006 MaxMind LLC All Rights Reserved
]]>
- </screen>
- </example>
- </para>
+ </screen>
+ </example>
</refsect1>
-
-</refentry>
+</refentry>
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/geoip/functions/geoip-db-avail.xml b/reference/geoip/functions/geoip-db-avail.xml
index f0aa521a95d3..5620abae694b 100644
--- a/reference/geoip/functions/geoip-db-avail.xml
+++ b/reference/geoip/functions/geoip-db-avail.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<refentry xml:id="function.geoip-db-avail" xmlns="http://docbook.org/ns/docbook">
+<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.geoip-db-avail">
<refnamediv>
<refname>geoip_db_avail</refname>
<refpurpose>Determine if GeoIP Database is available</refpurpose>
@@ -24,21 +24,19 @@
</refsect1>
<refsect1 role="parameters">
&reftitle.parameters;
- <para>
- <variablelist>
- <varlistentry>
- <term><parameter>database</parameter></term>
- <listitem>
- <para>
- The database type as an integer. You can use the
- <link linkend="geoip.constants">various constants</link> defined with
- this extension (ie: GEOIP_*_EDITION).
- </para>
+ <variablelist>
+ <varlistentry>
+ <term><parameter>database</parameter></term>
+ <listitem>
+ <para>
+ The database type as an integer. You can use the
+ <link linkend="geoip.constants">various constants</link> defined with
+ this extension (ie: GEOIP_*_EDITION).
+ </para>
- </listitem>
- </varlistentry>
- </variablelist>
- </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
</refsect1>
<refsect1 role="returnvalues">
&reftitle.returnvalues;
@@ -49,13 +47,12 @@
<refsect1 role="examples">
&reftitle.examples;
- <para>
- <example>
- <title>A <function>geoip_db_avail</function> example</title>
- <para>
- This will output the current database version string.
- </para>
- <programlisting role="php">
+ <example>
+ <title>A <function>geoip_db_avail</function> example</title>
+ <para>
+ This will output the current database version string.
+ </para>
+ <programlisting role="php">
<![CDATA[
<?php
@@ -63,19 +60,17 @@ if (geoip_db_avail(GEOIP_COUNTRY_EDITION))
print geoip_database_info(GEOIP_COUNTRY_EDITION);
?>
]]>
- </programlisting>
- &example.outputs;
- <screen>
+ </programlisting>
+ &example.outputs;
+ <screen>
<![CDATA[
GEO-106FREE 20080801 Build 1 Copyright (c) 2006 MaxMind LLC All Rights Reserved
]]>
- </screen>
- </example>
- </para>
+ </screen>
+ </example>
</refsect1>
-
-</refentry>
+</refentry>
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/geoip/functions/geoip-db-filename.xml b/reference/geoip/functions/geoip-db-filename.xml
index ea54e1fd19f7..82e38ed3628a 100644
--- a/reference/geoip/functions/geoip-db-filename.xml
+++ b/reference/geoip/functions/geoip-db-filename.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<refentry xml:id="function.geoip-db-filename" xmlns="http://docbook.org/ns/docbook">
+<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.geoip-db-filename">
<refnamediv>
<refname>geoip_db_filename</refname>
<refpurpose>Returns the filename of the corresponding GeoIP Database</refpurpose>
@@ -25,21 +25,19 @@
</refsect1>
<refsect1 role="parameters">
&reftitle.parameters;
- <para>
- <variablelist>
- <varlistentry>
- <term><parameter>database</parameter></term>
- <listitem>
- <para>
- The database type as an integer. You can use the
- <link linkend="geoip.constants">various constants</link> defined with
- this extension (ie: GEOIP_*_EDITION).
- </para>
+ <variablelist>
+ <varlistentry>
+ <term><parameter>database</parameter></term>
+ <listitem>
+ <para>
+ The database type as an integer. You can use the
+ <link linkend="geoip.constants">various constants</link> defined with
+ this extension (ie: GEOIP_*_EDITION).
+ </para>
- </listitem>
- </varlistentry>
- </variablelist>
- </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
</refsect1>
<refsect1 role="returnvalues">
&reftitle.returnvalues;
@@ -50,13 +48,12 @@
<refsect1 role="examples">
&reftitle.examples;
- <para>
- <example>
- <title>A <function>geoip_db_filename</function> example</title>
- <para>
- This will output the filename of the corresponding database.
- </para>
- <programlisting role="php">
+ <example>
+ <title>A <function>geoip_db_filename</function> example</title>
+ <para>
+ This will output the filename of the corresponding database.
+ </para>
+ <programlisting role="php">
<![CDATA[
<?php
@@ -64,19 +61,17 @@ print geoip_db_filename(GEOIP_COUNTRY_EDITION);
?>
]]>
- </programlisting>
- &example.outputs;
- <screen>
+ </programlisting>
+ &example.outputs;
+ <screen>
<![CDATA[
/usr/share/GeoIP/GeoIP.dat
]]>
- </screen>
- </example>
- </para>
+ </screen>
+ </example>
</refsect1>
-
-</refentry>
+</refentry>
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/geoip/functions/geoip-db-get-all-info.xml b/reference/geoip/functions/geoip-db-get-all-info.xml
index 4144e61bae7f..b57855142261 100644
--- a/reference/geoip/functions/geoip-db-get-all-info.xml
+++ b/reference/geoip/functions/geoip-db-get-all-info.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<refentry xml:id="function.geoip-db-get-all-info" xmlns="http://docbook.org/ns/docbook">
+<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.geoip-db-get-all-info">
<refnamediv>
<refname>geoip_db_get_all_info</refname>
<refpurpose>Returns detailed information about all GeoIP database types</refpurpose>
@@ -9,12 +9,12 @@
&reftitle.description;
<methodsynopsis>
<type>array</type><methodname>geoip_db_get_all_info</methodname>
- <void />
+ <void/>
</methodsynopsis>
<para>
- The <function>geoip_db_get_all_info</function> function will return
- detailed information as a multi-dimensional array about all the
+ The <function>geoip_db_get_all_info</function> function will return
+ detailed information as a multi-dimensional array about all the
GeoIP database types.
</para>
<para>
@@ -24,27 +24,25 @@
<para>
The names of the different keys of the returning associative array are as follows:
</para>
- <para>
- <itemizedlist>
- <listitem>
- <simpara>
- "available" -- Boolean, indicate if DB is available (see
- <function>geoip_db_avail</function>)
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- "description" -- The database description
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- "filename" -- The database filename on disk (see
- <function>geoip_db_filename</function>)
- </simpara>
- </listitem>
- </itemizedlist>
- </para>
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ "available" -- Boolean, indicate if DB is available (see
+ <function>geoip_db_avail</function>)
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ "description" -- The database description
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ "filename" -- The database filename on disk (see
+ <function>geoip_db_filename</function>)
+ </simpara>
+ </listitem>
+ </itemizedlist>
</refsect1>
@@ -62,13 +60,12 @@
<refsect1 role="examples">
&reftitle.examples;
- <para>
- <example>
- <title>A <function>geoip_db_get_all_info</function> example</title>
- <para>
- This will print the array containing all the information.
- </para>
- <programlisting role="php">
+ <example>
+ <title>A <function>geoip_db_get_all_info</function> example</title>
+ <para>
+ This will print the array containing all the information.
+ </para>
+ <programlisting role="php">
<![CDATA[
<?php
$infos = geoip_db_get_all_info();
@@ -77,9 +74,9 @@ if (is_array($infos)) {
}
?>
]]>
- </programlisting>
- &example.outputs;
- <screen>
+ </programlisting>
+ &example.outputs;
+ <screen>
<![CDATA[
array(11) {
[1]=>
@@ -105,17 +102,15 @@ array(11) {
}
}
]]>
- </screen>
- </example>
- </para>
+ </screen>
+ </example>
-<para>
- <example>
- <title>A <function>geoip_db_get_all_info</function> example</title>
- <para>
- You can use the various constants as keys to get only parts of the information.
- </para>
- <programlisting role="php">
+<example>
+ <title>A <function>geoip_db_get_all_info</function> example</title>
+ <para>
+ You can use the various constants as keys to get only parts of the information.
+ </para>
+ <programlisting role="php">
<![CDATA[
<?php
$infos = geoip_db_get_all_info();
@@ -124,19 +119,17 @@ if ($infos[GEOIP_COUNTRY_EDITION]['available']) {
}
?>
]]>
- </programlisting>
- &example.outputs;
- <screen>
+ </programlisting>
+ &example.outputs;
+ <screen>
<![CDATA[
GeoIP Country Edition
]]>
- </screen>
- </example>
- </para>
+ </screen>
+ </example>
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/geoip/functions/geoip-domain-by-name.xml b/reference/geoip/functions/geoip-domain-by-name.xml
index bde6996b111d..d7e98a7fb5ba 100644
--- a/reference/geoip/functions/geoip-domain-by-name.xml
+++ b/reference/geoip/functions/geoip-domain-by-name.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<refentry xml:id="function.geoip-domain-by-name" xmlns="http://docbook.org/ns/docbook">
+<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.geoip-domain-by-name">
<refnamediv>
<refname>geoip_domain_by_name</refname>
<refpurpose>Get the second level domain name</refpurpose>
@@ -18,25 +18,23 @@
</para>
<para>
This function is currently only available to users who have bought a commercial
- GeoIP Domain Edition. A warning will be issued if the proper database cannot be
+ GeoIP Domain Edition. A warning will be issued if the proper database cannot be
located.
</para>
-
+
</refsect1>
<refsect1 role="parameters">
&reftitle.parameters;
- <para>
- <variablelist>
- <varlistentry>
- <term><parameter>hostname</parameter></term>
- <listitem>
- <para>
- The hostname or IP address.
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- </para>
+ <variablelist>
+ <varlistentry>
+ <term><parameter>hostname</parameter></term>
+ <listitem>
+ <para>
+ The hostname or IP address.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
</refsect1>
<refsect1 role="returnvalues">
&reftitle.returnvalues;
@@ -48,13 +46,12 @@
<refsect1 role="examples">
&reftitle.examples;
- <para>
- <example>
- <title>A <function>geoip_domain_by_name</function> example</title>
- <para>
- This will output the domain associated with IP 61.106.139.1.
- </para>
- <programlisting role="php">
+ <example>
+ <title>A <function>geoip_domain_by_name</function> example</title>
+ <para>
+ This will output the domain associated with IP 61.106.139.1.
+ </para>
+ <programlisting role="php">
<![CDATA[
<?php
$domain = geoip_domain_by_name('61.106.139.1');
@@ -65,19 +62,17 @@ if ($domain) {
?>
]]>
- </programlisting>
- &example.outputs;
- <screen>
+ </programlisting>
+ &example.outputs;
+ <screen>
<![CDATA[
The domain is: von.co.kr
]]>
- </screen>
- </example>
- </para>
+ </screen>
+ </example>
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/geoip/functions/geoip-id-by-name.xml b/reference/geoip/functions/geoip-id-by-name.xml
index f74c11194a25..1f423ab52a97 100644
--- a/reference/geoip/functions/geoip-id-by-name.xml
+++ b/reference/geoip/functions/geoip-id-by-name.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<refentry xml:id="function.geoip-id-by-name" xmlns="http://docbook.org/ns/docbook">
+<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.geoip-id-by-name">
<refnamediv>
<refname>geoip_id_by_name</refname>
<refpurpose>Get the Internet connection type</refpurpose>
@@ -13,52 +13,48 @@
</methodsynopsis>
<para>
- The <function>geoip_id_by_name</function> function will return the Internet
+ The <function>geoip_id_by_name</function> function will return the Internet
connection type corresponding to a hostname or an IP address.
</para>
<para>
The return value is numeric and can be compared to the following constants:
</para>
- <para>
- <itemizedlist>
- <listitem>
- <simpara>
- GEOIP_UNKNOWN_SPEED
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- GEOIP_DIALUP_SPEED
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- GEOIP_CABLEDSL_SPEED
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- GEOIP_CORPORATE_SPEED
- </simpara>
- </listitem>
- </itemizedlist>
- </para>
-
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ GEOIP_UNKNOWN_SPEED
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ GEOIP_DIALUP_SPEED
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ GEOIP_CABLEDSL_SPEED
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ GEOIP_CORPORATE_SPEED
+ </simpara>
+ </listitem>
+ </itemizedlist>
+
</refsect1>
<refsect1 role="parameters">
&reftitle.parameters;
- <para>
- <variablelist>
- <varlistentry>
- <term><parameter>hostname</parameter></term>
- <listitem>
- <para>
- The hostname or IP address whose connection type is to be looked-up.
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- </para>
+ <variablelist>
+ <varlistentry>
+ <term><parameter>hostname</parameter></term>
+ <listitem>
+ <para>
+ The hostname or IP address whose connection type is to be looked-up.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
</refsect1>
<refsect1 role="returnvalues">
&reftitle.returnvalues;
@@ -69,13 +65,12 @@
<refsect1 role="examples">
&reftitle.examples;
- <para>
- <example>
- <title>A <function>geoip_id_by_name</function> example</title>
- <para>
- This will output the connection type of the host example.com.
- </para>
- <programlisting role="php">
+ <example>
+ <title>A <function>geoip_id_by_name</function> example</title>
+ <para>
+ This will output the connection type of the host example.com.
+ </para>
+ <programlisting role="php">
<![CDATA[
<?php
$netspeed = geoip_id_by_name('www.example.com');
@@ -98,19 +93,17 @@ switch ($netspeed) {
}
?>
]]>
- </programlisting>
- &example.outputs;
- <screen>
+ </programlisting>
+ &example.outputs;
+ <screen>
<![CDATA[
The connection type is corporate
]]>
- </screen>
- </example>
- </para>
+ </screen>
+ </example>
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/geoip/functions/geoip-isp-by-name.xml b/reference/geoip/functions/geoip-isp-by-name.xml
index 2ed93cae434d..ffc34db0702d 100644
--- a/reference/geoip/functions/geoip-isp-by-name.xml
+++ b/reference/geoip/functions/geoip-isp-by-name.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<refentry xml:id="function.geoip-isp-by-name" xmlns="http://docbook.org/ns/docbook">
+<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.geoip-isp-by-name">
<refnamediv>
<refname>geoip_isp_by_name</refname>
<refpurpose>Get the Internet Service Provider (ISP) name</refpurpose>
@@ -18,25 +18,23 @@
</para>
<para>
This function is currently only available to users who have bought a commercial
- GeoIP ISP Edition. A warning will be issued if the proper database cannot be
+ GeoIP ISP Edition. A warning will be issued if the proper database cannot be
located.
</para>
-
+
</refsect1>
<refsect1 role="parameters">
&reftitle.parameters;
- <para>
- <variablelist>
- <varlistentry>
- <term><parameter>hostname</parameter></term>
- <listitem>
- <para>
- The hostname or IP address.
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- </para>
+ <variablelist>
+ <varlistentry>
+ <term><parameter>hostname</parameter></term>
+ <listitem>
+ <para>
+ The hostname or IP address.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
</refsect1>
<refsect1 role="returnvalues">
&reftitle.returnvalues;
@@ -48,13 +46,12 @@
<refsect1 role="examples">
&reftitle.examples;
- <para>
- <example>
- <title>A <function>geoip_isp_by_name</function> example</title>
- <para>
- This will print the ISP name of host example.com.
- </para>
- <programlisting role="php">
+ <example>
+ <title>A <function>geoip_isp_by_name</function> example</title>
+ <para>
+ This will print the ISP name of host example.com.
+ </para>
+ <programlisting role="php">
<![CDATA[
<?php
$isp = geoip_isp_by_name('www.example.com');
@@ -63,19 +60,17 @@ if ($isp) {
}
?>
]]>
- </programlisting>
- &example.outputs;
- <screen>
+ </programlisting>
+ &example.outputs;
+ <screen>
<![CDATA[
This host IP is from ISP: ICANN c/o Internet Assigned Numbers Authority
]]>
- </screen>
- </example>
- </para>
+ </screen>
+ </example>
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/geoip/functions/geoip-netspeedcell-by-name.xml b/reference/geoip/functions/geoip-netspeedcell-by-name.xml
index a31a6379e663..f9c9b36b3f4c 100644
--- a/reference/geoip/functions/geoip-netspeedcell-by-name.xml
+++ b/reference/geoip/functions/geoip-netspeedcell-by-name.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<refentry xml:id="function.geoip-netspeedcell-by-name" xmlns="http://docbook.org/ns/docbook">
+<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.geoip-netspeedcell-by-name">
<refnamediv>
<refname>geoip_netspeedcell_by_name</refname>
<refpurpose>Get the Internet connection speed</refpurpose>
@@ -13,7 +13,7 @@
</methodsynopsis>
<para>
- The <function>geoip_netspeedcell_by_name</function> function will return the Internet
+ The <function>geoip_netspeedcell_by_name</function> function will return the Internet
connection type and speed corresponding to a hostname or an IP address.
</para>
<para>
@@ -21,52 +21,48 @@
</para>
<para>
This function is currently only available to users who have bought a commercial
- GeoIP NetSpeedCell Edition. A warning will be issued if the proper database cannot be
+ GeoIP NetSpeedCell Edition. A warning will be issued if the proper database cannot be
located.
</para>
<para>
The return value is a string, common values are:
</para>
- <para>
- <itemizedlist>
- <listitem>
- <simpara>
- Cable/DSL
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- Dialup
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- Cellular
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- Corporate
- </simpara>
- </listitem>
- </itemizedlist>
- </para>
-
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ Cable/DSL
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ Dialup
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ Cellular
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ Corporate
+ </simpara>
+ </listitem>
+ </itemizedlist>
+
</refsect1>
<refsect1 role="parameters">
&reftitle.parameters;
- <para>
- <variablelist>
- <varlistentry>
- <term><parameter>hostname</parameter></term>
- <listitem>
- <para>
- The hostname or IP address.
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- </para>
+ <variablelist>
+ <varlistentry>
+ <term><parameter>hostname</parameter></term>
+ <listitem>
+ <para>
+ The hostname or IP address.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
</refsect1>
<refsect1 role="returnvalues">
&reftitle.returnvalues;
@@ -78,13 +74,12 @@
<refsect1 role="examples">
&reftitle.examples;
- <para>
- <example>
- <title>A <function>geoip_netspeedcell_by_name</function> example</title>
- <para>
- This will output the connection speed of the host example.com.
- </para>
- <programlisting role="php">
+ <example>
+ <title>A <function>geoip_netspeedcell_by_name</function> example</title>
+ <para>
+ This will output the connection speed of the host example.com.
+ </para>
+ <programlisting role="php">
<![CDATA[
<?php
$netspeed = geoip_netspeedcell_by_name('www.example.com');
@@ -94,19 +89,17 @@ if ($netspeed) {
}
?>
]]>
- </programlisting>
- &example.outputs;
- <screen>
+ </programlisting>
+ &example.outputs;
+ <screen>
<![CDATA[
The connection type is: Corporate
]]>
- </screen>
- </example>
- </para>
+ </screen>
+ </example>
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/geoip/functions/geoip-org-by-name.xml b/reference/geoip/functions/geoip-org-by-name.xml
index 7a6439b1ed3e..6070ccdaa48f 100644
--- a/reference/geoip/functions/geoip-org-by-name.xml
+++ b/reference/geoip/functions/geoip-org-by-name.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<refentry xml:id="function.geoip-org-by-name" xmlns="http://docbook.org/ns/docbook">
+<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.geoip-org-by-name">
<refnamediv>
<refname>geoip_org_by_name</refname>
<refpurpose>Get the organization name</refpurpose>
@@ -18,25 +18,23 @@
</para>
<para>
This function is currently only available to users who have bought a commercial
- GeoIP Organization, ISP or AS Edition. A warning will be issued if the proper
+ GeoIP Organization, ISP or AS Edition. A warning will be issued if the proper
database cannot be located.
</para>
-
+
</refsect1>
<refsect1 role="parameters">
&reftitle.parameters;
- <para>
- <variablelist>
- <varlistentry>
- <term><parameter>hostname</parameter></term>
- <listitem>
- <para>
- The hostname or IP address.
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- </para>
+ <variablelist>
+ <varlistentry>
+ <term><parameter>hostname</parameter></term>
+ <listitem>
+ <para>
+ The hostname or IP address.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
</refsect1>
<refsect1 role="returnvalues">
&reftitle.returnvalues;
@@ -48,13 +46,12 @@
<refsect1 role="examples">
&reftitle.examples;
- <para>
- <example>
- <title>A <function>geoip_org_by_name</function> example</title>
- <para>
- This will print to whom the host example.com IP is allocated.
- </para>
- <programlisting role="php">
+ <example>
+ <title>A <function>geoip_org_by_name</function> example</title>
+ <para>
+ This will print to whom the host example.com IP is allocated.
+ </para>
+ <programlisting role="php">
<![CDATA[
<?php
$org = geoip_org_by_name('www.example.com');
@@ -63,19 +60,17 @@ if ($org) {
}
?>
]]>
- </programlisting>
- &example.outputs;
- <screen>
+ </programlisting>
+ &example.outputs;
+ <screen>
<![CDATA[
This host IP is allocated to: ICANN c/o Internet Assigned Numbers Authority
]]>
- </screen>
- </example>
- </para>
+ </screen>
+ </example>
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/geoip/functions/geoip-record-by-name.xml b/reference/geoip/functions/geoip-record-by-name.xml
index b7c5d2c5bdbc..d0d3215d07c5 100644
--- a/reference/geoip/functions/geoip-record-by-name.xml
+++ b/reference/geoip/functions/geoip-record-by-name.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<refentry xml:id="function.geoip-record-by-name" xmlns="http://docbook.org/ns/docbook">
+<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.geoip-record-by-name">
<refnamediv>
<refname>geoip_record_by_name</refname>
<refpurpose>Returns the detailed City information found in the GeoIP Database</refpurpose>
@@ -24,133 +24,126 @@
<para>
The names of the different keys of the returning associative array are as follows:
</para>
- <para>
- <itemizedlist>
- <listitem>
- <simpara>
- "continent_code" -- Two letter continent code (as of version 1.0.4 with
- libgeoip 1.4.3 or newer)
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- "country_code" -- Two letter country code (see
- <function>geoip_country_code_by_name</function>)
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- "country_code3" -- Three letter country code (see
- <function>geoip_country_code3_by_name</function>)
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- "country_name" -- The country name (see
- <function>geoip_country_name_by_name</function>)
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- "region" -- The region code (ex: CA for California)
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- "city" -- The city.
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- "postal_code" -- The Postal Code, FSA or Zip Code.
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- "latitude" -- The Latitude as signed <type>float</type>.
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- "longitude" -- The Longitude as signed <type>float</type>.
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- "dma_code" -- Designated Market Area code (USA and Canada only)
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- "area_code" -- The PSTN area code (ex: 212)
- </simpara>
- </listitem>
- </itemizedlist>
- </para>
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ "continent_code" -- Two letter continent code (as of version 1.0.4 with
+ libgeoip 1.4.3 or newer)
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ "country_code" -- Two letter country code (see
+ <function>geoip_country_code_by_name</function>)
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ "country_code3" -- Three letter country code (see
+ <function>geoip_country_code3_by_name</function>)
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ "country_name" -- The country name (see
+ <function>geoip_country_name_by_name</function>)
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ "region" -- The region code (ex: CA for California)
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ "city" -- The city.
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ "postal_code" -- The Postal Code, FSA or Zip Code.
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ "latitude" -- The Latitude as signed <type>float</type>.
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ "longitude" -- The Longitude as signed <type>float</type>.
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ "dma_code" -- Designated Market Area code (USA and Canada only)
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ "area_code" -- The PSTN area code (ex: 212)
+ </simpara>
+ </listitem>
+ </itemizedlist>
</refsect1>
<refsect1 role="parameters">
&reftitle.parameters;
- <para>
- <variablelist>
- <varlistentry>
- <term><parameter>hostname</parameter></term>
- <listitem>
- <para>
- The hostname or IP address whose record is to be looked-up.
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- </para>
+ <variablelist>
+ <varlistentry>
+ <term><parameter>hostname</parameter></term>
+ <listitem>
+ <para>
+ The hostname or IP address whose record is to be looked-up.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
</refsect1>
<refsect1 role="returnvalues">
&reftitle.returnvalues;
<para>
- Returns the associative array on success, or &false; if the address
+ Returns the associative array on success, or &false; if the address
cannot be found in the database.
</para>
</refsect1>
<refsect1 role="changelog">
&reftitle.changelog;
- <para>
- <informaltable>
- <tgroup cols="2">
- <thead>
- <row>
- <entry>&Version;</entry>
- <entry>&Description;</entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>PECL geoip 1.0.4</entry>
- <entry>
- Adding the continent_code with GeoIP Library 1.4.3 or newer only
- </entry>
- </row>
- <row>
- <entry>PECL geoip 1.0.3</entry>
- <entry>
- Adding country_code3 and country_name
- </entry>
- </row>
- </tbody>
- </tgroup>
- </informaltable>
- </para>
+ <informaltable>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>&Version;</entry>
+ <entry>&Description;</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>PECL geoip 1.0.4</entry>
+ <entry>
+ Adding the continent_code with GeoIP Library 1.4.3 or newer only
+ </entry>
+ </row>
+ <row>
+ <entry>PECL geoip 1.0.3</entry>
+ <entry>
+ Adding country_code3 and country_name
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
</refsect1>
<refsect1 role="examples">
&reftitle.examples;
- <para>
- <example>
- <title>A <function>geoip_record_by_name</function> example</title>
- <para>
- This will print the array containing the record of host example.com.
- </para>
- <programlisting role="php">
+ <example>
+ <title>A <function>geoip_record_by_name</function> example</title>
+ <para>
+ This will print the array containing the record of host example.com.
+ </para>
+ <programlisting role="php">
<![CDATA[
<?php
$record = geoip_record_by_name('www.example.com');
@@ -159,9 +152,9 @@ if ($record) {
}
?>
]]>
- </programlisting>
- &example.outputs;
- <screen>
+ </programlisting>
+ &example.outputs;
+ <screen>
<![CDATA[
Array
(
@@ -171,20 +164,18 @@ Array
[country_name] => United States
[region] => CA
[city] => Marina Del Rey
- [postal_code] =>
+ [postal_code] =>
[latitude] => 33.9776992798
[longitude] => -118.435096741
[dma_code] => 803
[area_code] => 310
)
]]>
- </screen>
- </example>
- </para>
+ </screen>
+ </example>
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/geoip/functions/geoip-region-by-name.xml b/reference/geoip/functions/geoip-region-by-name.xml
index af7a49deb708..e7b1b4601544 100644
--- a/reference/geoip/functions/geoip-region-by-name.xml
+++ b/reference/geoip/functions/geoip-region-by-name.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<refentry xml:id="function.geoip-region-by-name" xmlns="http://docbook.org/ns/docbook">
+<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.geoip-region-by-name">
<refnamediv>
<refname>geoip_region_by_name</refname>
<refpurpose>Get the country code and region</refpurpose>
@@ -24,55 +24,50 @@
<para>
The names of the different keys of the returning associative array are as follows:
</para>
- <para>
- <itemizedlist>
- <listitem>
- <simpara>
- "country_code" -- Two letter country code (see
- <function>geoip_country_code_by_name</function>)
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- "region" -- The region code (ex: CA for California)
- </simpara>
- </listitem>
- </itemizedlist>
- </para>
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ "country_code" -- Two letter country code (see
+ <function>geoip_country_code_by_name</function>)
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ "region" -- The region code (ex: CA for California)
+ </simpara>
+ </listitem>
+ </itemizedlist>
</refsect1>
<refsect1 role="parameters">
&reftitle.parameters;
- <para>
- <variablelist>
- <varlistentry>
- <term><parameter>hostname</parameter></term>
- <listitem>
- <para>
- The hostname or IP address whose region is to be looked-up.
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- </para>
+ <variablelist>
+ <varlistentry>
+ <term><parameter>hostname</parameter></term>
+ <listitem>
+ <para>
+ The hostname or IP address whose region is to be looked-up.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
</refsect1>
<refsect1 role="returnvalues">
&reftitle.returnvalues;
<para>
- Returns the associative array on success, or &false; if the address
+ Returns the associative array on success, or &false; if the address
cannot be found in the database.
</para>
</refsect1>
<refsect1 role="examples">
&reftitle.examples;
- <para>
- <example>
- <title>A <function>geoip_region_by_name</function> example</title>
- <para>
- This will print the array containing the country code and region
- of the host example.com.
- </para>
- <programlisting role="php">
+ <example>
+ <title>A <function>geoip_region_by_name</function> example</title>
+ <para>
+ This will print the array containing the country code and region
+ of the host example.com.
+ </para>
+ <programlisting role="php">
<![CDATA[
<?php
$region = geoip_region_by_name('www.example.com');
@@ -81,9 +76,9 @@ if ($region) {
}
?>
]]>
- </programlisting>
- &example.outputs;
- <screen>
+ </programlisting>
+ &example.outputs;
+ <screen>
<![CDATA[
Array
(
@@ -91,13 +86,11 @@ Array
[region] => CA
)
]]>
- </screen>
- </example>
- </para>
+ </screen>
+ </example>
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/geoip/functions/geoip-region-name-by-code.xml b/reference/geoip/functions/geoip-region-name-by-code.xml
index 6ef12f351b16..5a71e9e43ba7 100644
--- a/reference/geoip/functions/geoip-region-name-by-code.xml
+++ b/reference/geoip/functions/geoip-region-name-by-code.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<refentry xml:id="function.geoip-region-name-by-code" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.geoip-region-name-by-code">
<refnamediv>
<refname>geoip_region_name_by_code</refname>
<refpurpose>Returns the region name for some country and region code combo</refpurpose>
@@ -34,28 +34,26 @@
</refsect1>
<refsect1 role="parameters">
&reftitle.parameters;
- <para>
- <variablelist>
- <varlistentry>
- <term><parameter>country_code</parameter></term>
- <listitem>
- <para>
- The two-letter country code (see
- <function>geoip_country_code_by_name</function>)
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><parameter>region_code</parameter></term>
- <listitem>
- <para>
- The two-letter (or digit) region code (see
- <function>geoip_region_by_name</function>)
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- </para>
+ <variablelist>
+ <varlistentry>
+ <term><parameter>country_code</parameter></term>
+ <listitem>
+ <para>
+ The two-letter country code (see
+ <function>geoip_country_code_by_name</function>)
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><parameter>region_code</parameter></term>
+ <listitem>
+ <para>
+ The two-letter (or digit) region code (see
+ <function>geoip_region_by_name</function>)
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
</refsect1>
<refsect1 role="returnvalues">
&reftitle.returnvalues;
@@ -116,7 +114,6 @@ Region name for JP/01 is: Aichi
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/geoip/functions/geoip-setup-custom-directory.xml b/reference/geoip/functions/geoip-setup-custom-directory.xml
index d8dd17d333a8..314c092e37a0 100644
--- a/reference/geoip/functions/geoip-setup-custom-directory.xml
+++ b/reference/geoip/functions/geoip-setup-custom-directory.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<refentry xml:id="function.geoip-setup-custom-directory" xmlns="http://docbook.org/ns/docbook">
+<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.geoip-setup-custom-directory">
<refnamediv>
<refname>geoip_setup_custom_directory</refname>
<refpurpose>Set a custom directory for the GeoIP database</refpurpose>
@@ -17,22 +17,20 @@
default directory of the GeoIP database. This is equivalent to changing
<link linkend="ini.geoip.custom-directory">geoip.custom_directory</link>.
</para>
-
+
</refsect1>
<refsect1 role="parameters">
&reftitle.parameters;
- <para>
- <variablelist>
- <varlistentry>
- <term><parameter>path</parameter></term>
- <listitem>
- <para>
- The full path of where the GeoIP database is on disk.
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- </para>
+ <variablelist>
+ <varlistentry>
+ <term><parameter>path</parameter></term>
+ <listitem>
+ <para>
+ The full path of where the GeoIP database is on disk.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
</refsect1>
<refsect1 role="returnvalues">
&reftitle.returnvalues;
@@ -43,13 +41,12 @@
<refsect1 role="examples">
&reftitle.examples;
- <para>
- <example>
- <title>A <function>geoip_setup_custom_directory</function> example</title>
- <para>
- This will change the GeoIP default database path.
- </para>
- <programlisting role="php">
+ <example>
+ <title>A <function>geoip_setup_custom_directory</function> example</title>
+ <para>
+ This will change the GeoIP default database path.
+ </para>
+ <programlisting role="php">
<![CDATA[
<?php
@@ -59,19 +56,17 @@ print geoip_db_filename(GEOIP_COUNTRY_EDITION);
?>
]]>
- </programlisting>
- &example.outputs;
- <screen>
+ </programlisting>
+ &example.outputs;
+ <screen>
<![CDATA[
/some/other/path/GeoIP.dat
]]>
- </screen>
- </example>
- </para>
+ </screen>
+ </example>
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/geoip/functions/geoip-time-zone-by-country-and-region.xml b/reference/geoip/functions/geoip-time-zone-by-country-and-region.xml
index b811e1dad087..572fa0d58962 100644
--- a/reference/geoip/functions/geoip-time-zone-by-country-and-region.xml
+++ b/reference/geoip/functions/geoip-time-zone-by-country-and-region.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<refentry xml:id="function.geoip-time-zone-by-country-and-region" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.geoip-time-zone-by-country-and-region">
<refnamediv>
<refname>geoip_time_zone_by_country_and_region</refname>
<refpurpose>Returns the time zone for some country and region code combo</refpurpose>
@@ -34,28 +34,26 @@
</refsect1>
<refsect1 role="parameters">
&reftitle.parameters;
- <para>
- <variablelist>
- <varlistentry>
- <term><parameter>country_code</parameter></term>
- <listitem>
- <para>
- The two-letter country code (see
- <function>geoip_country_code_by_name</function>)
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><parameter>region_code</parameter></term>
- <listitem>
- <para>
- The two-letter (or digit) region code (see
- <function>geoip_region_by_name</function>)
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- </para>
+ <variablelist>
+ <varlistentry>
+ <term><parameter>country_code</parameter></term>
+ <listitem>
+ <para>
+ The two-letter country code (see
+ <function>geoip_country_code_by_name</function>)
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><parameter>region_code</parameter></term>
+ <listitem>
+ <para>
+ The two-letter (or digit) region code (see
+ <function>geoip_region_by_name</function>)
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
</refsect1>
<refsect1 role="returnvalues">
&reftitle.returnvalues;
@@ -116,7 +114,6 @@ Time zone for JP/01 is: Asia/Tokyo
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/geoip/ini.xml b/reference/geoip/ini.xml
index 59d92d06528e..a88c1e1df755 100644
--- a/reference/geoip/ini.xml
+++ b/reference/geoip/ini.xml
@@ -1,48 +1,43 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-
-<section xml:id="geoip.configuration" xmlns="http://docbook.org/ns/docbook">
+<section xmlns="http://docbook.org/ns/docbook" xml:id="geoip.configuration">
&reftitle.runtime;
&extension.runtime;
- <para>
- <table>
- <title>GeoIP &ConfigureOptions;</title>
- <tgroup cols="4">
- <thead>
- <row>
- <entry>&Name;</entry>
- <entry>&Default;</entry>
- <entry>&Changeable;</entry>
- <entry>&Changelog;</entry>
- </row>
- </thead>
- <tbody xml:id="geoip.configuration.list">
- <row>
- <entry><link linkend="ini.geoip.custom-directory">geoip.custom_directory</link></entry>
- <entry>""</entry>
- <entry><constant>INI_ALL</constant></entry>
- <entry><!-- leave empty, this will be filled by an automatic script --></entry>
- </row>
- </tbody>
- </tgroup>
- </table>
- </para>
+ <table>
+ <title>GeoIP &ConfigureOptions;</title>
+ <tgroup cols="4">
+ <thead>
+ <row>
+ <entry>&Name;</entry>
+ <entry>&Default;</entry>
+ <entry>&Changeable;</entry>
+ <entry>&Changelog;</entry>
+ </row>
+ </thead>
+ <tbody xml:id="geoip.configuration.list">
+ <row>
+ <entry><link linkend="ini.geoip.custom-directory">geoip.custom_directory</link></entry>
+ <entry>""</entry>
+ <entry><constant>INI_ALL</constant></entry>
+ <entry><!-- leave empty, this will be filled by an automatic script --></entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
&ini.descriptions.title;
- <para>
- <variablelist>
- <varlistentry xml:id="ini.geoip.custom-directory">
- <term>
- <parameter>geoip.custom_directory</parameter>
- <type>string</type>
- </term>
- <listitem>
- <para>
- Empty by default, but can be set to force a different database path than the one compiled in the library.
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- </para>
+ <variablelist>
+ <varlistentry xml:id="ini.geoip.custom-directory">
+ <term>
+ <parameter>geoip.custom_directory</parameter>
+ <type>string</type>
+ </term>
+ <listitem>
+ <para>
+ Empty by default, but can be set to force a different database path than the one compiled in the library.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
</section>