Add a missing word.

Note that the BadMatch bug has been resolved.

3 files changed, 14 insertions, 5 deletions

diff --git a/CODING_STYLE b/CODING_STYLE
index 04fc53c44..143723d4f 100644
--- a/CODING_STYLE
+++ b/CODING_STYLE
@@ -57,8 +57,8 @@ but some of the code uses an alternate style:
 	}
 
 and that seems just fine. We won't lay down any strict rule on this
-point, (though there should be some local). If you came here hoping to
-find some guidance, then use the first form above.
+point, (though there should be some local consistency). If you came
+here hoping to find some guidance, then use the first form above.
 
 If all of the substatements of an if statement are single statements,
 the optional braces should not usually appear:
diff --git a/ChangeLog b/ChangeLog
index 04d06a216..e0cbedb7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-07  Carl Worth  <cworth@cworth.org>
+
+	* CODING_STYLE: Add a missing word.
+	
+	* ROADMAP: Note that the BadMatch bug has been resolved.
+
 2005-07-06  Carl Worth  <cworth@cworth.org>
 
 	* src/cairo.h:
diff --git a/ROADMAP b/ROADMAP
index 602e48c99..385463e8f 100644
--- a/ROADMAP
+++ b/ROADMAP
@@ -1,12 +1,15 @@
 cairo 0.5.2
 ===========
- Get tor to sign off that the win32 stuff is up to snuff
+  Get tor to sign off that the win32 stuff is up to snuff
 	glyph path patch reviewed and committed
 
- Fix the BadMatch error introduced between 0.5.0 and 0.5.1:
+✓ Fix the BadMatch error introduced between 0.5.0 and 0.5.1:
 	https://bugs.freedesktop.org/show_bug.cgi?id=3604
 
- Add a workaround for Render's overlapping source/dest bug
+	(It turns out this was just exposing an old bug in libpixman
+	 0.1.4 which is already fixed in libpixman 0.1.5)
+
+  Add a workaround for Render's overlapping source/dest bug
 	Use XCopyArea when possible (integer translation)
 	Otherwise make a copy of the source