From 99e8b3cb1c740e5aad416f390e580f8cd3c02271 Mon Sep 17 00:00:00 2001
From: Jakub Vrana <vrana@php.net>
Date: Sat, 7 Aug 2004 08:21:11 +0000
Subject: [PATCH] IMAP cannot be used together with Cyrus (bug #24778)

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@165614 c90b9560-bf6c-de11-be94-00142212c4b1
---
 language-snippets.ent         | 5 +++--
 reference/cyrus/configure.xml | 5 ++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/language-snippets.ent b/language-snippets.ent
index 9d0b1730b4..733f15a875 100644
--- a/language-snippets.ent
+++ b/language-snippets.ent
@@ -103,8 +103,9 @@ Use this function at your own risk.</simpara></warning>'>
 
 <!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
diff --git a/reference/cyrus/configure.xml b/reference/cyrus/configure.xml
index 9ddf6b15bf..3d459583a4 100644
--- a/reference/cyrus/configure.xml
+++ b/reference/cyrus/configure.xml
@@ -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