Add attribution for many people who have made generous contributions to cairo. This list was generated by sifting through the ChangeLog. Please let me know if I have missed anyone.

Add some historical notes on cairo development, prior to when we began to maintain this NEWS file.
Add pointer to cairographics.org. Fix to use cairo rather than Cairo when not at the beginning of a sentence.
Remove cairo_current_path, cairo_current_path_flat, cairo_text_extents, cairo_glyph_extents, cairo_text_path, and cairo_glyph_path from the TODO list as they have all been implemented now.

5 files changed, 70 insertions, 7 deletions

diff --git a/AUTHORS b/AUTHORS
index af389a72c..c260fdd97 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1 +1,15 @@
-Carl D. Worth <cworth@isi.edu>
+Dave Beckett <dave.beckett@bristol.ac.uk> Track rename of libpixman, build fixes
+Andrew Chant <andrew.chant@utoronto.ca> Adding const where needed
+John Ellson <ellson@research.att.com> First font/glyph extents functions
+Richard Henderson <rth@twiddle.net> "slim" macros for better shared libraries 
+James Henstridge <james@daa.com.au> Build fixes related to freetype
+Graydon Hoare <graydon@redhat.com> Support for non-render X server, first real text support
+Thomas Hunger <info@teh-web.de> Initial version of cairo_in_stroke/fill
+Keith Packard <keithp@keithp.com> Original concept, polygon tessellation, dashing
+Christof Petig <christof@petig-baender.de> Build fixes related to freetype
+Jamey Sharp <jamey@minilop.net> Surface/font backend virtualization, XCB backend
+Sasha V. <sasha@aftercode.net> Build fix to compile without xlib backend
+Carl Worth <cworth@isi.edu> Original library, support for paths, images
+Richard D. Worth <richard@theworths.org> Build fixes for cygwin
+
+(please let us know if we have missed anyone)
diff --git a/ChangeLog b/ChangeLog
index 1cf1433b2..7b68800a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2004-02-24  Carl Worth  <cworth@isi.edu>
+
+	* AUTHORS: Add attribution for many people who have made generous
+	contributions to cairo. This list was generated by sifting through
+	the ChangeLog. Please let me know if I have missed anyone.
+
+	* NEWS: Add some historical notes on cairo development, prior to
+	when we began to maintain this NEWS file.
+
+	* README (http): Add pointer to cairographics.org. Fix to use
+	"cairo" rather than "Cairo" when not at the beginning of a
+	sentence.
+
+	* TODO: Remove cairo_current_path, cairo_current_path_flat,
+	cairo_text_extents, cairo_glyph_extents, cairo_text_path, and
+	cairo_glyph_path from the TODO list as they have all been
+	implemented now.
+
 2004-02-17  Carl Worth  <cworth@isi.edu>
 
 	* src/cairo.h: Add comment indication cairo_copy will be going
diff --git a/NEWS b/NEWS
index daa8a717f..5e1f88247 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,5 @@
 2003-12-16 cairo-0.1.17 Carl Worth <cworth@isi.edu>
----------------------------------------------------
+===================================================
 
 Better text support
 -------------------
@@ -42,3 +42,36 @@ OS X supported - several byte-order issues resolved
 Cairo has now been successfully compiled under OS X. Testing revealed
 that there were some byte-order problems in the PostScript backend and
 the PNG generation in the demos. These have now been resolved.
+
+2003-10
+=======
+Graydon Hoare <graydon@redhat.com> implemented the first real text
+support using Freetype/fontconfig, (previous versions of cairo used
+Xft and could only draw text when using an X backend).
+
+2003-09
+=======
+Graydon Hoare <graydon@redhat.com> added the first real support for
+running cairo with a non-render-aware X server.
+
+Jamey Sharp <jamey@minilop.net> virtualized the backend font and
+surface interfaces in September, 2003.
+
+2003-06
+=======
+Xr is renamed cairo to avoid confusion since it no longer had a strict
+dependence on X.
+
+2003-05
+=======
+A new image surface backend is added to Xr. Keith Packard
+<keithp@keithp.com> wrote the image compositing code in libic that is
+used for the image_surface backend. This code was originally written
+as the software fallback for the render extension within the X
+server.
+
+2002-06
+=======
+Carl Worth <cworth@isi.edu> wrote the first lines of Xr, after Keith
+Packard <keithp@keithp.com> proposed the plan for a stateful drawing
+library in C providing a PostScript-like rendering model.
diff --git a/README b/README
index 7d557a79f..47f7ff9bf 100644
--- a/README
+++ b/README
@@ -1,4 +1,5 @@
 Cairo - Multi-platform 2D graphics library
+http://cairographics.org
 
 Compiling
 ---------
@@ -48,7 +49,7 @@ without whose patient help our ignorance would be much more apparent.
 
 Mailing List
 ------------
-If you have trouble with Cairo or you have some ideas for how it could be
+If you have trouble with cairo or you have some ideas for how it could be
 improved, please feel free to send a message to cairo@cairographics.org
 
 Cairo is still under active development and all discussion happens on
diff --git a/TODO b/TODO
index e8ceef093..ddf16a6a1 100644
--- a/TODO
+++ b/TODO
@@ -1,7 +1,5 @@
 * Clean up the API in preparation for freezing and release.
 
-* Add cairo_current_path and cairo_current_path_flat.
-
 * Implement a PDF backend.
 
 * Make a more interesting PS backend, (other than the current
@@ -21,8 +19,7 @@ mentioned in cairo_traps.c).
 * Implement support for programmatic patterns, (ie. figure out how to
 do gradients the Right Way).
 
-* Implement cairo_text_extents, cairo_glyph_extents, cairo_text_path,
-cairo_glyph_path, and cairo_stroke_path, cairo_arc_to.
+* Implement cairo_stroke_path and cairo_arc_to.
 
 * Investigate what needs to be done so that old X servers aren't
 swamped with image transport. This may involve adding one or more of