vrana           Sat Aug  7 04:21:12 2004 EDT

  Modified files:              
    /phpdoc/en  language-snippets.ent 
    /phpdoc/en/reference/cyrus  configure.xml 
  Log:
  IMAP cannot be used together with Cyrus (bug #24778)
  
http://cvs.php.net/diff.php/phpdoc/en/language-snippets.ent?r1=1.115&r2=1.116&ty=u
Index: phpdoc/en/language-snippets.ent
diff -u phpdoc/en/language-snippets.ent:1.115 phpdoc/en/language-snippets.ent:1.116
--- phpdoc/en/language-snippets.ent:1.115       Thu Aug  5 01:13:32 2004
+++ phpdoc/en/language-snippets.ent     Sat Aug  7 04:21:09 2004
@@ -1,4 +1,4 @@
-<!-- $Revision: 1.115 $ -->
+<!-- $Revision: 1.116 $ -->
 <!-- Keep 'em sorted -->
 
 
@@ -103,8 +103,9 @@
 
 <!ENTITY warn.imaprecodeyaz '<warning><simpara>The <link
 linkend="ref.imap">IMAP</link> extension cannot be used in conjuction with
-the <link linkend="ref.recode">recode</link> or <link
-linkend="ref.yaz">YAZ</link> extensions.  This is due to the fact that they
+the <link linkend="ref.recode">recode</link>, <link
+linkend="ref.yaz">YAZ</link> or <link
+linkend="ref.cyrus">Cyrus</link> extensions.  This is due to the fact that they
 both share the same internal symbol.</simpara></warning>'>
 
 <!ENTITY note.magicquotes.gpc '<note><title>directive note: magic_quotes_gpc
http://cvs.php.net/diff.php/phpdoc/en/reference/cyrus/configure.xml?r1=1.3&r2=1.4&ty=u
Index: phpdoc/en/reference/cyrus/configure.xml
diff -u phpdoc/en/reference/cyrus/configure.xml:1.3 
phpdoc/en/reference/cyrus/configure.xml:1.4
--- phpdoc/en/reference/cyrus/configure.xml:1.3 Sat Jan  4 06:25:21 2003
+++ phpdoc/en/reference/cyrus/configure.xml     Sat Aug  7 04:21:11 2004
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <section id="cyrus.installation">
  &reftitle.install;
  <para>
   To enable Cyrus IMAP support and to use these functions you have to compile
   PHP with the <option role="configure">--with-cyrus</option> option.
  </para>
+
+ &warn.imaprecodeyaz;
+
 </section>
 
 <!-- Keep this comment at the end of the file

Reply via email to