From 4df3260b89b68c99096afa87ccc8f261df8d5c37 Mon Sep 17 00:00:00 2001
From: Christoph Michael Becker <cmb@php.net>
Date: Thu, 29 Oct 2020 11:32:21 +0000
Subject: [PATCH] Fix #80293: oniguruma not bundled in mbstring extension per
 docs

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@351034 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/mbstring/configure.xml | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/reference/mbstring/configure.xml b/reference/mbstring/configure.xml
index 80e96048fb..9e7f8f6cbc 100644
--- a/reference/mbstring/configure.xml
+++ b/reference/mbstring/configure.xml
@@ -23,7 +23,7 @@
      <para>
       <productname>libmbfl</productname> is necessary for <literal>mbstring</literal>.
       <productname>libmbfl</productname> is bundled with <literal>mbstring</literal>.
-      Before PHP 7.3.0, if <productname>libmbfl</productname> is already installed on the system,
+      Prior to PHP 7.3.0, if <productname>libmbfl</productname> is already installed on the system,
       <option role="configure">--with-libmbfl[=DIR]</option> can be specified to use 
       the installed library.
      </para>
@@ -36,16 +36,13 @@
      <para>
       <productname>Oniguruma</productname> is necessary for the regular
       expression functions with multibyte character support.
-      <productname>Oniguruma</productname> is bundled with
-      <literal>mbstring</literal>. As of PHP 5.4.0, if
-      <productname>Oniguruma</productname> is already installed on the system,
-      <option role="configure">--with-onig[=DIR]</option> can be specified to
-      use the installed library.
-      As of PHP 7.4.0 <option role="configure">--with-onig</option> has been removed
-      and pkg-config is now used to detect the libonig library.
+      As of PHP 7.4.0, pkg-config is used to detect the libonig library.
+      Prior to PHP 7.4.0, <productname>Oniguruma</productname> was bundled with
+      <literal>mbstring</literal>, but it was possible to build against an already
+      installed libonig by passing <option role="configure">--with-onig[=DIR]</option>.
      </para>
      <para>
-      As of PHP 5.4.0 it is possible to disable the multibyte regex backtrack
+      It is possible to disable the multibyte regex backtrack
       check by specifying <option
       role="configure">--disable-mbregex-backtrack</option>.
      </para>