r1849 + try the new OPTGROUP syntax
[racktables] / upgrade.php
index 96eba639d13a71e9bbd7c3c60cd8782b12014361..8e2289332b18a49834ebe8a5ba4b3989aa334a25 100644 (file)
@@ -1075,32 +1075,32 @@ CREATE TABLE `TagTree` (
   UNIQUE KEY `tag` (`tag`)
 ) TYPE=MyISAM;
 ";
-                       $old_words[43] = 'IBM xSeries^305';
-                       $old_words[44] = 'IBM xSeries^306';
-                       $old_words[45] = 'IBM xSeries^306m';
-                       $old_words[46] = 'IBM xSeries^326m';
-                       $old_words[47] = 'IBM xSeries^330';
-                       $old_words[48] = 'IBM xSeries^335';
-                       $old_words[54] = 'IBM xSeries^346';
-                       $old_words[59] = 'IBM xSeries^326';
-                       $old_words[68] = 'IBM xSeries^3250';
-                       $old_words[69] = 'IBM xSeries^3455';
-                       $old_words[70] = 'IBM xSeries^3550';
-                       $old_words[71] = 'IBM xSeries^3650';
-                       $old_words[72] = 'IBM xSeries^3655';
-                       $old_words[73] = 'IBM xSeries^3650 T';
-                       $old_words[74] = 'IBM xSeries^3755';
-                       $old_words[75] = 'IBM xSeries^3850';
+                       $old_words[43] = 'IBM xSeries&305';
+                       $old_words[44] = 'IBM xSeries&306';
+                       $old_words[45] = 'IBM xSeries&306m';
+                       $old_words[46] = 'IBM xSeries&326m';
+                       $old_words[47] = 'IBM xSeries&330';
+                       $old_words[48] = 'IBM xSeries&335';
+                       $old_words[54] = 'IBM xSeries&346';
+                       $old_words[59] = 'IBM xSeries&326';
+                       $old_words[68] = 'IBM xSeries&3250';
+                       $old_words[69] = 'IBM xSeries&3455';
+                       $old_words[70] = 'IBM xSeries&3550';
+                       $old_words[71] = 'IBM xSeries&3650';
+                       $old_words[72] = 'IBM xSeries&3655';
+                       $old_words[73] = 'IBM xSeries&3650 T';
+                       $old_words[74] = 'IBM xSeries&3755';
+                       $old_words[75] = 'IBM xSeries&3850';
 
-                       $old_words[92] = 'IBM pSeries^185';
-                       $old_words[93] = 'IBM pSeries^505';
-                       $old_words[94] = 'IBM pSeries^505Q';
-                       $old_words[95] = 'IBM pSeries^510';
-                       $old_words[96] = 'IBM pSeries^510Q';
-                       $old_words[97] = 'IBM pSeries^520';
-                       $old_words[98] = 'IBM pSeries^520Q';
-                       $old_words[99] = 'IBM pSeries^550';
-                       $old_words[100] = 'IBM pSeries^550Q';
+                       $old_words[92] = 'IBM pSeries&185';
+                       $old_words[93] = 'IBM pSeries&505';
+                       $old_words[94] = 'IBM pSeries&505Q';
+                       $old_words[95] = 'IBM pSeries&510';
+                       $old_words[96] = 'IBM pSeries&510Q';
+                       $old_words[97] = 'IBM pSeries&520';
+                       $old_words[98] = 'IBM pSeries&520Q';
+                       $old_words[99] = 'IBM pSeries&550';
+                       $old_words[100] = 'IBM pSeries&550Q';
 
                        $old_words[212] = 'Linux^RHFC1';
                        $old_words[213] = 'Linux^RHFC2';
@@ -1163,37 +1163,59 @@ CREATE TABLE `TagTree` (
                        $old_words[219] = 'BSD^Solaris 9';
                        $old_words[220] = 'BSD^Solaris 10';
 
-                       $old_words[221] = 'Windows^2000';
-                       $old_words[222] = 'Windows^XP';
-                       $old_words[223] = 'Windows^2003';
-                       $old_words[224] = 'Windows^Vista';
+                       $old_words[221] = 'Windows&2000';
+                       $old_words[222] = 'Windows&XP';
+                       $old_words[223] = 'Windows&2003';
+                       $old_words[224] = 'Windows&Vista';
 
-                       $old_words[49] = 'Sun^Ultra 10';
-                       $old_words[50] = 'Sun^Enterprise 420R';
-                       $old_words[51] = '[[Sun^Fire X2100 | http://www.sun.com/servers/entry/x2100/]]';
-                       $old_words[52] = '[[Sun^Fire E4900 | http://www.sun.com/servers/midrange/sunfire_e4900/index.xml]]';
-                       $old_words[53] = 'Sun^Netra X1';
-                       $old_words[57] = 'Sun^Fire V210';
-                       $old_words[58] = 'Sun^Fire V240';
-                       $old_words[60] = 'Sun^Netra t1 105';
-                       $old_words[61] = 'Sun^Enterprise 4500';
-                       $old_words[64] = 'Sun^Ultra 5';
-                       $old_words[76] = '[[Sun^Fire X4600 | http://www.sun.com/servers/x64/x4600/]]';
-                       $old_words[77] = '[[Sun^Fire X4500 | http://www.sun.com/servers/x64/x4500/]]';
-                       $old_words[78] = '[[Sun^Fire X4200 | http://www.sun.com/servers/entry/x4200/]]';
-                       $old_words[79] = '[[Sun^Fire X4100 | http://www.sun.com/servers/entry/x4100/]]';
-                       $old_words[80] = '[[Sun^Fire X2100 M2 | http://www.sun.com/servers/entry/x2100/]]';
-                       $old_words[81] = '[[Sun^Fire X2200 M2 | http://www.sun.com/servers/x64/x2200/]]';
-                       $old_words[82] = 'Sun^Fire V40z';
-                       $old_words[83] = 'Sun^Fire V125';
-                       $old_words[84] = '[[Sun^Fire V215 | http://www.sun.com/servers/entry/v215/]]';
-                       $old_words[85] = '[[Sun^Fire V245 | http://www.sun.com/servers/entry/v245/]]';
-                       $old_words[86] = '[[Sun^Fire V445 | http://www.sun.com/servers/entry/v445/]]';
-                       $old_words[87] = 'Sun^Fire V440';
-                       $old_words[88] = '[[Sun^Fire V490 | http://www.sun.com/servers/midrange/v490/]]';
-                       $old_words[89] = '[[Sun^Fire V890 | http://www.sun.com/servers/midrange/v890/]]';
-                       $old_words[90] = '[[Sun^Fire E2900 | http://www.sun.com/servers/midrange/sunfire_e2900/index.xml]]';
-                       $old_words[91] = 'Sun^Fire V1280';
+                       $old_words[49] = 'Sun&Ultra 10';
+                       $old_words[50] = 'Sun&Enterprise 420R';
+                       $old_words[51] = '[[Sun&Fire X2100 | http://www.sun.com/servers/entry/x2100/]]';
+                       $old_words[52] = '[[Sun&Fire E4900 | http://www.sun.com/servers/midrange/sunfire_e4900/index.xml]]';
+                       $old_words[53] = 'Sun&Netra X1';
+                       $old_words[57] = 'Sun&Fire V210';
+                       $old_words[58] = 'Sun&Fire V240';
+                       $old_words[60] = 'Sun&Netra t1 105';
+                       $old_words[61] = 'Sun&Enterprise 4500';
+                       $old_words[64] = 'Sun&Ultra 5';
+                       $old_words[76] = '[[Sun&Fire X4600 | http://www.sun.com/servers/x64/x4600/]]';
+                       $old_words[77] = '[[Sun&Fire X4500 | http://www.sun.com/servers/x64/x4500/]]';
+                       $old_words[78] = '[[Sun&Fire X4200 | http://www.sun.com/servers/entry/x4200/]]';
+                       $old_words[79] = '[[Sun&Fire X4100 | http://www.sun.com/servers/entry/x4100/]]';
+                       $old_words[80] = '[[Sun&Fire X2100 M2 | http://www.sun.com/servers/entry/x2100/]]';
+                       $old_words[81] = '[[Sun&Fire X2200 M2 | http://www.sun.com/servers/x64/x2200/]]';
+                       $old_words[82] = 'Sun&Fire V40z';
+                       $old_words[83] = 'Sun&Fire V125';
+                       $old_words[84] = '[[Sun&Fire V215 | http://www.sun.com/servers/entry/v215/]]';
+                       $old_words[85] = '[[Sun&Fire V245 | http://www.sun.com/servers/entry/v245/]]';
+                       $old_words[86] = '[[Sun&Fire V445 | http://www.sun.com/servers/entry/v445/]]';
+                       $old_words[87] = 'Sun&Fire V440';
+                       $old_words[88] = '[[Sun&Fire V490 | http://www.sun.com/servers/midrange/v490/]]';
+                       $old_words[89] = '[[Sun&Fire V890 | http://www.sun.com/servers/midrange/v890/]]';
+                       $old_words[90] = '[[Sun&Fire E2900 | http://www.sun.com/servers/midrange/sunfire_e2900/index.xml]]';
+                       $old_words[91] = 'Sun&Fire V1280';
+
+                       $old_words[55] = 'Dell PowerEdge&1650';
+                       $old_words[56] = 'Dell PowerEdge&2850';
+                       $old_words[62] = 'Dell PowerEdge&1950';
+                       $old_words[63] = 'Dell PowerEdge&1550';
+                       $old_words[65] = 'Dell PowerEdge&2950';
+                       $old_words[66] = 'Dell PowerEdge&650';
+                       $old_words[67] = 'Dell PowerEdge&4600';
+                       $old_words[355] = 'Dell PowerEdge&6850';
+                       $old_words[356] = 'Dell PowerEdge&6950';
+                       $old_words[357] = 'Dell PowerEdge&R900';
+                       $old_words[358] = 'Dell PowerEdge&4400';
+                       $old_words[359] = 'Dell PowerEdge&2650';
+                       $old_words[360] = 'Dell PowerEdge&2550';
+                       $old_words[370] = 'Dell PowerEdge&750';
+                       $old_words[371] = 'Dell PowerEdge&2450';
+                       $old_words[372] = 'Dell PowerEdge&850';
+                       $old_words[373] = 'Dell PowerEdge&1850';
+                       $old_words[374] = 'Dell PowerEdge&860';
+                       $old_words[375] = 'Dell PowerEdge&2900';
+                       $old_words[376] = 'Dell PowerEdge&2970';
+                       $old_words[377] = 'Dell PowerEdge&SC1435';
 
                        foreach ($new_words as $dict_key => $tmp)
                                foreach ($tmp as $chapter_no => $dict_value)