From 3a786de8b6d462639be2207315703801e313833b Mon Sep 17 00:00:00 2001
From: Gyozo Papp <gerzson@php.net>
Date: Mon, 18 Feb 2002 17:07:39 +0000
Subject: [PATCH] use constant wherever possible and split up the long
 description of mhash_keygen_s2k()

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@70505 c90b9560-bf6c-de11-be94-00142212c4b1
---
 functions/mhash.xml | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/functions/mhash.xml b/functions/mhash.xml
index e753c3e4c4..23b6ac575d 100644
--- a/functions/mhash.xml
+++ b/functions/mhash.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.22 $ -->
+<!-- $Revision: 1.23 $ -->
  <reference id="ref.mhash">
   <title>Mhash Functions</title>
   <titleabbrev>mhash</titleabbrev>
@@ -60,57 +60,57 @@ The hmac is 750c783e6ab0b503eaa86e310a5db738
     <itemizedlist>
      <listitem>
       <simpara>
-       MHASH_MD5
+       <constant>MHASH_MD5</constant>
       </simpara>
      </listitem>
      <listitem>
       <simpara>
-       MHASH_SHA1
+       <constant>MHASH_SHA1</constant>
       </simpara>
      </listitem>
      <listitem>
       <simpara>
-       MHASH_HAVAL256
+       <constant>MHASH_HAVAL256</constant>
       </simpara>
      </listitem>
      <listitem>
       <simpara>
-       MHASH_HAVAL192
+       <constant>MHASH_HAVAL192</constant>
       </simpara>
      </listitem>
      <listitem>
       <simpara>
-       MHASH_HAVAL160
+       <constant>MHASH_HAVAL160</constant>
       </simpara>
      </listitem>
      <listitem>
       <simpara>
-       MHASH_HAVAL128
+       <constant>MHASH_HAVAL128</constant>
       </simpara>
      </listitem>
      <listitem>
       <simpara>
-       MHASH_RIPEMD160
+       <constant>MHASH_RIPEMD160</constant>
       </simpara>
      </listitem>
      <listitem>
       <simpara>
-       MHASH_GOST
+       <constant>MHASH_GOST</constant>
       </simpara>
      </listitem>
      <listitem>
       <simpara>
-       MHASH_TIGER
+       <constant>MHASH_TIGER</constant>
       </simpara>
      </listitem>
      <listitem>
       <simpara>
-       MHASH_CRC32
+       <constant>MHASH_CRC32</constant>
       </simpara>
      </listitem>
      <listitem>
       <simpara>
-       MHASH_CRC32B
+       <constant>MHASH_CRC32B</constant>
       </simpara>
      </listitem>
     </itemizedlist>
@@ -139,7 +139,7 @@ The hmac is 750c783e6ab0b503eaa86e310a5db738
     </para>
     <para>
      <example>
-      <title><function>mhash_get_hash_name</function> Example</title>
+      <title><function>mhash_get_hash_name</function> example</title>
       <programlisting>
 <![CDATA[
 <?php
@@ -233,7 +233,7 @@ for ($i = 0; $i <= $nr; $i++) {
       <type>string</type><methodname>mhash</methodname>
       <methodparam><type>int</type><parameter>hash</parameter></methodparam>
       <methodparam><type>string</type><parameter>data</parameter></methodparam>
-      <methodparam><type>string</type><parameter>[ key ]</parameter></methodparam>
+      <methodparam choice="opt"><type>string</type><parameter>key</parameter></methodparam>
      </methodsynopsis>
     <para>
      <function>mhash</function> applies a hash function specified by
@@ -272,6 +272,8 @@ for ($i = 0; $i <= $nr; $i++) {
      That salt must be known when you check the keys, thus it is
      a good idea to append the key to it. Salt has a fixed length
      of 8 bytes and will be padded with zeros if you supply less bytes.
+    </para>
+    <para>
      Keep in mind that user supplied passwords are not really suitable
      to be used as keys in cryptographic algorithms, since users normally
      choose keys they can write on keyboard. These passwords use