r1868 + another OPTGROUP update

diff --git a/install/init-dictvendors.sql b/install/init-dictvendors.sql
index 73180de733d9b74fc3fe2657d645e1d995fc593b..e452e47f1b6657de3276bae83feaeba5491f95e5 100644 (file)
--- a/install/init-dictvendors.sql
+++ b/install/init-dictvendors.sql
@@ -678,7 +678,7 @@ INSERT INTO `Dictionary` (`chapter_no`, `dict_key`, `dict_value`) VALUES (13,727
 INSERT INTO `Dictionary` (`chapter_no`, `dict_key`, `dict_value`) VALUES (13,728,'[[BSD^OpenBSD 4.1 | http://openbsd.org/41.html]]');
 INSERT INTO `Dictionary` (`chapter_no`, `dict_key`, `dict_value`) VALUES (13,729,'[[BSD^OpenBSD 4.2 | http://openbsd.org/42.html]]');
 INSERT INTO `Dictionary` (`chapter_no`, `dict_key`, `dict_value`) VALUES (13,730,'[[BSD^OpenBSD 4.3 | http://openbsd.org/43.html]]');
-INSERT INTO `Dictionary` (`chapter_no`, `dict_key`, `dict_value`) VALUES (12,731,'[[Cisco Catalyst^4900M | http://www.cisco.com/en/US/products/ps9310/index.html]]');
+INSERT INTO `Dictionary` (`chapter_no`, `dict_key`, `dict_value`) VALUES (12,731,'[[Cisco Catalyst&4900M | http://www.cisco.com/en/US/products/ps9310/index.html]]');
 INSERT INTO `Dictionary` (`chapter_no`, `dict_key`, `dict_value`) VALUES (13,732,'[[BSD^FreeBSD 7.0 | http://www.freebsd.org/releases/7.0R/announce.html]]');
 INSERT INTO `Dictionary` (`chapter_no`, `dict_key`, `dict_value`) VALUES (13,733,'[[BSD^NetBSD 2.0 | http://netbsd.org/releases/formal-2.0/]]');
 INSERT INTO `Dictionary` (`chapter_no`, `dict_key`, `dict_value`) VALUES (13,734,'[[BSD^NetBSD 2.1 | http://netbsd.org/releases/formal-2.0/NetBSD-2.1.html]]');

diff --git a/upgrade.php b/upgrade.php
index bb77fb1ebc0cfb183df99d12fdfb5ca68ef7e42b..58c9e0ae3811d5b397bf693b5f04fb6151f8c68b 100644 (file)
--- a/upgrade.php
+++ b/upgrade.php
@@ -987,7 +987,7 @@ CREATE TABLE `IPVirtualService` (
                        $new_words[] = array (13 => '[[BSD^OpenBSD 4.1 | http://openbsd.org/41.html]]');
                        $new_words[] = array (13 => '[[BSD^OpenBSD 4.2 | http://openbsd.org/42.html]]');
                        $new_words[] = array (13 => '[[BSD^OpenBSD 4.3 | http://openbsd.org/43.html]]');
-                       $new_words[] = array (12 => '[[Cisco Catalyst^4900M | http://www.cisco.com/en/US/products/ps9310/index.html]]');
+                       $new_words[] = array (12 => '[[Cisco Catalyst&4900M | http://www.cisco.com/en/US/products/ps9310/index.html]]');
                        $new_words[] = array (13 => '[[BSD^FreeBSD 7.x | http://www.freebsd.org/releases/7.0R/announce.html]]');
                        $new_words[] = array (13 => '[[BSD^NetBSD 2.0 | http://netbsd.org/releases/formal-2.0/]]');
                        $new_words[] = array (13 => '[[BSD^NetBSD 2.1 | http://netbsd.org/releases/formal-2.0/NetBSD-2.1.html]]');