From ddb54cd1f26401d7319086187ec8e6667a5254d0 Mon Sep 17 00:00:00 2001
From: Yannick Torres <yannick@php.net>
Date: Sat, 2 May 2009 15:53:16 +0000
Subject: [PATCH] WS

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@279721 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/curl/functions/curl-setopt.xml | 108 +++++++++++------------
 1 file changed, 54 insertions(+), 54 deletions(-)

diff --git a/reference/curl/functions/curl-setopt.xml b/reference/curl/functions/curl-setopt.xml
index c8b9c79c21..af703f719f 100644
--- a/reference/curl/functions/curl-setopt.xml
+++ b/reference/curl/functions/curl-setopt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.43 $ -->
+<!-- $Revision: 1.44 $ -->
 <refentry xml:id="function.curl-setopt" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>curl_setopt</refname>
@@ -18,7 +18,7 @@
    Sets an option on the given cURL session handle.
   </para>
  </refsect1>
-
+ 
  <refsect1 role="parameters">
   &reftitle.parameters;
   <para>
@@ -263,7 +263,7 @@
               changed for debugging purposes.
              </para>
             </note>
-           </para></entry>
+            </para></entry>
            <entry>
            </entry>
           </row>
@@ -543,45 +543,45 @@
            </entry>
           </row>
           <row>
- 		   <entry><constant>CURLOPT_PROTOCOLS</constant></entry>
+           <entry><constant>CURLOPT_PROTOCOLS</constant></entry>
            <entry>
-		    <para>
-            Bitmask of <constant>CURLPROTO_*</constant> values. If used, this bitmask 
-			limits what protocols libcurl may use in the transfer. This allows you to have
-			a libcurl built to support a wide range	of protocols but still limit specific
-			transfers to only be allowed to use a subset of them. By default libcurl will
-			accept all protocols it supports. 
-			See also <constant>CURLOPT_REDIR_PROTOCOLS</constant>.
-			</para>
-			<para>
-			Valid protocol options are: 
-			<parameter>CURLPROTO_HTTP</parameter>,
-			<parameter>CURLPROTO_HTTPS</parameter>,
-			<parameter>CURLPROTO_FTP</parameter>,
-			<parameter>CURLPROTO_FTPS</parameter>,
-			<parameter>CURLPROTO_SCP</parameter>,
-			<parameter>CURLPROTO_SFTP</parameter>,
-			<parameter>CURLPROTO_TELNET</parameter>,
-			<parameter>CURLPROTO_LDAP</parameter>,
-			<parameter>CURLPROTO_LDAPS</parameter>,
-			<parameter>CURLPROTO_DICT</parameter>,
-			<parameter>CURLPROTO_FILE</parameter>,
-			<parameter>CURLPROTO_TFTP</parameter>,
-			<parameter>CURLPROTO_ALL</parameter>
-			</para>
+            <para>
+             Bitmask of <constant>CURLPROTO_*</constant> values. If used, this bitmask 
+             limits what protocols libcurl may use in the transfer. This allows you to have
+             a libcurl built to support a wide range of protocols but still limit specific
+             transfers to only be allowed to use a subset of them. By default libcurl will
+             accept all protocols it supports. 
+             See also <constant>CURLOPT_REDIR_PROTOCOLS</constant>.
+            </para>
+            <para>
+             Valid protocol options are: 
+             <parameter>CURLPROTO_HTTP</parameter>,
+             <parameter>CURLPROTO_HTTPS</parameter>,
+             <parameter>CURLPROTO_FTP</parameter>,
+             <parameter>CURLPROTO_FTPS</parameter>,
+             <parameter>CURLPROTO_SCP</parameter>,
+             <parameter>CURLPROTO_SFTP</parameter>,
+             <parameter>CURLPROTO_TELNET</parameter>,
+             <parameter>CURLPROTO_LDAP</parameter>,
+             <parameter>CURLPROTO_LDAPS</parameter>,
+             <parameter>CURLPROTO_DICT</parameter>,
+             <parameter>CURLPROTO_FILE</parameter>,
+             <parameter>CURLPROTO_TFTP</parameter>,
+             <parameter>CURLPROTO_ALL</parameter>
+            </para>
            </entry>
            <entry>
-		     Added in cURL 7.19.4.
+            Added in cURL 7.19.4.
            </entry>
           </row>
           <row>
            <entry><constant>CURLOPT_PROXYAUTH</constant></entry>
            <entry>
-           The HTTP authentication method(s) to use for the proxy connection.
-           Use the same bitmasks as described in
-           <constant>CURLOPT_HTTPAUTH</constant>. For proxy authentication,
-           only <parameter>CURLAUTH_BASIC</parameter> and
-           <parameter>CURLAUTH_NTLM</parameter> are currently supported.
+            The HTTP authentication method(s) to use for the proxy connection.
+            Use the same bitmasks as described in
+            <constant>CURLOPT_HTTPAUTH</constant>. For proxy authentication,
+            only <parameter>CURLAUTH_BASIC</parameter> and
+            <parameter>CURLAUTH_NTLM</parameter> are currently supported.
            </entry>
            <entry>
             Added in cURL 7.10.7.
@@ -607,19 +607,19 @@
            </entry>
           </row>
           <row>
- 		   <entry><constant>CURLOPT_REDIR_PROTOCOLS</constant></entry>
+           <entry><constant>CURLOPT_REDIR_PROTOCOLS</constant></entry>
            <entry>
             Bitmask of <constant>CURLPROTO_*</constant> values. If used, this bitmask
-			limits what protocols libcurl may use in a transfer that it follows to in
-			a redirect when <constant>CURLOPT_FOLLOWLOCATION</constant> is enabled.
-			This allows you to limit specific transfers to only be allowed to use a subset
-			of protocols in redirections. By default libcurl will allow all protocols
-			except for FILE and SCP. This is a difference compared to pre-7.19.4 versions
-			which unconditionally would follow to all protocols supported. 
-			See also <constant>CURLOPT_PROTOCOLS</constant> for protocol constant values.
+            limits what protocols libcurl may use in a transfer that it follows to in
+            a redirect when <constant>CURLOPT_FOLLOWLOCATION</constant> is enabled.
+            This allows you to limit specific transfers to only be allowed to use a subset
+            of protocols in redirections. By default libcurl will allow all protocols
+            except for FILE and SCP. This is a difference compared to pre-7.19.4 versions
+            which unconditionally would follow to all protocols supported. 
+            See also <constant>CURLOPT_PROTOCOLS</constant> for protocol constant values.
            </entry>
            <entry>
-		     Added in cURL 7.19.4.
+            Added in cURL 7.19.4.
            </entry>
           </row>
           <row>
@@ -776,7 +776,7 @@
               request method first.
              </para>
             </note>
-           </para></entry>
+            </para></entry>
            <entry>
            </entry>
           </row>
@@ -866,10 +866,10 @@
           </row>
           <row>
            <entry><constant>CURLOPT_PROXYUSERPWD</constant></entry>
-            <entry>
-             A username and password formatted as
-             <literal>"[username]:[password]"</literal> to use for the
-             connection to the proxy.
+           <entry>
+            A username and password formatted as
+            <literal>"[username]:[password]"</literal> to use for the
+            connection to the proxy.
            </entry>
            <entry>
            </entry>
@@ -977,7 +977,7 @@
               the PHP script it is contained within safe.
              </para>
             </note>
-           </para></entry>
+            </para></entry>
            <entry>
            </entry>
           </row>
@@ -1199,14 +1199,14 @@
    </variablelist>
   </para>
  </refsect1>
-
+ 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
    &return.success;
   </para>
  </refsect1>
-
+ 
  <refsect1 role="changelog">
   &reftitle.changelog;
   <para>
@@ -1331,7 +1331,7 @@ Array
    </example>
   </para>
  </refsect1>
-
+ 
  <refsect1 role="notes">
   &reftitle.notes;
   <note>
@@ -1343,7 +1343,7 @@ Array
    </para>
   </note>
  </refsect1>
-
+ 
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
@@ -1352,7 +1352,7 @@ Array
    </simplelist>
   </para>
  </refsect1>
-
+ 
 </refentry>
 
 <!-- Keep this comment at the end of the file