diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index ea62810a2..3707b51e3 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,9 @@
March 18, 2006
+
+ [matthew] - Upgrade to flex-2.5.33.
+
[matthew] - Upgrade to readline-5.1.004.
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index a96b24483..b0025f631 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -64,9 +64,9 @@
Findutils &findutils-version;
-
+
Gawk &gawk-version;
@@ -254,6 +254,9 @@
Removed:
+
+ flex-2.5.31-debian_fixes-3.patch
+
gcc-3.4.3-linkonce-1.patch
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index 424fa8a80..0e5813a01 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -129,7 +129,7 @@
- Flex (&flex-version;) - 672 KB:
+ Flex (&flex-version;) - 679 KB:
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index c4f01469e..9a6132cbc 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -74,13 +74,6 @@
-
- Flex Brokenness Patch - 156 KB:
-
-
-
-
-
Gawk Segfault Patch - 1 KB:
diff --git a/chapter06/flex.xml b/chapter06/flex.xml
index 3d375d311..1f33675ea 100644
--- a/chapter06/flex.xml
+++ b/chapter06/flex.xml
@@ -26,7 +26,7 @@
0.1 SBU
- 22.5 MB
+ 21.3 MB
@@ -44,18 +44,6 @@
Installation of Flex
- Flex contains several known bugs. Fix these with the following
- patch:
-
-patch -Np1 -i ../&flex-fixes-patch;
-
- The GNU autotools detects that the Flex source code has been
- modified by the previous patch and tries to update the man page
- accordingly. This does not work correctly on many systems, and the
- default page is fine, so make sure it does not get regenerated:
-
-touch doc/flex.1
-
Prepare Flex for compilation:
./configure --prefix=/usr
diff --git a/general.ent b/general.ent
index 2bbbaa55c..430c82cce 100644
--- a/general.ent
+++ b/general.ent
@@ -42,7 +42,7 @@
-
+
diff --git a/patches.ent b/patches.ent
index aa11478af..c960066bd 100644
--- a/patches.ent
+++ b/patches.ent
@@ -14,8 +14,6 @@
-
-