didou Sat Feb 17 15:56:03 2007 UTC
Added files:
/phpdoc/en/reference/http/functions/negotiation
http-negotiate-content-type.xml
Removed files:
/phpdoc/en/reference/http/functions/negotiation
http-negotiate-ctype.xml
Modified files:
/phpdoc/en/reference/http reference.xml
/phpdoc/en/reference/http/functions negotiation.xml
Log:
Fix function name: s/ctype/content_type/
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/http/reference.xml?r1=1.13&r2=1.14&diff_format=u
Index: phpdoc/en/reference/http/reference.xml
diff -u phpdoc/en/reference/http/reference.xml:1.13
phpdoc/en/reference/http/reference.xml:1.14
--- phpdoc/en/reference/http/reference.xml:1.13 Thu Feb 15 09:24:35 2007
+++ phpdoc/en/reference/http/reference.xml Sat Feb 17 15:56:03 2007
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.13 $ -->
+<!-- $Revision: 1.14 $ -->
<!-- Purpose: basic.php -->
<!-- Membership: pecl -->
@@ -96,7 +96,7 @@
<title>Negotiation</title>
<simplelist>
<member><link
linkend="function.http-negotiate-charset"><function>http_negotiate_charset</function></link></member>
- <member><link
linkend="function.http-negotiate-ctype"><function>http_negotiate_ctype</function></link></member>
+ <member><link
linkend="function.http-negotiate-content-type"><function>http_negotiate_content_type</function></link></member>
<member><link
linkend="function.http-negotiate-language"><function>http_negotiate_language</function></link></member>
</simplelist>
</sect2>
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/http/functions/negotiation.xml?r1=1.2&r2=1.3&diff_format=u
Index: phpdoc/en/reference/http/functions/negotiation.xml
diff -u phpdoc/en/reference/http/functions/negotiation.xml:1.2
phpdoc/en/reference/http/functions/negotiation.xml:1.3
--- phpdoc/en/reference/http/functions/negotiation.xml:1.2 Fri Aug 18
12:13:22 2006
+++ phpdoc/en/reference/http/functions/negotiation.xml Sat Feb 17 15:56:03 2007
@@ -1,4 +1,4 @@
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
&reference.http.functions.negotiation.http-negotiate-charset;
-&reference.http.functions.negotiation.http-negotiate-ctype;
+&reference.http.functions.negotiation.http-negotiate-content-type;
&reference.http.functions.negotiation.http-negotiate-language;
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/http/functions/negotiation/http-negotiate-content-type.xml?view=markup&rev=1.1
Index:
phpdoc/en/reference/http/functions/negotiation/http-negotiate-content-type.xml
+++
phpdoc/en/reference/http/functions/negotiation/http-negotiate-content-type.xml
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $Revision: 1.1 $ -->
<!-- Generated by xml_proto.php v2.4. Found in /scripts directory of phpdoc. -->
<refentry id="function.http-negotiate-content-type">
<refnamediv>
<refname>http_negotiate_content_type</refname>
<refpurpose>Negotiate clients preferred content type</refpurpose>
</refnamediv>
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
<type>string</type><methodname>http_negotiate_content_type</methodname>
<methodparam
choice="opt"><type>array</type><parameter>supported</parameter></methodparam>
<methodparam choice="opt"><type>array</type><parameter
role="reference">result</parameter></methodparam>
</methodsynopsis>
<para>
This function negotiates the clients preferred content type based on its
<literal>Accept</literal> HTTP header. The qualifier is recognized and
content types
without qualifier are rated highest.
</para>
</refsect1>
<refsect1 role="parameters">
&reftitle.parameters;
<para>
<variablelist>
<varlistentry>
<term><parameter>supported</parameter></term>
<listitem>
<para>
Array containing the supported content types as values
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><parameter>result</parameter></term>
<listitem>
<para>
Will be filled with an array containing the negotiation results
</para>
</listitem>
</varlistentry>
</variablelist>
</para>
</refsect1>
<refsect1 role="returnvalues">
&reftitle.returnvalues;
<para>
Returns the negotiated content type or the default content type (i.e. first
array entry) if none match.
</para>
</refsect1>
<!-- Use when ERRORS exist
<refsect1 role="errors">
&reftitle.errors;
<para>
When does this function throw E_* level errors, or exceptions?
</para>
</refsect1>
-->
<!-- Use when a CHANGELOG exists
<refsect1 role="changelog">
&reftitle.changelog;
<para>
<informaltable>
<tgroup cols="2">
<thead>
<row>
<entry>&Version;</entry>
<entry>&Description;</entry>
</row>
</thead>
<tbody>
<row>
<entry>Enter the PHP version of change here</entry>
<entry>Description of change</entry>
</row>
</tbody>
</tgroup>
</informaltable>
</para>
</refsect1>
-->
<refsect1 role="examples">
&reftitle.examples;
<para>
<example>
<title>Using <function>http_negotiate_content_type</function></title>
<programlisting role="php">
<![CDATA[
<?php
$content_types = array('application/xhtml+xml', 'text/html');
http_send_content_type(http_negotiate_content_type($content_types));
?>
]]>
</programlisting>
</example>
</para>
</refsect1>
<!-- Use when adding See Also links
<refsect1 role="seealso">
&reftitle.seealso;
<para>
<simplelist>
<member><function></function></member>
<member>Or <link linkend="somethingelse">something else</link></member>
</simplelist>
</para>
</refsect1>
-->
</refentry>
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
sgml-omittag:t
sgml-shorttag:t
sgml-minimize-attributes:nil
sgml-always-quote-attributes:t
sgml-indent-step:1
sgml-indent-data:t
indent-tabs-mode:nil
sgml-parent-document:nil
sgml-default-dtd-file:"../../../../manual.ced"
sgml-exposed-tags:nil
sgml-local-catalogs:nil
sgml-local-ecat-files:nil
End:
vim600: syn=xml fen fdm=syntax fdl=2 si
vim: et tw=78 syn=sgml
vi: ts=1 sw=1
-->
