diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 307cf2418..a1897c26a 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,17 @@
-->
+
+ 2006-10-29
+
+
+ [matthew] - Upgrade to Vim-7.0-fixes-14.patch. Drop the
+ "spellfile" fix as it was applied upstream as patch
+ 076.
+
+
+
+
2006-10-28
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index cddba58da..8a076e697 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -213,6 +213,9 @@
&util-linux-lseek-patch;
+
+ &vim-fixes-patch;
+
@@ -251,6 +254,9 @@
tar-1.15.1-sparse_fix-1.patch
+
+ vim-7.0-fixes-7.patch
+
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index bbc41bc26..58e1bdf49 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -268,14 +268,6 @@
-
- Vim Spellfile Patch - &vim-spellfile-patch-size;:
-
- Download:
- MD5 sum: &vim-spellfile-patch-md5;
-
-
-
Total size of these patches: about
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index db41ce00f..ec2993575 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -59,12 +59,6 @@
patch -Np1 -i ../&vim-mandir-patch;
- There is an issue introduced by one of the upstream patches that
- creates a problem downloading spellfiles via HTTP. Until this is updated
- by the developers, the following patch fixes the problem:
-
-patch -Np1 -i ../&vim-spellfile-patch;
-
Finally, change the default location of the
vimrc configuration file to /etc:
diff --git a/general.ent b/general.ent
index d129257f5..7172c81cb 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
-
-
+
+
diff --git a/patches.ent b/patches.ent
index 38b186b02..c1da4e59e 100644
--- a/patches.ent
+++ b/patches.ent
@@ -133,14 +133,10 @@
-
-
-
+
+
+
-
-
-
-