Author: branden
Date: 2004-04-26 15:17:38 -0500 (Mon, 26 Apr 2004)
New Revision: 1316
Modified:
NEWS.xhtml
Log:
Fix typo (thanks, Yann Dirson).
Modified: NEWS.xhtml
===================================================================
--- NEWS.xhtml 2004-04-26 17:47:01 UTC (rev 1315)
+++ NEWS.xhtml 2004-04-26 20:17:38 UTC (rev 1316)
@@ -104,7 +104,7 @@
caused by some patches applied to the trunk, and in part to the fact that
Debian sarge is entering a freeze, it was
agreed on the <code>debian-x</code> mailing list that releases no longer
be made from the trunk. Instead, the trunk
is where development happens (except, as before, for highly-disruptive or
long-term changes that require a branch of
- their own), and a change is meregd onto a release branch only once it is
known to work. The <a
+ their own), and a change is merged onto a release branch only once it is
known to work. The <a
href="/xsf/XFree86/README.txt">README</a> document has been updated
accordingly, <code>branches/4.3.0/sid</code> has
been re-created, and <a href="/xsf/XFree86/">nightly snapshots</a> of it
will be made again.
<address>branden</address></p>
