Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004xf86-4_4_0STSF-CURRENT

86 files changed, 488 insertions, 450 deletions

diff --git a/hw/darwin/XDarwin.man b/hw/darwin/XDarwin.man
index a718e41ce..265dbeb63 100644
--- a/hw/darwin/XDarwin.man
+++ b/hw/darwin/XDarwin.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/darwin/XDarwin.man,v 1.4 2002/01/09 18:01:58 torrey Exp $
+.\" $XFree86: xc/programs/Xserver/hw/darwin/XDarwin.man,v 1.3 2001/09/23 23:02:37 torrey Exp $
 .\"
 .TH XDARWIN 1 __vendorversion__
 .SH NAME
diff --git a/hw/darwin/bundle/Dutch.lproj/Credits.rtf b/hw/darwin/bundle/Dutch.lproj/Credits.rtf
index 7d9a594e6..56038582a 100644
--- a/hw/darwin/bundle/Dutch.lproj/Credits.rtf
+++ b/hw/darwin/bundle/Dutch.lproj/Credits.rtf
@@ -1,154 +1,158 @@
 {\rtf1\mac\ansicpg10000\cocoartf102
-{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique;
+{\fonttbl\f0\fswiss\fcharset77 Helvetica;\f1\fswiss\fcharset77 Helvetica-Bold;\f2\fswiss\fcharset77 Helvetica-Oblique;
 }
 {\colortbl;\red255\green255\blue255;}
 \vieww9000\viewh9000\viewkind0
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f0\fs24 \cf0 This product  includes software developed by The XFree86 Project, Inc  (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\
+\
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f0\b\fs24 \cf0 Contributors to XFree86 4.4:
-\f1\b0 \
+\f1\b \cf0 Contributors to XFree86 4.4:
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 John Harper\
      
 \f2\i Rootless acceleration and Apple-WM extension
-\f1\i0 \
+\f0\i0 \
 Torrey T. Lyons\
      
 \f2\i Project Lead
-\f1\i0 \
+\f0\i0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f0\b \cf0 \
+\f1\b \cf0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 \cf0 Additional XonX Contributors to XFree86 4.3:
-\f1\b0 \
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Fabr\'92cio Luis de Castro\
      
 \f2\i Portuguese localization
-\f1\i0 \
+\f0\i0 \
 Michael Oland\
      
 \f2\i New XDarwin icon
-\f1\i0 \
+\f0\i0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f0\b \cf0 \
+\f1\b \cf0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 \cf0 XonX Contributors to XFree86 4.2:
-\f1\b0 \
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Rob Braun\
      
 \f2\i Darwin x86 support
-\f1\i0 \
+\f0\i0 \
 Pablo Di Noto\
 
 \f2\i      Spanish localization
-\f1\i0 \
+\f0\i0 \
 Paul Edens\
 
 \f2\i      Dutch localization
-\f1\i0 \
+\f0\i0 \
 Kyunghwan Kim\
 
 \f2\i      Korean localization
-\f1\i0 \
+\f0\i0 \
 Mario Klebsch\
      
 \f2\i Non-US keyboard support
-\f1\i0 \
+\f0\i0 \
 Torrey T. Lyons\
      
 \f2\i Project Lead
-\f1\i0 \
+\f0\i0 \
 Andreas Monitzer\
      
 \f2\i German localization
-\f1\i0 \
+\f0\i0 \
 Patrik Montgomery\
 
 \f2\i      Swedish localization
-\f1\i0 \
+\f0\i0 \
 Greg Parker\
      
 \f2\i Rootless support
-\f1\i0 \
+\f0\i0 \
 Toshimitsu Tanaka\
      
 \f2\i Japanese localization
-\f1\i0 \
+\f0\i0 \
 Olivier Verdier\
 
 \f2\i      French localization
-\f1\i0 \
+\f0\i0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f0\b \cf0 \
+\f1\b \cf0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 \cf0 Special Thanks:
-\f1\b0 \
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Devin Poolman and Zero G Software, Inc.\
 
 \f2\i      Installer
-\f1\i0 \
+\f0\i0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f0\b \cf0 \
+\f1\b \cf0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 \cf0 XonX Team Members\
 Contributing to XFree86 4.1:
-\f1\b0 \
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Rob Braun\
      
 \f2\i Darwin x86 support
-\f1\i0 \
+\f0\i0 \
 Torrey T. Lyons\
      
 \f2\i Project Lead
-\f1\i0 \
+\f0\i0 \
 Andreas Monitzer\
      
 \f2\i Cocoa version of XDarwin front end
-\f1\i0 \
+\f0\i0 \
 Greg Parker\
      
 \f2\i Original Quartz implementation
-\f1\i0 \
+\f0\i0 \
 Christoph Pfisterer\
      
 \f2\i Dynamic shared libraries
-\f1\i0 \
+\f0\i0 \
 Toshimitsu Tanaka\
      
 \f2\i Japanese localization
-\f1\i0 \
+\f0\i0 \
 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f0\b \cf0 Special Thanks:
-\f1\b0 \
+\f1\b \cf0 Special Thanks:
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Tiago Ribeiro\
      
 \f2\i XDarwin icon
-\f1\i0 \
+\f0\i0 \
 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f0\b \cf0 History:
-\f1\b0 \
+\f1\b \cf0 History:
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 John Carmack\
      
 \f2\i Original XFree86 port to Mac OS X Server
-\f1\i0 \
+\f0\i0 \
 Dave Zarzycki\
      
 \f2\i XFree86 4.0 port to Darwin 1.0
-\f1\i0 \
+\f0\i0 \
 Torrey T. Lyons\
      
 \f2\i Integration into XFree86 Project for 4.0.2}
\ No newline at end of file
diff --git a/hw/darwin/bundle/Dutch.lproj/XDarwinHelp.html.cpp b/hw/darwin/bundle/Dutch.lproj/XDarwinHelp.html.cpp
index e7ca52c2c..979f0bb06 100644
--- a/hw/darwin/bundle/Dutch.lproj/XDarwinHelp.html.cpp
+++ b/hw/darwin/bundle/Dutch.lproj/XDarwinHelp.html.cpp
@@ -1 +1 @@
-<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/Dutch.lproj/XDarwinHelp.html.cpp,v 1.2 2001/11/19 01:21:32 torrey Exp $ -->

#include "xf86Version.h"
#ifndef PRE_RELEASE
#define PRE_RELEASE XF86_VERSION_SNAP
#endif

<html>
<head>
<title>XFree86 voor Mac OS X</title>
</head>
<body>
<center>
    <h1>XFree86 voor Darwin en Mac OS X</h1>
    XFree86 XF86_VERSION<br>
    Release Date: XF86_REL_DATE
</center>
<h2>Inhoud</h2>
<ol>
    <li><A HREF="#notice">Belangrijke Informatie</A></li>
    <li><A HREF="#usage">Gebruik</A></li>
    <li><A HREF="#path">Instellen van het Path</A></li>
    <li><A HREF="#prefs">Voorkeursinstellingen</A></li>
    <li><A HREF="#license">Licentie</A></li>
</ol>
<center>
    <h2><a NAME="notice">Belangrijke Informatie</a></h2>
</center>
<blockquote>
#if PRE_RELEASE
Dit is een pre-release van XFree86, waarvoor geen ondersteuning beschikbaar is.  Rapporteren van bugs en aanleveren van patches kan op de <A HREF="http://sourceforge.net/projects/xonx/">XonX project pagina</A> bij SourceForge.  Kijk alvorens een bug te rapporteren in een pre-release eerst of een nieuwe versie beschikbaar is bij <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> of in de <A HREF="http://www.XFree86.Org/cvs">XFree86 CVS repository</A>.
#else
Als de server ouder is dan 6-12 maanden, of als uw hardware nieuwer is dan de bovenstaande datum, kijk dan of een nieuwe versie beschikbaar is voor u een probleem aanmeldt.  Rapporteren van bugs en aanleveren van patches kan op de <A HREF="http://sourceforge.net/projects/xonx/">XonX project pagina</A> bij SourceForge.
#endif
</blockquote>
<blockquote>
Deze software is beschikbaar gesteld onder de voorwaarden van de <A HREF="#license">MIT X11 / X Consortium Licentie</A> en is beschikbaar 'AS IS',zonder enige garantie. Lees s.v.p. de <A HREF="#license">Licentie</A> voor gebruik.</blockquote>

<h2><a NAME="usage">Gebruik</a></h2>
<p>XFree86 is een open-source uitvoering van het <a HREF="http://www.x.org/">X Window Systeem</a>, verzorgd door <a HREF="http://www.XFree86.Org/">XFree86 Project, Inc.</a>, die vrij verspreid mag worden. De X window server voor Darwin en Mac OS X verzorgd door XFree86 heet XDarwin.  XDarwin werkt op Mac OS X in schermvullende of rootless modus.</p>
<p>Het X window systeem in schermvullende modus neemt het hele beeldscherm in beslag. U schakelt terug naar de Mac OS X desktop door de toesten Command-Option-A in te drukken. Deze toetsencombinatie kunt u veranderen in de Voorkeuren. Op de Mac OS X desktop klikt u op de XDarwin icoon in de Dock om weer naar het X window systeem te schakelen.  (In de Voorkeuren kunt er voor kiezen om een apart XDarwin schakelpaneel te gebruiken op de Mac OS X desktop.)</p>
<p>In rootless modus verschijnen het X window systeem en Aqua (de Mac OS X desktop) tegelijk op het scherm. Het achtergrondscherm van X11, waarbinnen alle X11 vensters vallen, is net zo groot als het gehele scherm, maar het achtergrondscherm zelf is onzichtbaar.</p>

<h3>Meerknopsmuis emulatie</h3>
<p>Voor veel X11 programma's hebt u een 3-knops muis nodig.  Met een 1-knops muis kunt u een 3-knops muis nabootsen door een toets in te drukken terwijl u klikt met de muis.  Het instellen hiervan kan bij Voorkeuren, "Meerknopsmuis emulatie" in "Algemeen".  Emulatie is standaard ingeschakeld: ingedrukt houden van de "command" toets terwijl u klikt emuleert knop 2, ingedrukt houden van "option" emuleert knop 3.  Deze toetsen kunt u dus wijzigen in de Voorkeuren.  Let op: als u xmodmap gebruikt om de indeling van het toetsenbord te wijzigen, moet u toch de oorspronkelijke toetsen op het toetsenbord gebruiken voor deze functie.</p>

<h2><a NAME="path">Instellen van het Path</a></h2>
<p>Het path is de lijst van directories waarin gezocht wordt naar commando's.  De X11 commando's staan in de directory <code>/usr/X11R6/bin</code>, die dus aan uw path moet worden toegevoegd.  XDarwin doet dit automatisch voor u en kan extra directories toevoegen waarin u commando's hebt ge&iuml;nstalleerd.</p>

<p>Ervaren gebruikers zullen het path al correct hebben ingesteld in de configuratiebestanden voor hun shell.  In dat geval kunt u XDarwin via de Voorkeuren vertellen het path niet te wijzigen.  XDarwin start de eerste X11 clients binnen de standaard login shell van de gebruiker (bij de Voorkeuren kunt u een afwijkende shell opgeven).  Het instellen van het path is afhankelijk van de shell.  Zie hiervoor de man pages voor de shell.</p>

<p>Het kan handig zijn de man pages voor XFree86 toe te voegen aan de lijst waarin gezocht wordt als u documentatie opvraagt.  De manualpages voor X11 staan in <code>/usr/X11R6/man</code> en de <code>MANPATH</code> environment variable bevat de lijst van directories waarin naar documentatie wordt gezocht.</p>

<h2><a NAME="prefs">Voorkeursinstellingen</a></h2>
<p>Een aantal instellingen kan worden gewijzigd door "Voorkeuren..." te kiezen in het "XDarwin" menu.  Wijzigingen van de instellingen genoemd onder "Start" gaan pas in als u XDarwin opnieuw hebt gestart.  Een wijziging van de overige instellingen is direct effectief.  Hier onder vindt u de verschillende mogelijkheden beschreven:</p>

<h3>Algemeen</h3>
<ul>
    <li><b>Gebruik systeempiep voor X11:</b> Als u dit inschakelt wordt het Mac OS X  waarschuwingssignaal ook gebruikt door X11, anders gebruikt X11 een simpele pieptoon (dit is de standaardinstelling).</li>
    <li><b>Wijzigen muis-versnelling door X11 mogelijk:</b> In een standaard X window systeem kan de window manager de muis-versnelling aanpassen.  Dit kan verwarrend zijn omdat de snelheid onder X11 dan verschillend kan zijn van de snelheid die u in Mac OS X bij Systeemvoorkeuren hebt ingesteld.  Om verwarring te voorkomen is de standaardinstelling dat X11 de versnelling niet kan wijzigen.</li>
    <li><b>Meerknopsmuis emulatie:</b> Dit is hierboven beschreven bij <a HREF="#usage">Gebruik</a>.  Als emulatie is ingeschakeld moet u de gekozen toetsen ingedrukt houden terwijl u met de muis klikt om de tweede en derde muisknop na te bootsen.</li>
</ul>

<h3>Start</h3>
<ul>
    <li><b>Standaard modus:</b> Hier kiest u de standaard scherm-modus: schermvullend of rootless (hierboven beschreven bij <a HREF="#usage">Gebruik</a>).  U kunt ook kiezen tijdens het starten van XDarwin, zie de optie hieronder.</li>
    <li><b>Kies scherm-modus tijdens start:</b> Dit is standaard ingeschakeld zodat u tijdens het starten van XDarwin kunt kiezen tussen schermvullend en rootless scherm-modus.  Als u dit uitschakelt start XDarwin in de standaard modus zonder u iets te vragen.</li>
    <li><b>X11 scherm nummer:</b> Met X11 kunnen meerdere schermen worden aangestuurd door verschillende X servers op dezelfde computer.  Als u meerdere X servers tegelijk wilt gebruiken stelt u hier het scherm nummer in dat door XDarwin wordt gebruikt.</li>
    <li><b>Xinerama multi-monitor ondersteuning mogelijk:</b> XDarwin ondersteunt het gebruik van meerdere monitoren met Xinerama, waarbij elke monitor wordt gezien als deel van &eacute;&eacute;n groot rechthoekig scherm.  U kunt Xinerama hier uitschakelen, maar XDarwin werkt op dit moment zonder Xinerama niet goed met meerdere monitoren.  Als u maar 1 monitor gebruikt is deze instelling automatisch uitgeschakeld.</li>
    <li><b>Toetsenbordindeling-bestand:</b> Een toetsenbordindeling-bestand wordt bij het starten geladen en omgezet naar een X11 toetsenbordindeling.  Voor verschillende talen vindt u toetsenbordindelingen in de directory <code>/System/Library/Keyboards</code>.</li>
    <li><b>Bij starten eerste X11 clients:</b> Als XDarwin start, wordt  <code>xinit</code> uitgevoerd om de X window manager en andere X clients te starten (zie "<code>man xinit</code>").  Voordat XDarwin <code>xinit</code> uitvoert voegt het de opgegeven directories toe aan het path.  Standaard wordt alleen <code>/usr/X11R6/bin</code> toegevoegd.  U kunt meerdere directories opgeven, gescheiden door een dubbelepunt.  X clients worden gestart met de standaard login shell van de gebruiker met gebruik van de configuratiebestanden voor die shell.  U kunt een afwijkende shell opgeven.</li>
</ul>

<h3>Schermvullend</h3>
<ul>
    <li><b>Toetscombinatie knop:</b> Klik op deze knop om de toetscombinatie te wijzigen waarmee u tussen de Mac OS X desktop en X11 schakelt.  Als toetscombinatie kunt u elke combinatie gebruiken van de shift, control, command en option toetsen samen met &eacute;&eacute;n normale toets.</li>
    <li><b>Klikken op icoon in Dock schakelt naar X11:</b> Hiermee is een klik op de XDarwin icoon in de Dock voldoende om naar X11 te schakelen.  In sommige versies van Mac OS X verdwijnt soms de cursor als u deze mogelijkheid gebruikt en daarna terugkeert naar de Mac OS X desktop.</li>
    <li><b>Toon help bij schermvullend starten:</b> Hiermee wordt een inleidend scherm getoond als XDarwin schermvullend start.</li>
    <li><b>Kleurdiepte:</b> In de schermvullende modus kan X11 een andere kleurdiepte gebruiken dan Aqua (en de Mac OS X desktop).  Als u "Huidig" kiest, neemt XDarwin bij het starten de kleurdiepte over van Aqua.  U kunt ook kiezen voor 8, 15 of 24 bits.</li>
</ul>

<h2><a NAME="license">Licentie</a></h2>
The XFree86 Project is committed to providing freely redistributable binary and source releases. The main license we use is one based on the traditional MIT X11 / X Consortium License, which does not impose any conditions on modification or redistribution of source code or binaries other than requiring that copyright/license notices are left intact. For more information and additional copyright/licensing notices covering some sections of the code, please see the <A HREF="http://www.xfree86.org/legal/licence.html">XFree86
License page</A>.
<H3><A NAME="3"></A>X Consortium License</H3>
<p>Copyright (C) 1996 X Consortium</p>
<p>Permission is hereby granted, free of charge, to any person obtaining a 
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without
limitation the rights to use, copy, modify, merge, publish, distribute,
sublicense, and/or sell copies of the Software, and to permit persons to
whom the Software is furnished to do so, subject to the following conditions:</p>
<p>The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.</p>
<p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT
SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
IN THE SOFTWARE.</p>
<p>Except as contained in this notice, the name of the X Consortium shall
not be used in advertising or otherwise to promote the sale, use or
other dealings in this Software without prior written authorization from
the X Consortium.</p>
<p>X Window System is a trademark of X Consortium, Inc.</p>
</body>
</html>

\ No newline at end of file
+<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp,v 1.2 2001/11/04 07:02:28 torrey Exp $ -->

#include "xf86Version.h"
#ifndef PRE_RELEASE
#define PRE_RELEASE XF86_VERSION_SNAP
#endif

<html>
<head>
<title>XFree86 voor Mac OS X</title>
</head>
<body>
<center>
    <h1>XFree86 voor Darwin en Mac OS X</h1>
    XFree86 XF86_VERSION<br>
    Release Date: XF86_REL_DATE
</center>
<h2>Inhoud</h2>
<ol>
    <li><A HREF="#notice">Belangrijke Informatie</A></li>
    <li><A HREF="#usage">Gebruik</A></li>
    <li><A HREF="#path">Instellen van het Path</A></li>
    <li><A HREF="#prefs">Voorkeursinstellingen</A></li>
    <li><A HREF="#license">Licentie</A></li>
</ol>
<center>
    <h2><a NAME="notice">Belangrijke Informatie</a></h2>
</center>
<blockquote>
#if PRE_RELEASE
Dit is een pre-release van XFree86, waarvoor geen ondersteuning beschikbaar is.  Rapporteren van bugs en aanleveren van patches kan op de <A HREF="http://sourceforge.net/projects/xonx/">XonX project pagina</A> bij SourceForge.  Kijk alvorens een bug te rapporteren in een pre-release eerst of een nieuwe versie beschikbaar is bij <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> of in de <A HREF="http://www.XFree86.Org/cvs">XFree86 CVS repository</A>.
#else
Als de server ouder is dan 6-12 maanden, of als uw hardware nieuwer is dan de bovenstaande datum, kijk dan of een nieuwe versie beschikbaar is voor u een probleem aanmeldt.  Rapporteren van bugs en aanleveren van patches kan op de <A HREF="http://sourceforge.net/projects/xonx/">XonX project pagina</A> bij SourceForge.
#endif
</blockquote>
<blockquote>
Deze software is beschikbaar gesteld onder de voorwaarden van de <A HREF="#license">MIT X11 / X Consortium Licentie</A> en is beschikbaar 'AS IS',zonder enige garantie. Lees s.v.p. de <A HREF="#license">Licentie</A> voor gebruik.</blockquote>

<h2><a NAME="usage">Gebruik</a></h2>
<p>XFree86 is een open-source uitvoering van het <a HREF="http://www.x.org/">X Window Systeem</a>, verzorgd door <a HREF="http://www.XFree86.Org/">XFree86 Project, Inc.</a>, die vrij verspreid mag worden. De X window server voor Darwin en Mac OS X verzorgd door XFree86 heet XDarwin.  XDarwin werkt op Mac OS X in schermvullende of rootless modus.</p>
<p>Het X window systeem in schermvullende modus neemt het hele beeldscherm in beslag. U schakelt terug naar de Mac OS X desktop door de toesten Command-Option-A in te drukken. Deze toetsencombinatie kunt u veranderen in de Voorkeuren. Op de Mac OS X desktop klikt u op de XDarwin icoon in de Dock om weer naar het X window systeem te schakelen.  (In de Voorkeuren kunt er voor kiezen om een apart XDarwin schakelpaneel te gebruiken op de Mac OS X desktop.)</p>
<p>In rootless modus verschijnen het X window systeem en Aqua (de Mac OS X desktop) tegelijk op het scherm. Het achtergrondscherm van X11, waarbinnen alle X11 vensters vallen, is net zo groot als het gehele scherm, maar het achtergrondscherm zelf is onzichtbaar.</p>

<h3>Meerknopsmuis emulatie</h3>
<p>Voor veel X11 programma's hebt u een 3-knops muis nodig.  Met een 1-knops muis kunt u een 3-knops muis nabootsen door een toets in te drukken terwijl u klikt met de muis.  Het instellen hiervan kan bij Voorkeuren, "Meerknopsmuis emulatie" in "Algemeen".  Emulatie is standaard ingeschakeld: ingedrukt houden van de "command" toets terwijl u klikt emuleert knop 2, ingedrukt houden van "option" emuleert knop 3.  Deze toetsen kunt u dus wijzigen in de Voorkeuren.  Let op: als u xmodmap gebruikt om de indeling van het toetsenbord te wijzigen, moet u toch de oorspronkelijke toetsen op het toetsenbord gebruiken voor deze functie.</p>

<h2><a NAME="path">Instellen van het Path</a></h2>
<p>Het path is de lijst van directories waarin gezocht wordt naar commando's.  De X11 commando's staan in de directory <code>/usr/X11R6/bin</code>, die dus aan uw path moet worden toegevoegd.  XDarwin doet dit automatisch voor u en kan extra directories toevoegen waarin u commando's hebt ge&iuml;nstalleerd.</p>

<p>Ervaren gebruikers zullen het path al correct hebben ingesteld in de configuratiebestanden voor hun shell.  In dat geval kunt u XDarwin via de Voorkeuren vertellen het path niet te wijzigen.  XDarwin start de eerste X11 clients binnen de standaard login shell van de gebruiker (bij de Voorkeuren kunt u een afwijkende shell opgeven).  Het instellen van het path is afhankelijk van de shell.  Zie hiervoor de man pages voor de shell.</p>

<p>Het kan handig zijn de man pages voor XFree86 toe te voegen aan de lijst waarin gezocht wordt als u documentatie opvraagt.  De manualpages voor X11 staan in <code>/usr/X11R6/man</code> en de <code>MANPATH</code> environment variable bevat de lijst van directories waarin naar documentatie wordt gezocht.</p>

<h2><a NAME="prefs">Voorkeursinstellingen</a></h2>
<p>Een aantal instellingen kan worden gewijzigd door "Voorkeuren..." te kiezen in het "XDarwin" menu.  Wijzigingen van de instellingen genoemd onder "Start" gaan pas in als u XDarwin opnieuw hebt gestart.  Een wijziging van de overige instellingen is direct effectief.  Hier onder vindt u de verschillende mogelijkheden beschreven:</p>

<h3>Algemeen</h3>
<ul>
    <li><b>Gebruik systeempiep voor X11:</b> Als u dit inschakelt wordt het Mac OS X  waarschuwingssignaal ook gebruikt door X11, anders gebruikt X11 een simpele pieptoon (dit is de standaardinstelling).</li>
    <li><b>Wijzigen muis-versnelling door X11 mogelijk:</b> In een standaard X window systeem kan de window manager de muis-versnelling aanpassen.  Dit kan verwarrend zijn omdat de snelheid onder X11 dan verschillend kan zijn van de snelheid die u in Mac OS X bij Systeemvoorkeuren hebt ingesteld.  Om verwarring te voorkomen is de standaardinstelling dat X11 de versnelling niet kan wijzigen.</li>
    <li><b>Meerknopsmuis emulatie:</b> Dit is hierboven beschreven bij <a HREF="#usage">Gebruik</a>.  Als emulatie is ingeschakeld moet u de gekozen toetsen ingedrukt houden terwijl u met de muis klikt om de tweede en derde muisknop na te bootsen.</li>
</ul>

<h3>Start</h3>
<ul>
    <li><b>Standaard modus:</b> Hier kiest u de standaard scherm-modus: schermvullend of rootless (hierboven beschreven bij <a HREF="#usage">Gebruik</a>).  U kunt ook kiezen tijdens het starten van XDarwin, zie de optie hieronder.</li>
    <li><b>Kies scherm-modus tijdens start:</b> Dit is standaard ingeschakeld zodat u tijdens het starten van XDarwin kunt kiezen tussen schermvullend en rootless scherm-modus.  Als u dit uitschakelt start XDarwin in de standaard modus zonder u iets te vragen.</li>
    <li><b>X11 scherm nummer:</b> Met X11 kunnen meerdere schermen worden aangestuurd door verschillende X servers op dezelfde computer.  Als u meerdere X servers tegelijk wilt gebruiken stelt u hier het scherm nummer in dat door XDarwin wordt gebruikt.</li>
    <li><b>Xinerama multi-monitor ondersteuning mogelijk:</b> XDarwin ondersteunt het gebruik van meerdere monitoren met Xinerama, waarbij elke monitor wordt gezien als deel van &eacute;&eacute;n groot rechthoekig scherm.  U kunt Xinerama hier uitschakelen, maar XDarwin werkt op dit moment zonder Xinerama niet goed met meerdere monitoren.  Als u maar 1 monitor gebruikt is deze instelling automatisch uitgeschakeld.</li>
    <li><b>Toetsenbordindeling-bestand:</b> Een toetsenbordindeling-bestand wordt bij het starten geladen en omgezet naar een X11 toetsenbordindeling.  Voor verschillende talen vindt u toetsenbordindelingen in de directory <code>/System/Library/Keyboards</code>.</li>
    <li><b>Bij starten eerste X11 clients:</b> Als XDarwin start, wordt  <code>xinit</code> uitgevoerd om de X window manager en andere X clients te starten (zie "<code>man xinit</code>").  Voordat XDarwin <code>xinit</code> uitvoert voegt het de opgegeven directories toe aan het path.  Standaard wordt alleen <code>/usr/X11R6/bin</code> toegevoegd.  U kunt meerdere directories opgeven, gescheiden door een dubbelepunt.  X clients worden gestart met de standaard login shell van de gebruiker met gebruik van de configuratiebestanden voor die shell.  U kunt een afwijkende shell opgeven.</li>
</ul>

<h3>Schermvullend</h3>
<ul>
    <li><b>Toetscombinatie knop:</b> Klik op deze knop om de toetscombinatie te wijzigen waarmee u tussen de Mac OS X desktop en X11 schakelt.  Als toetscombinatie kunt u elke combinatie gebruiken van de shift, control, command en option toetsen samen met &eacute;&eacute;n normale toets.</li>
    <li><b>Klikken op icoon in Dock schakelt naar X11:</b> Hiermee is een klik op de XDarwin icoon in de Dock voldoende om naar X11 te schakelen.  In sommige versies van Mac OS X verdwijnt soms de cursor als u deze mogelijkheid gebruikt en daarna terugkeert naar de Mac OS X desktop.</li>
    <li><b>Toon help bij schermvullend starten:</b> Hiermee wordt een inleidend scherm getoond als XDarwin schermvullend start.</li>
    <li><b>Kleurdiepte:</b> In de schermvullende modus kan X11 een andere kleurdiepte gebruiken dan Aqua (en de Mac OS X desktop).  Als u "Huidig" kiest, neemt XDarwin bij het starten de kleurdiepte over van Aqua.  U kunt ook kiezen voor 8, 15 of 24 bits.</li>
</ul>

<h2><a NAME="license">Licentie</a></h2>
The XFree86 Project is committed to providing freely redistributable binary and source releases. The main license we use is one based on the traditional MIT X11 / X Consortium License, which does not impose any conditions on modification or redistribution of source code or binaries other than requiring that copyright/license notices are left intact. For more information and additional copyright/licensing notices covering some sections of the code, please see the <A HREF="http://www.xfree86.org/legal/licence.html">XFree86
License page</A>.
<H3><A NAME="3"></A>X Consortium License</H3>
<p>Copyright (C) 1996 X Consortium</p>
<p>Permission is hereby granted, free of charge, to any person obtaining a 
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without
limitation the rights to use, copy, modify, merge, publish, distribute,
sublicense, and/or sell copies of the Software, and to permit persons to
whom the Software is furnished to do so, subject to the following conditions:</p>
<p>The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.</p>
<p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT
SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
IN THE SOFTWARE.</p>
<p>Except as contained in this notice, the name of the X Consortium shall
not be used in advertising or otherwise to promote the sale, use or
other dealings in this Software without prior written authorization from
the X Consortium.</p>
<p>X Window System is a trademark of X Consortium, Inc.</p>
</body>
</html>

\ No newline at end of file
diff --git a/hw/darwin/bundle/English.lproj/Credits.rtf b/hw/darwin/bundle/English.lproj/Credits.rtf
index 32c64f026..2bf7a8eaf 100644
--- a/hw/darwin/bundle/English.lproj/Credits.rtf
+++ b/hw/darwin/bundle/English.lproj/Credits.rtf
@@ -1,154 +1,158 @@
 {\rtf1\mac\ansicpg10000\cocoartf102
-{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique;
+{\fonttbl\f0\fswiss\fcharset77 Helvetica;\f1\fswiss\fcharset77 Helvetica-Bold;\f2\fswiss\fcharset77 Helvetica-Oblique;
 }
 {\colortbl;\red255\green255\blue255;}
 \vieww5160\viewh6300\viewkind0
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f0\fs24 \cf0 This product  includes software developed by The XFree86 Project, Inc  (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\
+\
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f0\b\fs24 \cf0 Contributors to XFree86 4.4:
-\f1\b0 \
+\f1\b \cf0 Contributors to XFree86 4.4:
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 John Harper\
      
 \f2\i Rootless acceleration and Apple-WM extension
-\f1\i0 \
+\f0\i0 \
 Torrey T. Lyons\
      
 \f2\i Project Lead
-\f1\i0 \
+\f0\i0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f0\b \cf0 \
+\f1\b \cf0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 \cf0 Additional XonX Contributors to XFree86 4.3:
-\f1\b0 \
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Fabr\'92cio Luis de Castro\
      
 \f2\i Portuguese localization
-\f1\i0 \
+\f0\i0 \
 Michael Oland\
      
 \f2\i New XDarwin icon
-\f1\i0 \
+\f0\i0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f0\b \cf0 \
+\f1\b \cf0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 \cf0 XonX Contributors to XFree86 4.2:
-\f1\b0 \
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Rob Braun\
      
 \f2\i Darwin x86 support
-\f1\i0 \
+\f0\i0 \
 Pablo Di Noto\
 
 \f2\i      Spanish localization
-\f1\i0 \
+\f0\i0 \
 Paul Edens\
 
 \f2\i      Dutch localization
-\f1\i0 \
+\f0\i0 \
 Kyunghwan Kim\
 
 \f2\i      Korean localization
-\f1\i0 \
+\f0\i0 \
 Mario Klebsch\
      
 \f2\i Non-US keyboard support
-\f1\i0 \
+\f0\i0 \
 Torrey T. Lyons\
      
 \f2\i Project Lead
-\f1\i0 \
+\f0\i0 \
 Andreas Monitzer\
      
 \f2\i German localization
-\f1\i0 \
+\f0\i0 \
 Patrik Montgomery\
 
 \f2\i      Swedish localization
-\f1\i0 \
+\f0\i0 \
 Greg Parker\
      
 \f2\i Rootless support
-\f1\i0 \
+\f0\i0 \
 Toshimitsu Tanaka\
      
 \f2\i Japanese localization
-\f1\i0 \
+\f0\i0 \
 Olivier Verdier\
 
 \f2\i      French localization
-\f1\i0 \
+\f0\i0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f0\b \cf0 \
+\f1\b \cf0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 \cf0 Special Thanks:
-\f1\b0 \
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Devin Poolman and Zero G Software, Inc.\
 
 \f2\i      Installer
-\f1\i0 \
+\f0\i0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f0\b \cf0 \
+\f1\b \cf0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 \cf0 XonX Team Members\
 Contributing to XFree86 4.1:
-\f1\b0 \
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Rob Braun\
      
 \f2\i Darwin x86 support
-\f1\i0 \
+\f0\i0 \
 Torrey T. Lyons\
      
 \f2\i Project Lead
-\f1\i0 \
+\f0\i0 \
 Andreas Monitzer\
      
 \f2\i Cocoa version of XDarwin front end
-\f1\i0 \
+\f0\i0 \
 Greg Parker\
      
 \f2\i Original Quartz implementation
-\f1\i0 \
+\f0\i0 \
 Christoph Pfisterer\
      
 \f2\i Dynamic shared libraries
-\f1\i0 \
+\f0\i0 \
 Toshimitsu Tanaka\
      
 \f2\i Japanese localization
-\f1\i0 \
+\f0\i0 \
 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f0\b \cf0 Special Thanks:
-\f1\b0 \
+\f1\b \cf0 Special Thanks:
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Tiago Ribeiro\
      
 \f2\i XDarwin icon
-\f1\i0 \
+\f0\i0 \
 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f0\b \cf0 History:
-\f1\b0 \
+\f1\b \cf0 History:
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 John Carmack\
      
 \f2\i Original XFree86 port to Mac OS X Server
-\f1\i0 \
+\f0\i0 \
 Dave Zarzycki\
      
 \f2\i XFree86 4.0 port to Darwin 1.0
-\f1\i0 \
+\f0\i0 \
 Torrey T. Lyons\
      
 \f2\i Integration into XFree86 Project for 4.0.2}
\ No newline at end of file
diff --git a/hw/darwin/bundle/English.lproj/InfoPlist.strings.cpp b/hw/darwin/bundle/English.lproj/InfoPlist.strings.cpp
index 99211244e..4a8467ce1 100644
--- a/hw/darwin/bundle/English.lproj/InfoPlist.strings.cpp
+++ b/hw/darwin/bundle/English.lproj/InfoPlist.strings.cpp
@@ -1,5 +1,5 @@
 /* English versions of the Info.plist keys; used by most localizations. */
 /* Most of these are set in the target application settings. */
-/* $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/InfoPlist.strings.cpp,v 1.4 2003/01/15 02:34:04 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/InfoPlist.strings.cpp,v 1.3 2002/07/17 01:24:55 torrey Exp $ */
 
 NSHumanReadableCopyright = __quote__XFree86 XF86_VERSION\nCopyright 2003 XFree86 Project, Inc.__quote__;
diff --git a/hw/darwin/bundle/English.lproj/Localizable.strings b/hw/darwin/bundle/English.lproj/Localizable.strings
index 241d1585b..2c25c1dc3 100644
--- a/hw/darwin/bundle/English.lproj/Localizable.strings
+++ b/hw/darwin/bundle/English.lproj/Localizable.strings
@@ -1,5 +1,5 @@
 /* English localized versions of strings used by the Mac OS X front end. */
-/* $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/Localizable.strings,v 1.4 2003/11/04 22:48:14 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/Localizable.strings,v 1.3 2002/01/30 06:50:46 torrey Exp $ */
 
 /* Title of alert panel */
 "Quit X server?" = "Quit X server?";
diff --git a/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp b/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp
index fc11e26d3..5f18216aa 100644
--- a/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp
+++ b/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp
@@ -1,4 +1,4 @@
-<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp,v 1.2 2001/11/04 07:02:28 torrey Exp $ -->
+<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp,v 1.1 2001/05/21 01:42:17 torrey Exp $ -->
 
 #include "xf86Version.h"
 #ifndef PRE_RELEASE
diff --git a/hw/darwin/bundle/French.lproj/Credits.rtf b/hw/darwin/bundle/French.lproj/Credits.rtf
index 66c1bdae0..82f12ac44 100644
--- a/hw/darwin/bundle/French.lproj/Credits.rtf
+++ b/hw/darwin/bundle/French.lproj/Credits.rtf
@@ -1,152 +1,156 @@
 {\rtf1\mac\ansicpg10000\cocoartf102
-{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique;
+{\fonttbl\f0\fswiss\fcharset77 Helvetica;\f1\fswiss\fcharset77 Helvetica-Bold;\f2\fswiss\fcharset77 Helvetica-Oblique;
 }
 {\colortbl;\red255\green255\blue255;}
 \vieww5160\viewh4480\viewkind0
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f0\fs24 \cf0 This product  includes software developed by The XFree86 Project, Inc  (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\
+\
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f0\b\fs24 \cf0 Contributors to XFree86 4.4:
-\f1\b0 \
+\f1\b \cf0 Contributors to XFree86 4.4:
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 John Harper\
      
 \f2\i Rootless acceleration and Apple-WM extension
-\f1\i0 \
+\f0\i0 \
 Torrey T. Lyons\
      
 \f2\i Project Lead
-\f1\i0 \
+\f0\i0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f0\b \cf0 \
+\f1\b \cf0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 \cf0 Additional XonX Contributors to XFree86 4.3:
-\f1\b0 \
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Fabr\'92cio Luis de Castro\
      
 \f2\i Portuguese localization
-\f1\i0 \
+\f0\i0 \
 Michael Oland\
      
 \f2\i New XDarwin icon
-\f1\i0 \
+\f0\i0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f0\b \cf0 \
+\f1\b \cf0 \
 Participants \'88 XonX pour XFree86 4.2 :
-\f1\b0 \
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Rob Braun\
      
 \f2\i Version pour Darwin x86 
-\f1\i0 \
+\f0\i0 \
 Pablo Di Noto\
 
 \f2\i      Traduction en espagnol
-\f1\i0 \
+\f0\i0 \
 Paul Edens\
 
 \f2\i      Traduction en allemand
-\f1\i0 \
+\f0\i0 \
 Kyunghwan Kim\
 
 \f2\i      Traduction en cor\'8een
-\f1\i0 \
+\f0\i0 \
 Mario Klebsch\
      
 \f2\i Claviers non-US
-\f1\i0 \
+\f0\i0 \
 Torrey T. Lyons\
      
 \f2\i Direction du projet
-\f1\i0 \
+\f0\i0 \
 Andreas Monitzer\
      
 \f2\i Traduction en allemand
-\f1\i0 \
+\f0\i0 \
 Patrik Montgomery\
 
 \f2\i      Traduction en su\'8edois
-\f1\i0 \
+\f0\i0 \
 Greg Parker\
      
 \f2\i Version \'c7 rootless \'c8
-\f1\i0 \
+\f0\i0 \
 Toshimitsu Tanaka\
      
 \f2\i Traduction en japonais
-\f1\i0 \
+\f0\i0 \
 Olivier Verdier\
 
 \f2\i      Traduction en fran\'8dais
-\f1\i0 \
+\f0\i0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f0\b \cf0 \
+\f1\b \cf0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 \cf0 Remerciements :
-\f1\b0 \
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Devin Poolman et Zero G Software, Inc.\
 
 \f2\i      Installeur
-\f1\i0 \
+\f0\i0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f0\b \cf0 \
+\f1\b \cf0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 \cf0 Participants \'88 XonX pour XFree86 4.2 :
-\f1\b0 \
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Rob Braun\
      
 \f2\i Version pour Darwin x86 
-\f1\i0 \
+\f0\i0 \
 Torrey T. Lyons\
      
 \f2\i Direction du projet
-\f1\i0 \
+\f0\i0 \
 Andreas Monitzer\
      
 \f2\i Version Cocoa de l'interface de XDarwin
-\f1\i0 \
+\f0\i0 \
 Greg Parker\
      
 \f2\i Impl\'8ementation initiale sur Quartz
-\f1\i0 \
+\f0\i0 \
 Christoph Pfisterer\
      
 \f2\i Librairies partag\'8ees dynamiquement
-\f1\i0 \
+\f0\i0 \
 Toshimitsu Tanaka\
      
 \f2\i Traduction en japonais
-\f1\i0 \
+\f0\i0 \
 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f0\b \cf0 Remerciements :
-\f1\b0 \
+\f1\b \cf0 Remerciements :
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Tiago Ribeiro\
      Ic\'99ne 
 \f2\i XDarwin
-\f1\i0 \
+\f0\i0 \
 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f0\b \cf0 Historique :
-\f1\b0 \
+\f1\b \cf0 Historique :
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 John Carmack\
      
 \f2\i Premi\'8fre adaptation de XFree86 sur Mac OS X Server
-\f1\i0 \
+\f0\i0 \
 Dave Zarzycki\
      
 \f2\i Adaptation de Free86 4.0 pour Darwin 1.0
-\f1\i0 \
+\f0\i0 \
 Torrey T. Lyons\
      
 \f2\i Int\'8egration dans le projet XFree86 pour la version 4.0.2}
\ No newline at end of file
diff --git a/hw/darwin/bundle/French.lproj/XDarwinHelp.html.cpp b/hw/darwin/bundle/French.lproj/XDarwinHelp.html.cpp
index 0fdfb01fb..4b23c46cd 100644
--- a/hw/darwin/bundle/French.lproj/XDarwinHelp.html.cpp
+++ b/hw/darwin/bundle/French.lproj/XDarwinHelp.html.cpp
@@ -1,4 +1,4 @@
-<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/French.lproj/XDarwinHelp.html.cpp,v 1.2 2001/12/20 06:42:20 torrey Exp $ -->
+<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp,v 1.2 2001/11/04 07:02:28 torrey Exp $ -->
 
 #include "xf86Version.h"
 #ifndef PRE_RELEASE
diff --git a/hw/darwin/bundle/German.lproj/Credits.rtf b/hw/darwin/bundle/German.lproj/Credits.rtf
index 32c64f026..2bf7a8eaf 100644
--- a/hw/darwin/bundle/German.lproj/Credits.rtf
+++ b/hw/darwin/bundle/German.lproj/Credits.rtf
@@ -1,154 +1,158 @@
 {\rtf1\mac\ansicpg10000\cocoartf102
-{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique;
+{\fonttbl\f0\fswiss\fcharset77 Helvetica;\f1\fswiss\fcharset77 Helvetica-Bold;\f2\fswiss\fcharset77 Helvetica-Oblique;
 }
 {\colortbl;\red255\green255\blue255;}
 \vieww5160\viewh6300\viewkind0
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f0\fs24 \cf0 This product  includes software developed by The XFree86 Project, Inc  (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\
+\
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f0\b\fs24 \cf0 Contributors to XFree86 4.4:
-\f1\b0 \
+\f1\b \cf0 Contributors to XFree86 4.4:
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 John Harper\
      
 \f2\i Rootless acceleration and Apple-WM extension
-\f1\i0 \
+\f0\i0 \
 Torrey T. Lyons\
      
 \f2\i Project Lead
-\f1\i0 \
+\f0\i0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f0\b \cf0 \
+\f1\b \cf0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 \cf0 Additional XonX Contributors to XFree86 4.3:
-\f1\b0 \
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Fabr\'92cio Luis de Castro\
      
 \f2\i Portuguese localization
-\f1\i0 \
+\f0\i0 \
 Michael Oland\
      
 \f2\i New XDarwin icon
-\f1\i0 \
+\f0\i0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f0\b \cf0 \
+\f1\b \cf0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 \cf0 XonX Contributors to XFree86 4.2:
-\f1\b0 \
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Rob Braun\
      
 \f2\i Darwin x86 support
-\f1\i0 \
+\f0\i0 \
 Pablo Di Noto\
 
 \f2\i      Spanish localization
-\f1\i0 \
+\f0\i0 \
 Paul Edens\
 
 \f2\i      Dutch localization
-\f1\i0 \
+\f0\i0 \
 Kyunghwan Kim\
 
 \f2\i      Korean localization
-\f1\i0 \
+\f0\i0 \
 Mario Klebsch\
      
 \f2\i Non-US keyboard support
-\f1\i0 \
+\f0\i0 \
 Torrey T. Lyons\
      
 \f2\i Project Lead
-\f1\i0 \
+\f0\i0 \
 Andreas Monitzer\
      
 \f2\i German localization
-\f1\i0 \
+\f0\i0 \
 Patrik Montgomery\
 
 \f2\i      Swedish localization
-\f1\i0 \
+\f0\i0 \
 Greg Parker\
      
 \f2\i Rootless support
-\f1\i0 \
+\f0\i0 \
 Toshimitsu Tanaka\
      
 \f2\i Japanese localization
-\f1\i0 \
+\f0\i0 \
 Olivier Verdier\
 
 \f2\i      French localization
-\f1\i0 \
+\f0\i0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f0\b \cf0 \
+\f1\b \cf0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 \cf0 Special Thanks:
-\f1\b0 \
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Devin Poolman and Zero G Software, Inc.\
 
 \f2\i      Installer
-\f1\i0 \
+\f0\i0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f0\b \cf0 \
+\f1\b \cf0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 \cf0 XonX Team Members\
 Contributing to XFree86 4.1:
-\f1\b0 \
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Rob Braun\
      
 \f2\i Darwin x86 support
-\f1\i0 \
+\f0\i0 \
 Torrey T. Lyons\
      
 \f2\i Project Lead
-\f1\i0 \
+\f0\i0 \
 Andreas Monitzer\
      
 \f2\i Cocoa version of XDarwin front end
-\f1\i0 \
+\f0\i0 \
 Greg Parker\
      
 \f2\i Original Quartz implementation
-\f1\i0 \
+\f0\i0 \
 Christoph Pfisterer\
      
 \f2\i Dynamic shared libraries
-\f1\i0 \
+\f0\i0 \
 Toshimitsu Tanaka\
      
 \f2\i Japanese localization
-\f1\i0 \
+\f0\i0 \
 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f0\b \cf0 Special Thanks:
-\f1\b0 \
+\f1\b \cf0 Special Thanks:
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Tiago Ribeiro\
      
 \f2\i XDarwin icon
-\f1\i0 \
+\f0\i0 \
 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f0\b \cf0 History:
-\f1\b0 \
+\f1\b \cf0 History:
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 John Carmack\
      
 \f2\i Original XFree86 port to Mac OS X Server
-\f1\i0 \
+\f0\i0 \
 Dave Zarzycki\
      
 \f2\i XFree86 4.0 port to Darwin 1.0
-\f1\i0 \
+\f0\i0 \
 Torrey T. Lyons\
      
 \f2\i Integration into XFree86 Project for 4.0.2}
\ No newline at end of file
diff --git a/hw/darwin/bundle/German.lproj/XDarwinHelp.html.cpp b/hw/darwin/bundle/German.lproj/XDarwinHelp.html.cpp
index 6b1b91f5c..f7b6e96ae 100644
--- a/hw/darwin/bundle/German.lproj/XDarwinHelp.html.cpp
+++ b/hw/darwin/bundle/German.lproj/XDarwinHelp.html.cpp
@@ -1,4 +1,4 @@
-<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/German.lproj/XDarwinHelp.html.cpp,v 1.1 2001/11/03 00:25:34 torrey Exp $ -->
+<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp,v 1.1 2001/05/21 01:42:17 torrey Exp $ -->
 
 #include "xf86Version.h"
 #ifndef PRE_RELEASE
diff --git a/hw/darwin/bundle/Japanese.lproj/Credits.rtf b/hw/darwin/bundle/Japanese.lproj/Credits.rtf
index a7d24c2a6..8278a4063 100644
--- a/hw/darwin/bundle/Japanese.lproj/Credits.rtf
+++ b/hw/darwin/bundle/Japanese.lproj/Credits.rtf
@@ -1,167 +1,175 @@
-{\rtf1\mac\ansicpg10001\cocoartf102
-{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique;
+{\rtf1\mac\ansicpg10000\cocoartf102
+{\fonttbl\f0\fswiss\fcharset77 Helvetica;\f1\fswiss\fcharset77 Helvetica-Bold;\f2\fswiss\fcharset77 Helvetica-Oblique;
 \f3\fnil\fcharset78 HiraKakuPro-W3;}
 {\colortbl;\red255\green255\blue255;}
 \vieww13980\viewh11160\viewkind0
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f0\fs24 \cf0 This product  includes software developed by The XFree86 Project, Inc  (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\
+\
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f0\b\fs24 \cf0 Contributors to XFree86 4.4:
-\f1\b0 \
+\f1\b \cf0 Contributors to XFree86 4.4:
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 John Harper
 \f2\i \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f3\i0    \'83\'8b\'81\'5b\'83\'67\'83\'8c\'83\'58 \'83\'41\'83\'4e\'83\'5a\'83\'89\'83\'8c\'81\'5b\'83\'56\'83\'87\'83\'93 \'82\'a8\'82\'e6\'82\'d1 Apple-WM \'8a\'67\'92\'a3
-\f1 \
+\f3\i0 \cf0    \'83\'8b\'81\'5b\'83\'67\'83\'8c\'83\'58 \'83\'41\'83\'4e\'83\'5a\'83\'89\'83\'8c\'81\'5b\'83\'56\'83\'87\'83\'93 \'82\'a8\'82\'e6\'82\'d1 Apple-WM \'8a\'67\'92\'a3
+\f0 \
 Torrey T. Lyons\
      
 \f3 \'83\'76\'83\'8d\'83\'57\'83\'46\'83\'4e\'83\'67 \'83\'8a\'81\'5b\'83\'5f\'81\'5b\
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f0\b \cf0 \
+\f1\b \cf0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 \cf0 Additional XonX Contributors to XFree86 4.3:
-\f1\b0 \
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Fabr\'92cio Luis de Castro\
      
 \f3 \'83\'7c\'83\'8b\'83\'67\'83\'4b\'83\'8b\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
-\f1 \
+\f0 \
 Michael Oland\
      
 \f3 \'90\'56\'82\'b5\'82\'a2
-\f1 XDarwin 
+\f0 XDarwin 
 \f3 \'83\'41\'83\'43\'83\'52\'83\'93
-\f1 \
+\f0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f0\b \cf0 \
+\f1\b \cf0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 \cf0 XonX Contributors to XFree86 4.2:
-\f1\b0 \
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Rob Braun\
      Darwin x86
 \f2\i  
 \f3\i0 \'83\'54\'83\'7c\'81\'5b\'83\'67
-\f1 \
+\f0 \
 Pablo Di Noto\
 
 \f2\i      
 \f3\i0 \'83\'58\'83\'79\'83\'43\'83\'93\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
-\f1 \
+\f0 \
 Paul Edens\
 
 \f2\i      
 \f3\i0 \'83\'49\'83\'89\'83\'93\'83\'5f\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
-\f1 \
+\f0 \
 Kyunghwan Kim\
 
 \f2\i      
 \f3\i0 \'8a\'d8\'8d\'91\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
-\f1 \
+\f0 \
 Mario Klebsch\
      
 \f3 \'94\'f1US\'83\'4c\'81\'5b\'83\'7b\'81\'5b\'83\'68 \'83\'54\'83\'7c\'81\'5b\'83\'67
-\f1 \
+\f0 \
 Torrey T. Lyons\
      
 \f3 \'83\'76\'83\'8d\'83\'57\'83\'46\'83\'4e\'83\'67 \'83\'8a\'81\'5b\'83\'5f\'81\'5b
-\f1 \
+\f0 \
 Andreas Monitzer\
      
 \f3 \'83\'68\'83\'43\'83\'63\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
-\f1 \
+\f0 \
 Patrik Montgomery\
 
 \f2\i      
 \f3\i0 \'83\'58\'83\'45\'83\'46\'81\'5b\'83\'66\'83\'93\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
-\f1 \
+\f0 \
 Greg Parker\
      
 \f3 \'83\'8b\'81\'5b\'83\'67\'83\'8c\'83\'58 \'83\'54\'83\'7c\'81\'5b\'83\'67
-\f1 \
+\f0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f3 \'93\'63\'92\'86 \'8f\'72\'8c\'f5
-\f1 \
+\f3 \cf0 \'93\'63\'92\'86 \'8f\'72\'8c\'f5
+\f0 \
      
 \f3 \'93\'fa\'96\'7b\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
-\f1 \
+\f0 \
 Olivier Verdier\
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f2\i      
+\f2\i \cf0      
 \f3\i0 \'83\'74\'83\'89\'83\'93\'83\'58\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
-\f1 \
+\f0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f0\b \cf0 \
+\f1\b \cf0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 \cf0 Special Thanks:
-\f1\b0 \
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Devin Poolman and Zero G Software, Inc.\
 
 \f2\i      
 \f3\i0 \'83\'43\'83\'93\'83\'58\'83\'67\'81\'5b\'83\'89
-\f1 \
+\f0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f0\b \cf0 \
+\f1\b \cf0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 \cf0 XonX Team Members\
 Contributing to XFree86 4.1:
-\f1\b0 \
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Rob Braun\
      Darwin x86 
 \f3 \'83\'54\'83\'7c\'81\'5b\'83\'67
-\f1 \
+\f0 \
 Torrey T. Lyons\
      
 \f3 \'83\'76\'83\'8d\'83\'57\'83\'46\'83\'4e\'83\'67 \'83\'8a\'81\'5b\'83\'5f\'81\'5b
-\f1 \
+\f0 \
 Andreas Monitzer\
      Cocoa 
 \f3 \'94\'c5 XDarwin \'83\'74\'83\'8d\'83\'93\'83\'67\'83\'47\'83\'93\'83\'68
-\f1 \
+\f0 \
 Greg Parker\
      
 \f3 \'8d\'c5\'8f\'89\'82\'cc Quartz \'83\'43\'83\'93\'83\'76\'83\'8a\'83\'81\'83\'93\'83\'67
-\f1 \
+\f0 \
 Christoph Pfisterer\
      
 \f3 \'8b\'a4\'97\'4c\'83\'89\'83\'43\'83\'75\'83\'89\'83\'8a
-\f1 \
+\f0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f3 \'93\'63\'92\'86 \'8f\'72\'8c\'f5
-\f1 \
+\f3 \cf0 \'93\'63\'92\'86 \'8f\'72\'8c\'f5
+\f0 \
      
 \f3 \'93\'fa\'96\'7b\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
-\f1 \
+\f0 \
 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f0\b \cf0 Special Thanks:
-\f1\b0 \
+\f1\b \cf0 Special Thanks:
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Tiago Ribeiro\
      XDarwin 
 \f3 \'83\'41\'83\'43\'83\'52\'83\'93
-\f1 \
+\f0 \
 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f0\b \cf0 History:
-\f1\b0 \
+\f1\b \cf0 History:
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 John Carmack\
      
 \f3 XFree86 \'82\'cc Mac OS X Server \'82\'d6\'82\'cc\'8d\'c5\'8f\'89\'82\'cc\'88\'da\'90\'41
-\f1 \
+\f0 \
 Dave Zarzycki\
      XFree86 4.0 
 \f3 \'82\'f0 Darwin 1.0 \'82\'c9\'88\'da\'90\'41
-\f1 \
+\f0 \
 Torrey T. Lyons\
      XFree86 4.0.2 
 \f3 \'83\'76\'83\'8d\'83\'57\'83\'46\'83\'4e\'83\'67\'82\'d6\'82\'cc\'93\'9d\'8d\'87}
\ No newline at end of file
diff --git a/hw/darwin/bundle/Japanese.lproj/XDarwinHelp.html.cpp b/hw/darwin/bundle/Japanese.lproj/XDarwinHelp.html.cpp
index 2065d43d4..3e0677056 100644
--- a/hw/darwin/bundle/Japanese.lproj/XDarwinHelp.html.cpp
+++ b/hw/darwin/bundle/Japanese.lproj/XDarwinHelp.html.cpp
@@ -1,4 +1,4 @@
-<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/Japanese.lproj/XDarwinHelp.html.cpp,v 1.5 2002/05/04 01:25:40 torrey Exp $ -->

+<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/Japanese.lproj/XDarwinHelp.html.cpp,v 1.4 2001/11/27 07:27:46 torrey Exp $ -->

 

 #include "xf86Version.h"

 #ifndef PRE_RELEASE

diff --git a/hw/darwin/bundle/Portuguese.lproj/Credits.rtf b/hw/darwin/bundle/Portuguese.lproj/Credits.rtf
index 56a287ca5..5cbac7433 100644
--- a/hw/darwin/bundle/Portuguese.lproj/Credits.rtf
+++ b/hw/darwin/bundle/Portuguese.lproj/Credits.rtf
@@ -1,159 +1,161 @@
 {\rtf1\mac\ansicpg10000\cocoartf102
-{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique;
+{\fonttbl\f0\fswiss\fcharset77 Helvetica;\f1\fswiss\fcharset77 Helvetica-Bold;\f2\fswiss\fcharset77 Helvetica-Oblique;
 }
 {\colortbl;\red255\green255\blue255;}
 \vieww5140\viewh4980\viewkind0
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f0\fs24 \cf0 This product  includes software developed by The XFree86 Project, Inc  (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\
+\
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f0\b\fs24 \cf0 Contributors to XFree86 4.4:
-\f1\b0 \
+\f1\b \cf0 Contributors to XFree86 4.4:
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 John Harper\
      
 \f2\i Rootless acceleration and Apple-WM extension
-\f1\i0 \
+\f0\i0 \
 Torrey T. Lyons\
      
 \f2\i Project Lead
-\f1\i0 \
+\f0\i0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f0\b \cf0 \
+\f1\b \cf0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 \cf0 Contribuidores do XonX ao XFree86 4.3:
-\f1\b0 \
-\pard\tx1440\tx2880\tx4320\tx5760\tx7200
-\cf0 Fabr\'92cio Luis de Castro
-\f0\b \
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
-\cf0      
+\cf0 Fabr\'92cio Luis de Castro
+\f1\b \
+     
 \f2\i\b0 Localiza\'8d\'8bo para o Portugu\'90s\
-\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f1\i0 \cf0 Michael Oland\
+\f0\i0 Michael Oland\
      
 \f2\i New XDarwin icon
-\f0\i0\b \
+\f1\i0\b \
 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 \cf0 Contribuidores do XonX ao XFree86 4.2:
-\f1\b0 \
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Rob Braun\
      
 \f2\i Suporte para o Darwin x86\
 
-\f1\i0 Pablo Di Noto\
+\f0\i0 Pablo Di Noto\
 
 \f2\i      Localiza\'8d\'8bo para o Espanhol
-\f1\i0 \
+\f0\i0 \
 Paul Edens\
 
 \f2\i      Localiza\'8d\'8bo para o Holand\'90s
-\f1\i0 \
+\f0\i0 \
 Kyunghwan Kim\
 
 \f2\i      Localiza\'8d\'8bo para o Coreano
-\f1\i0 \
+\f0\i0 \
 Mario Klebsch\
      
 \f2\i Suporte para teclados Non-US
-\f1\i0 \
+\f0\i0 \
 Torrey T. Lyons\
      
 \f2\i L\'92der de Projeto
-\f1\i0 \
+\f0\i0 \
 Andreas Monitzer\
      
 \f2\i Localiza\'8d\'8bo para o Alem\'8bo
-\f1\i0 \
+\f0\i0 \
 Patrik Montgomery\
 
 \f2\i      Localiza\'8d\'8bo para o Sueco
-\f1\i0 \
+\f0\i0 \
 Greg Parker\
      
 \f2\i Suporte ao modo Compartilhado (Rootless)
-\f1\i0 \
+\f0\i0 \
 Toshimitsu Tanaka\
      
 \f2\i Localiza\'8d\'8bo para o Japon\'90s
-\f1\i0 \
+\f0\i0 \
 Olivier Verdier\
 
 \f2\i      Localiza\'8d\'8bo para o Fran\'8d\'90s
-\f1\i0 \
+\f0\i0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f0\b \cf0 \
+\f1\b \cf0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 \cf0 Agradecimentos Especiais:
-\f1\b0 \
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Devin Poolman and Zero G Software, Inc.\
 
 \f2\i      Instalador
-\f1\i0 \
+\f0\i0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f0\b \cf0 \
+\f1\b \cf0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 \cf0 Membros do Time XonX\
 Contribuindo com o XFree86 4.1:
-\f1\b0 \
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Rob Braun\
      
 \f2\i Suporte ao Darwin x86\
 
-\f1\i0 Torrey T. Lyons\
+\f0\i0 Torrey T. Lyons\
     
 \f2\i  L\'92der de Projeto
-\f1\i0 \
+\f0\i0 \
 Andreas Monitzer\
      
 \f2\i Vers\'8bo Cocoa da interface XDarwin
-\f1\i0 \
+\f0\i0 \
 Greg Parker\
      
 \f2\i Implementa\'8d\'8bo Original
-\f1\i0  
+\f0\i0  
 \f2\i ao Quartz \
 
-\f1\i0 Christoph Pfisterer\
+\f0\i0 Christoph Pfisterer\
      
 \f2\i Bibliotecas Din\'89micas Compartilhadas
-\f1\i0 \
+\f0\i0 \
 Toshimitsu Tanaka\
      
 \f2\i Localiza\'8d\'8bo para o Japon\'90s
-\f1\i0 \
+\f0\i0 \
 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f0\b \cf0 Agradecimento Especial:
-\f1\b0 \
+\f1\b \cf0 Agradecimento Especial:
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Tiago Ribeiro\
      
 \f2\i \'eacone do XDarwin
-\f1\i0 \
+\f0\i0 \
 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f0\b \cf0 Hist\'97rico:
-\f1\b0 \
+\f1\b \cf0 Hist\'97rico:
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 John Carmack\
     
 \f2\i  Suporte Original do XFree86 no Mac OS X Server
-\f1\i0 \
+\f0\i0 \
 Dave Zarzycki\
      
 \f2\i Suporte ao
-\f1\i0  
+\f0\i0  
 \f2\i XFree86 4.0 no Darwin 1.0
-\f1\i0 \
+\f0\i0 \
 Torrey T. Lyons\
      
 \f2\i Integra\'8d\'8bo dentro do Projeto XFree86 na vers\'8bo 4.0.2}
\ No newline at end of file
diff --git a/hw/darwin/bundle/Portuguese.lproj/XDarwinHelp.html.cpp b/hw/darwin/bundle/Portuguese.lproj/XDarwinHelp.html.cpp
index 37502eac6..573f84c50 100644
--- a/hw/darwin/bundle/Portuguese.lproj/XDarwinHelp.html.cpp
+++ b/hw/darwin/bundle/Portuguese.lproj/XDarwinHelp.html.cpp
@@ -1,4 +1,4 @@
-<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/Portuguese.lproj/XDarwinHelp.html.cpp,v 1.1 2002/01/25 06:46:46 torrey Exp $ --><html><body>
+<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp,v 1.2 2001/11/04 07:02:28 torrey Exp $ --><html><body>
 
 #include "xf86Version.h"
 #ifndef PRE_RELEASE
diff --git a/hw/darwin/bundle/Spanish.lproj/Credits.rtf b/hw/darwin/bundle/Spanish.lproj/Credits.rtf
index 32c64f026..2bf7a8eaf 100644
--- a/hw/darwin/bundle/Spanish.lproj/Credits.rtf
+++ b/hw/darwin/bundle/Spanish.lproj/Credits.rtf
@@ -1,154 +1,158 @@
 {\rtf1\mac\ansicpg10000\cocoartf102
-{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique;
+{\fonttbl\f0\fswiss\fcharset77 Helvetica;\f1\fswiss\fcharset77 Helvetica-Bold;\f2\fswiss\fcharset77 Helvetica-Oblique;
 }
 {\colortbl;\red255\green255\blue255;}
 \vieww5160\viewh6300\viewkind0
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f0\fs24 \cf0 This product  includes software developed by The XFree86 Project, Inc  (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\
+\
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f0\b\fs24 \cf0 Contributors to XFree86 4.4:
-\f1\b0 \
+\f1\b \cf0 Contributors to XFree86 4.4:
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 John Harper\
      
 \f2\i Rootless acceleration and Apple-WM extension
-\f1\i0 \
+\f0\i0 \
 Torrey T. Lyons\
      
 \f2\i Project Lead
-\f1\i0 \
+\f0\i0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f0\b \cf0 \
+\f1\b \cf0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 \cf0 Additional XonX Contributors to XFree86 4.3:
-\f1\b0 \
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Fabr\'92cio Luis de Castro\
      
 \f2\i Portuguese localization
-\f1\i0 \
+\f0\i0 \
 Michael Oland\
      
 \f2\i New XDarwin icon
-\f1\i0 \
+\f0\i0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f0\b \cf0 \
+\f1\b \cf0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 \cf0 XonX Contributors to XFree86 4.2:
-\f1\b0 \
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Rob Braun\
      
 \f2\i Darwin x86 support
-\f1\i0 \
+\f0\i0 \
 Pablo Di Noto\
 
 \f2\i      Spanish localization
-\f1\i0 \
+\f0\i0 \
 Paul Edens\
 
 \f2\i      Dutch localization
-\f1\i0 \
+\f0\i0 \
 Kyunghwan Kim\
 
 \f2\i      Korean localization
-\f1\i0 \
+\f0\i0 \
 Mario Klebsch\
      
 \f2\i Non-US keyboard support
-\f1\i0 \
+\f0\i0 \
 Torrey T. Lyons\
      
 \f2\i Project Lead
-\f1\i0 \
+\f0\i0 \
 Andreas Monitzer\
      
 \f2\i German localization
-\f1\i0 \
+\f0\i0 \
 Patrik Montgomery\
 
 \f2\i      Swedish localization
-\f1\i0 \
+\f0\i0 \
 Greg Parker\
      
 \f2\i Rootless support
-\f1\i0 \
+\f0\i0 \
 Toshimitsu Tanaka\
      
 \f2\i Japanese localization
-\f1\i0 \
+\f0\i0 \
 Olivier Verdier\
 
 \f2\i      French localization
-\f1\i0 \
+\f0\i0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f0\b \cf0 \
+\f1\b \cf0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 \cf0 Special Thanks:
-\f1\b0 \
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Devin Poolman and Zero G Software, Inc.\
 
 \f2\i      Installer
-\f1\i0 \
+\f0\i0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f0\b \cf0 \
+\f1\b \cf0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 \cf0 XonX Team Members\
 Contributing to XFree86 4.1:
-\f1\b0 \
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Rob Braun\
      
 \f2\i Darwin x86 support
-\f1\i0 \
+\f0\i0 \
 Torrey T. Lyons\
      
 \f2\i Project Lead
-\f1\i0 \
+\f0\i0 \
 Andreas Monitzer\
      
 \f2\i Cocoa version of XDarwin front end
-\f1\i0 \
+\f0\i0 \
 Greg Parker\
      
 \f2\i Original Quartz implementation
-\f1\i0 \
+\f0\i0 \
 Christoph Pfisterer\
      
 \f2\i Dynamic shared libraries
-\f1\i0 \
+\f0\i0 \
 Toshimitsu Tanaka\
      
 \f2\i Japanese localization
-\f1\i0 \
+\f0\i0 \
 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f0\b \cf0 Special Thanks:
-\f1\b0 \
+\f1\b \cf0 Special Thanks:
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Tiago Ribeiro\
      
 \f2\i XDarwin icon
-\f1\i0 \
+\f0\i0 \
 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f0\b \cf0 History:
-\f1\b0 \
+\f1\b \cf0 History:
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 John Carmack\
      
 \f2\i Original XFree86 port to Mac OS X Server
-\f1\i0 \
+\f0\i0 \
 Dave Zarzycki\
      
 \f2\i XFree86 4.0 port to Darwin 1.0
-\f1\i0 \
+\f0\i0 \
 Torrey T. Lyons\
      
 \f2\i Integration into XFree86 Project for 4.0.2}
\ No newline at end of file
diff --git a/hw/darwin/bundle/Spanish.lproj/XDarwinHelp.html.cpp b/hw/darwin/bundle/Spanish.lproj/XDarwinHelp.html.cpp
index 3e0710a2c..315f647c9 100644
--- a/hw/darwin/bundle/Spanish.lproj/XDarwinHelp.html.cpp
+++ b/hw/darwin/bundle/Spanish.lproj/XDarwinHelp.html.cpp
@@ -1,4 +1,4 @@
-<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/Spanish.lproj/XDarwinHelp.html.cpp,v 1.2 2001/12/30 03:52:27 torrey Exp $ -->
+<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp,v 1.2 2001/11/04 07:02:28 torrey Exp $ -->
 
 #include "xf86Version.h"
 #ifndef PRE_RELEASE
diff --git a/hw/darwin/bundle/Swedish.lproj/Credits.rtf b/hw/darwin/bundle/Swedish.lproj/Credits.rtf
index 32c64f026..2bf7a8eaf 100644
--- a/hw/darwin/bundle/Swedish.lproj/Credits.rtf
+++ b/hw/darwin/bundle/Swedish.lproj/Credits.rtf
@@ -1,154 +1,158 @@
 {\rtf1\mac\ansicpg10000\cocoartf102
-{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique;
+{\fonttbl\f0\fswiss\fcharset77 Helvetica;\f1\fswiss\fcharset77 Helvetica-Bold;\f2\fswiss\fcharset77 Helvetica-Oblique;
 }
 {\colortbl;\red255\green255\blue255;}
 \vieww5160\viewh6300\viewkind0
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f0\fs24 \cf0 This product  includes software developed by The XFree86 Project, Inc  (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\
+\
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f0\b\fs24 \cf0 Contributors to XFree86 4.4:
-\f1\b0 \
+\f1\b \cf0 Contributors to XFree86 4.4:
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 John Harper\
      
 \f2\i Rootless acceleration and Apple-WM extension
-\f1\i0 \
+\f0\i0 \
 Torrey T. Lyons\
      
 \f2\i Project Lead
-\f1\i0 \
+\f0\i0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f0\b \cf0 \
+\f1\b \cf0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 \cf0 Additional XonX Contributors to XFree86 4.3:
-\f1\b0 \
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Fabr\'92cio Luis de Castro\
      
 \f2\i Portuguese localization
-\f1\i0 \
+\f0\i0 \
 Michael Oland\
      
 \f2\i New XDarwin icon
-\f1\i0 \
+\f0\i0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f0\b \cf0 \
+\f1\b \cf0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 \cf0 XonX Contributors to XFree86 4.2:
-\f1\b0 \
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Rob Braun\
      
 \f2\i Darwin x86 support
-\f1\i0 \
+\f0\i0 \
 Pablo Di Noto\
 
 \f2\i      Spanish localization
-\f1\i0 \
+\f0\i0 \
 Paul Edens\
 
 \f2\i      Dutch localization
-\f1\i0 \
+\f0\i0 \
 Kyunghwan Kim\
 
 \f2\i      Korean localization
-\f1\i0 \
+\f0\i0 \
 Mario Klebsch\
      
 \f2\i Non-US keyboard support
-\f1\i0 \
+\f0\i0 \
 Torrey T. Lyons\
      
 \f2\i Project Lead
-\f1\i0 \
+\f0\i0 \
 Andreas Monitzer\
      
 \f2\i German localization
-\f1\i0 \
+\f0\i0 \
 Patrik Montgomery\
 
 \f2\i      Swedish localization
-\f1\i0 \
+\f0\i0 \
 Greg Parker\
      
 \f2\i Rootless support
-\f1\i0 \
+\f0\i0 \
 Toshimitsu Tanaka\
      
 \f2\i Japanese localization
-\f1\i0 \
+\f0\i0 \
 Olivier Verdier\
 
 \f2\i      French localization
-\f1\i0 \
+\f0\i0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f0\b \cf0 \
+\f1\b \cf0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 \cf0 Special Thanks:
-\f1\b0 \
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Devin Poolman and Zero G Software, Inc.\
 
 \f2\i      Installer
-\f1\i0 \
+\f0\i0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f0\b \cf0 \
+\f1\b \cf0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 \cf0 XonX Team Members\
 Contributing to XFree86 4.1:
-\f1\b0 \
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Rob Braun\
      
 \f2\i Darwin x86 support
-\f1\i0 \
+\f0\i0 \
 Torrey T. Lyons\
      
 \f2\i Project Lead
-\f1\i0 \
+\f0\i0 \
 Andreas Monitzer\
      
 \f2\i Cocoa version of XDarwin front end
-\f1\i0 \
+\f0\i0 \
 Greg Parker\
      
 \f2\i Original Quartz implementation
-\f1\i0 \
+\f0\i0 \
 Christoph Pfisterer\
      
 \f2\i Dynamic shared libraries
-\f1\i0 \
+\f0\i0 \
 Toshimitsu Tanaka\
      
 \f2\i Japanese localization
-\f1\i0 \
+\f0\i0 \
 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f0\b \cf0 Special Thanks:
-\f1\b0 \
+\f1\b \cf0 Special Thanks:
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Tiago Ribeiro\
      
 \f2\i XDarwin icon
-\f1\i0 \
+\f0\i0 \
 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f0\b \cf0 History:
-\f1\b0 \
+\f1\b \cf0 History:
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 John Carmack\
      
 \f2\i Original XFree86 port to Mac OS X Server
-\f1\i0 \
+\f0\i0 \
 Dave Zarzycki\
      
 \f2\i XFree86 4.0 port to Darwin 1.0
-\f1\i0 \
+\f0\i0 \
 Torrey T. Lyons\
      
 \f2\i Integration into XFree86 Project for 4.0.2}
\ No newline at end of file
diff --git a/hw/darwin/bundle/Swedish.lproj/XDarwinHelp.html.cpp b/hw/darwin/bundle/Swedish.lproj/XDarwinHelp.html.cpp
index ee099d1a0..c0cdf9f75 100644
--- a/hw/darwin/bundle/Swedish.lproj/XDarwinHelp.html.cpp
+++ b/hw/darwin/bundle/Swedish.lproj/XDarwinHelp.html.cpp
@@ -1,4 +1,4 @@
-<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/Swedish.lproj/XDarwinHelp.html.cpp,v 1.2 2001/11/07 22:43:27 torrey Exp $ -->
+<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp,v 1.2 2001/11/04 07:02:28 torrey Exp $ -->
 
 #include "xf86Version.h"
 #ifndef PRE_RELEASE
diff --git a/hw/darwin/bundle/ko.lproj/Credits.rtf b/hw/darwin/bundle/ko.lproj/Credits.rtf
index 32c64f026..2bf7a8eaf 100644
--- a/hw/darwin/bundle/ko.lproj/Credits.rtf
+++ b/hw/darwin/bundle/ko.lproj/Credits.rtf
@@ -1,154 +1,158 @@
 {\rtf1\mac\ansicpg10000\cocoartf102
-{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique;
+{\fonttbl\f0\fswiss\fcharset77 Helvetica;\f1\fswiss\fcharset77 Helvetica-Bold;\f2\fswiss\fcharset77 Helvetica-Oblique;
 }
 {\colortbl;\red255\green255\blue255;}
 \vieww5160\viewh6300\viewkind0
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f0\fs24 \cf0 This product  includes software developed by The XFree86 Project, Inc  (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\
+\
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f0\b\fs24 \cf0 Contributors to XFree86 4.4:
-\f1\b0 \
+\f1\b \cf0 Contributors to XFree86 4.4:
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 John Harper\
      
 \f2\i Rootless acceleration and Apple-WM extension
-\f1\i0 \
+\f0\i0 \
 Torrey T. Lyons\
      
 \f2\i Project Lead
-\f1\i0 \
+\f0\i0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f0\b \cf0 \
+\f1\b \cf0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 \cf0 Additional XonX Contributors to XFree86 4.3:
-\f1\b0 \
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Fabr\'92cio Luis de Castro\
      
 \f2\i Portuguese localization
-\f1\i0 \
+\f0\i0 \
 Michael Oland\
      
 \f2\i New XDarwin icon
-\f1\i0 \
+\f0\i0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f0\b \cf0 \
+\f1\b \cf0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 \cf0 XonX Contributors to XFree86 4.2:
-\f1\b0 \
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Rob Braun\
      
 \f2\i Darwin x86 support
-\f1\i0 \
+\f0\i0 \
 Pablo Di Noto\
 
 \f2\i      Spanish localization
-\f1\i0 \
+\f0\i0 \
 Paul Edens\
 
 \f2\i      Dutch localization
-\f1\i0 \
+\f0\i0 \
 Kyunghwan Kim\
 
 \f2\i      Korean localization
-\f1\i0 \
+\f0\i0 \
 Mario Klebsch\
      
 \f2\i Non-US keyboard support
-\f1\i0 \
+\f0\i0 \
 Torrey T. Lyons\
      
 \f2\i Project Lead
-\f1\i0 \
+\f0\i0 \
 Andreas Monitzer\
      
 \f2\i German localization
-\f1\i0 \
+\f0\i0 \
 Patrik Montgomery\
 
 \f2\i      Swedish localization
-\f1\i0 \
+\f0\i0 \
 Greg Parker\
      
 \f2\i Rootless support
-\f1\i0 \
+\f0\i0 \
 Toshimitsu Tanaka\
      
 \f2\i Japanese localization
-\f1\i0 \
+\f0\i0 \
 Olivier Verdier\
 
 \f2\i      French localization
-\f1\i0 \
+\f0\i0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f0\b \cf0 \
+\f1\b \cf0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 \cf0 Special Thanks:
-\f1\b0 \
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Devin Poolman and Zero G Software, Inc.\
 
 \f2\i      Installer
-\f1\i0 \
+\f0\i0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f0\b \cf0 \
+\f1\b \cf0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 \cf0 XonX Team Members\
 Contributing to XFree86 4.1:
-\f1\b0 \
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Rob Braun\
      
 \f2\i Darwin x86 support
-\f1\i0 \
+\f0\i0 \
 Torrey T. Lyons\
      
 \f2\i Project Lead
-\f1\i0 \
+\f0\i0 \
 Andreas Monitzer\
      
 \f2\i Cocoa version of XDarwin front end
-\f1\i0 \
+\f0\i0 \
 Greg Parker\
      
 \f2\i Original Quartz implementation
-\f1\i0 \
+\f0\i0 \
 Christoph Pfisterer\
      
 \f2\i Dynamic shared libraries
-\f1\i0 \
+\f0\i0 \
 Toshimitsu Tanaka\
      
 \f2\i Japanese localization
-\f1\i0 \
+\f0\i0 \
 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f0\b \cf0 Special Thanks:
-\f1\b0 \
+\f1\b \cf0 Special Thanks:
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Tiago Ribeiro\
      
 \f2\i XDarwin icon
-\f1\i0 \
+\f0\i0 \
 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f0\b \cf0 History:
-\f1\b0 \
+\f1\b \cf0 History:
+\f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 John Carmack\
      
 \f2\i Original XFree86 port to Mac OS X Server
-\f1\i0 \
+\f0\i0 \
 Dave Zarzycki\
      
 \f2\i XFree86 4.0 port to Darwin 1.0
-\f1\i0 \
+\f0\i0 \
 Torrey T. Lyons\
      
 \f2\i Integration into XFree86 Project for 4.0.2}
\ No newline at end of file
diff --git a/hw/darwin/bundle/ko.lproj/XDarwinHelp.html.cpp b/hw/darwin/bundle/ko.lproj/XDarwinHelp.html.cpp
index 4c83fe278..fc11e26d3 100644
--- a/hw/darwin/bundle/ko.lproj/XDarwinHelp.html.cpp
+++ b/hw/darwin/bundle/ko.lproj/XDarwinHelp.html.cpp
@@ -1,4 +1,4 @@
-<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/ko.lproj/XDarwinHelp.html.cpp,v 1.1 2001/12/04 03:36:39 torrey Exp $ -->
+<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp,v 1.2 2001/11/04 07:02:28 torrey Exp $ -->
 
 #include "xf86Version.h"
 #ifndef PRE_RELEASE
diff --git a/hw/darwin/bundle/startXClients.cpp b/hw/darwin/bundle/startXClients.cpp
index b27ad46fe..51cdb5c9e 100644
--- a/hw/darwin/bundle/startXClients.cpp
+++ b/hw/darwin/bundle/startXClients.cpp
@@ -3,7 +3,7 @@ XCOMM!/bin/sh
 XCOMM This script is used by XDarwin to start X clients when XDarwin is
 XCOMM launched from the Finder.
 XCOMM
-XCOMM $XFree86: xc/programs/Xserver/hw/darwin/bundle/startXClients.cpp,v 1.1 2001/10/18 05:03:42 torrey Exp $
+XCOMM $XFree86: $
 
 userclientrc=$HOME/.xinitrc
 sysclientrc=XINITDIR/xinitrc
diff --git a/hw/darwin/darwin.c b/hw/darwin/darwin.c
index bf0975769..271c72cec 100644
--- a/hw/darwin/darwin.c
+++ b/hw/darwin/darwin.c
@@ -29,7 +29,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/darwin.c,v 1.56 2003/11/24 05:39:01 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/darwin.c,v 1.55 2003/11/15 00:07:09 torrey Exp $ */
 
 #include "X.h"
 #include "Xproto.h"
diff --git a/hw/darwin/darwin.h b/hw/darwin/darwin.h
index 79fa00ffc..e49c450ef 100644
--- a/hw/darwin/darwin.h
+++ b/hw/darwin/darwin.h
@@ -23,7 +23,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/darwin.h,v 1.20 2003/11/15 00:07:09 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/darwin.h,v 1.19 2003/10/16 23:50:08 torrey Exp $ */
 
 #ifndef _DARWIN_H
 #define _DARWIN_H
diff --git a/hw/darwin/darwinClut8.h b/hw/darwin/darwinClut8.h
index 68a7ad16f..06e7b71c5 100644
--- a/hw/darwin/darwinClut8.h
+++ b/hw/darwin/darwinClut8.h
@@ -1,7 +1,7 @@
 /*
  * Darwin default 8-bit Colormap for StaticColor
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/darwinClut8.h,v 1.2 2003/03/04 01:37:59 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/darwinClut8.h,v 1.1.8.1 2003/03/04 01:31:43 torrey Exp $ */
 
 #ifndef _DARWIN_CLUT8_
 #define _DARWIN_CLUT8_
diff --git a/hw/darwin/darwinEvents.c b/hw/darwin/darwinEvents.c
index ba1ec8fc2..d376624b9 100644
--- a/hw/darwin/darwinEvents.c
+++ b/hw/darwin/darwinEvents.c
@@ -28,7 +28,7 @@ Except as contained in this notice, the name of The Open Group shall not be
 used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/darwinEvents.c,v 1.5 2003/11/03 05:36:30 tsi Exp $ */
+/* $XFree86$ */
 
 #define NEED_EVENTS
 #include   "X.h"
diff --git a/hw/darwin/darwinKeyboard.c b/hw/darwin/darwinKeyboard.c
index 57bf5fa3d..39c5ba58f 100644
--- a/hw/darwin/darwinKeyboard.c
+++ b/hw/darwin/darwinKeyboard.c
@@ -37,7 +37,7 @@
 //
 //=============================================================================
 
-/* $XFree86: xc/programs/Xserver/hw/darwin/darwinKeyboard.c,v 1.19 2003/11/01 08:13:08 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/darwinKeyboard.c,v 1.18 2003/05/14 05:27:55 torrey Exp $ */
 
 /*
 ===========================================================================
diff --git a/hw/darwin/darwinKeyboard.h b/hw/darwin/darwinKeyboard.h
index c71888990..405dcf9d1 100644
--- a/hw/darwin/darwinKeyboard.h
+++ b/hw/darwin/darwinKeyboard.h
@@ -23,7 +23,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/darwinKeyboard.h,v 1.1 2003/11/01 08:13:08 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/darwinKeyboard.c,v 1.18 2003/05/14 05:27:55 torrey Exp $ */
 
 #ifndef DARWIN_KEYBOARD_H
 #define DARWIN_KEYBOARD_H 1
diff --git a/hw/darwin/iokit/xfIOKit.c b/hw/darwin/iokit/xfIOKit.c
index a7f5f18ee..4791ae31f 100644
--- a/hw/darwin/iokit/xfIOKit.c
+++ b/hw/darwin/iokit/xfIOKit.c
@@ -33,7 +33,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/iokit/xfIOKit.c,v 1.3 2003/12/09 04:42:36 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/iokit/xfIOKit.c,v 1.2 2003/10/16 23:50:09 torrey Exp $ */
 
 #include "X.h"
 #include "Xproto.h"
diff --git a/hw/darwin/iokit/xfIOKit.h b/hw/darwin/iokit/xfIOKit.h
index 413dfd7e8..1e03cdf80 100644
--- a/hw/darwin/iokit/xfIOKit.h
+++ b/hw/darwin/iokit/xfIOKit.h
@@ -28,7 +28,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/iokit/xfIOKit.h,v 1.1 2003/05/14 05:27:56 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/xfIOKit.h,v 1.10 2003/03/15 18:02:08 torrey Exp $ */
 
 #ifndef _XFIOKIT_H
 #define _XFIOKIT_H
diff --git a/hw/darwin/iokit/xfIOKitCursor.c b/hw/darwin/iokit/xfIOKitCursor.c
index f3c80145f..69eb41d2f 100644
--- a/hw/darwin/iokit/xfIOKitCursor.c
+++ b/hw/darwin/iokit/xfIOKitCursor.c
@@ -57,7 +57,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/iokit/xfIOKitCursor.c,v 1.1 2003/05/14 05:27:56 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/xfIOKitCursor.c,v 1.6 2002/12/10 00:00:39 torrey Exp $ */
 
 #include "scrnintstr.h"
 #include "cursorstr.h"
diff --git a/hw/darwin/iokit/xfIOKitStartup.c b/hw/darwin/iokit/xfIOKitStartup.c
index 9d25c69fe..80508775e 100644
--- a/hw/darwin/iokit/xfIOKitStartup.c
+++ b/hw/darwin/iokit/xfIOKitStartup.c
@@ -28,7 +28,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/iokit/xfIOKitStartup.c,v 1.2 2003/11/01 08:13:08 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/iokit/xfIOKitStartup.c,v 1.1 2003/05/14 05:27:56 torrey Exp $ */
 
 #include "darwin.h"
 #include "darwinKeyboard.h"
diff --git a/hw/darwin/quartz/Preferences.h b/hw/darwin/quartz/Preferences.h
index 22a2f1441..feecf24d6 100644
--- a/hw/darwin/quartz/Preferences.h
+++ b/hw/darwin/quartz/Preferences.h
@@ -25,7 +25,7 @@
  * sale, use or other dealings in this Software without prior written
  * authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/Preferences.h,v 1.3 2003/09/16 00:36:12 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/Preferences.h,v 1.2 2003/01/15 02:34:05 torrey Exp $ */
 
 #import <Cocoa/Cocoa.h>
 
diff --git a/hw/darwin/quartz/Preferences.m b/hw/darwin/quartz/Preferences.m
index 4120b6360..cca2f695d 100644
--- a/hw/darwin/quartz/Preferences.m
+++ b/hw/darwin/quartz/Preferences.m
@@ -30,7 +30,7 @@
  * sale, use or other dealings in this Software without prior written
  * authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/Preferences.m,v 1.4 2003/09/16 00:36:12 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/Preferences.m,v 1.3 2003/05/14 05:27:56 torrey Exp $ */
 
 #import "quartzCommon.h"
 
diff --git a/hw/darwin/quartz/XApplication.h b/hw/darwin/quartz/XApplication.h
index 3d3e96dab..a2622e060 100644
--- a/hw/darwin/quartz/XApplication.h
+++ b/hw/darwin/quartz/XApplication.h
@@ -30,7 +30,7 @@
  * sale, use or other dealings in this Software without prior written
  * authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XApplication.h,v 1.2 2002/10/12 00:32:45 torrey Exp $ */
+/* $XFree86: $ */
 
 #import <Cocoa/Cocoa.h>
 
diff --git a/hw/darwin/quartz/XApplication.m b/hw/darwin/quartz/XApplication.m
index 9b81bbee0..e0ee8d9c6 100644
--- a/hw/darwin/quartz/XApplication.m
+++ b/hw/darwin/quartz/XApplication.m
@@ -30,7 +30,7 @@
  * sale, use or other dealings in this Software without prior written
  * authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XApplication.m,v 1.2 2002/10/12 00:32:45 torrey Exp $ */
+/* $XFree86: $ */
 
 #import "XApplication.h"
 
diff --git a/hw/darwin/quartz/XDarwinStartup.c b/hw/darwin/quartz/XDarwinStartup.c
index 7b2c89f38..0adb4c212 100644
--- a/hw/darwin/quartz/XDarwinStartup.c
+++ b/hw/darwin/quartz/XDarwinStartup.c
@@ -38,7 +38,7 @@
  * dealings in this Software without prior written authorization from
  * Torrey T. Lyons.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XDarwinStartup.c,v 1.2 2003/05/14 05:15:56 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XDarwinStartup.c,v 1.1 2002/03/28 02:21:18 torrey Exp $ */
 
 #include <unistd.h>
 #include <stdio.h>
diff --git a/hw/darwin/quartz/XDarwinStartup.man b/hw/darwin/quartz/XDarwinStartup.man
index 312f4b88b..28efd1edf 100644
--- a/hw/darwin/quartz/XDarwinStartup.man
+++ b/hw/darwin/quartz/XDarwinStartup.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/darwin/quartz/XDarwinStartup.man,v 1.1 2002/03/28 02:21:18 torrey Exp $
+.\" $XFree86: xc/programs/Xserver/hw/darwin/bundle/XDarwinStartup.man,v 1.1 2002/02/05 19:16:14 torrey Exp $
 .TH XDarwinStartup 1
 .SH NAME
 XDarwinStartup - Startup program for the XDarwin X window server
diff --git a/hw/darwin/quartz/XServer.h b/hw/darwin/quartz/XServer.h
index 01b8ec55e..9d1ec1033 100644
--- a/hw/darwin/quartz/XServer.h
+++ b/hw/darwin/quartz/XServer.h
@@ -29,7 +29,7 @@
  * sale, use or other dealings in this Software without prior written
  * authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XServer.h,v 1.17 2003/11/24 05:39:01 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XServer.h,v 1.16 2003/11/23 06:04:01 torrey Exp $ */
 
 #define BOOL xBOOL
 #include "Xproto.h"
diff --git a/hw/darwin/quartz/XServer.m b/hw/darwin/quartz/XServer.m
index 56e672204..ffa2618d1 100644
--- a/hw/darwin/quartz/XServer.m
+++ b/hw/darwin/quartz/XServer.m
@@ -34,7 +34,7 @@
  * sale, use or other dealings in this Software without prior written
  * authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XServer.m,v 1.20 2003/11/27 01:59:53 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XServer.m,v 1.19 2003/11/24 05:39:01 torrey Exp $ */
 
 #include "quartzCommon.h"
 
diff --git a/hw/darwin/quartz/applewm.c b/hw/darwin/quartz/applewm.c
index d3e302727..9b62915c8 100644
--- a/hw/darwin/quartz/applewm.c
+++ b/hw/darwin/quartz/applewm.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/applewm.c,v 1.3 2003/11/11 23:48:41 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/applewm.c,v 1.2 2003/09/16 00:36:13 torrey Exp $ */
 /**************************************************************************
 
 Copyright (c) 2002 Apple Computer, Inc. All Rights Reserved.
diff --git a/hw/darwin/quartz/applewmExt.h b/hw/darwin/quartz/applewmExt.h
index 650173941..63e2bea9f 100644
--- a/hw/darwin/quartz/applewmExt.h
+++ b/hw/darwin/quartz/applewmExt.h
@@ -27,7 +27,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/applewmExt.h,v 1.3 2003/11/17 22:20:35 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/applewmExt.h,v 1.2 2003/11/11 23:48:41 torrey Exp $ */
 
 #ifndef _APPLEWMEXT_H_
 #define _APPLEWMEXT_H_
diff --git a/hw/darwin/quartz/cr/XView.h b/hw/darwin/quartz/cr/XView.h
index 666061dc1..01f5b04b4 100644
--- a/hw/darwin/quartz/cr/XView.h
+++ b/hw/darwin/quartz/cr/XView.h
@@ -25,7 +25,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/XView.h,v 1.1 2003/06/07 05:49:07 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XView.h,v 1.2 2002/07/15 19:58:31 torrey Exp $ */
 
 #import <Cocoa/Cocoa.h>
 
diff --git a/hw/darwin/quartz/cr/XView.m b/hw/darwin/quartz/cr/XView.m
index 2bf689ede..5feac6b42 100644
--- a/hw/darwin/quartz/cr/XView.m
+++ b/hw/darwin/quartz/cr/XView.m
@@ -29,7 +29,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/XView.m,v 1.2 2003/10/16 23:50:16 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/XView.m,v 1.1 2003/06/07 05:49:07 torrey Exp $ */
 
 #import "XView.h"
 
diff --git a/hw/darwin/quartz/cr/cr.h b/hw/darwin/quartz/cr/cr.h
index 74752f768..94133e4af 100644
--- a/hw/darwin/quartz/cr/cr.h
+++ b/hw/darwin/quartz/cr/cr.h
@@ -26,7 +26,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/cr.h,v 1.3 2003/11/03 05:36:31 tsi Exp $ */
+/* $XFree86$ */
 
 #ifndef _CR_H
 #define _CR_H
diff --git a/hw/darwin/quartz/cr/crAppleWM.m b/hw/darwin/quartz/cr/crAppleWM.m
index 66e832b66..a2e97ff81 100644
--- a/hw/darwin/quartz/cr/crAppleWM.m
+++ b/hw/darwin/quartz/cr/crAppleWM.m
@@ -26,7 +26,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/crAppleWM.m,v 1.1 2003/09/16 00:36:14 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprFrame.c,v 1.2 2003/06/30 01:45:13 torrey Exp $ */
 
 #include "quartzCommon.h"
 #include "cr.h"
diff --git a/hw/darwin/quartz/cr/crFrame.m b/hw/darwin/quartz/cr/crFrame.m
index b308dec74..448d7cdef 100644
--- a/hw/darwin/quartz/cr/crFrame.m
+++ b/hw/darwin/quartz/cr/crFrame.m
@@ -27,7 +27,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/crFrame.m,v 1.8 2003/12/05 07:00:10 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/crFrame.m,v 1.7 2003/11/27 01:53:39 torrey Exp $ */
 
 #include "quartzCommon.h"
 #include "cr.h"
diff --git a/hw/darwin/quartz/cr/crScreen.m b/hw/darwin/quartz/cr/crScreen.m
index ab27e8eb8..1ed272714 100644
--- a/hw/darwin/quartz/cr/crScreen.m
+++ b/hw/darwin/quartz/cr/crScreen.m
@@ -27,7 +27,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/crScreen.m,v 1.6 2003/11/27 01:59:53 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/crScreen.m,v 1.5 2003/11/12 20:21:52 torrey Exp $ */
 
 #include "quartzCommon.h"
 #include "cr.h"
diff --git a/hw/darwin/quartz/fullscreen/fullscreen.c b/hw/darwin/quartz/fullscreen/fullscreen.c
index 470528943..99db7410a 100644
--- a/hw/darwin/quartz/fullscreen/fullscreen.c
+++ b/hw/darwin/quartz/fullscreen/fullscreen.c
@@ -25,7 +25,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/fullscreen/fullscreen.c,v 1.4 2003/12/09 04:41:27 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/fullscreen/fullscreen.c,v 1.3 2003/11/27 01:59:53 torrey Exp $ */
 
 #include "quartzCommon.h"
 #include "darwin.h"
diff --git a/hw/darwin/quartz/fullscreen/quartzCursor.c b/hw/darwin/quartz/fullscreen/quartzCursor.c
index 72ad5ed8e..8abce2318 100644
--- a/hw/darwin/quartz/fullscreen/quartzCursor.c
+++ b/hw/darwin/quartz/fullscreen/quartzCursor.c
@@ -29,7 +29,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/fullscreen/quartzCursor.c,v 1.1 2003/09/16 00:36:15 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCursor.c,v 1.5 2003/01/23 00:34:26 torrey Exp $ */
 
 #include "quartzCommon.h"
 #include "quartzCursor.h"
diff --git a/hw/darwin/quartz/fullscreen/quartzCursor.h b/hw/darwin/quartz/fullscreen/quartzCursor.h
index d822c3e86..efcc4435e 100644
--- a/hw/darwin/quartz/fullscreen/quartzCursor.h
+++ b/hw/darwin/quartz/fullscreen/quartzCursor.h
@@ -29,7 +29,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/fullscreen/quartzCursor.h,v 1.1 2003/09/16 00:36:15 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCursor.h,v 1.1 2002/03/28 02:21:19 torrey Exp $ */
 
 #ifndef QUARTZCURSOR_H
 #define QUARTZCURSOR_H
diff --git a/hw/darwin/quartz/keysym2ucs.c b/hw/darwin/quartz/keysym2ucs.c
index 420830965..98b8b6fee 100644
--- a/hw/darwin/quartz/keysym2ucs.c
+++ b/hw/darwin/quartz/keysym2ucs.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/keysym2ucs.c,v 1.1 2003/11/01 08:13:08 torrey Exp $
+/* $XFree86: $
  *
  * This module converts keysym values into the corresponding ISO 10646
  * (UCS, Unicode) values.
diff --git a/hw/darwin/quartz/keysym2ucs.h b/hw/darwin/quartz/keysym2ucs.h
index 1d9183448..c7ff6f3b3 100644
--- a/hw/darwin/quartz/keysym2ucs.h
+++ b/hw/darwin/quartz/keysym2ucs.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/keysym2ucs.h,v 1.1 2003/11/01 08:13:08 torrey Exp $
+/* $XFree86: $
  *
  * This module converts keysym values into the corresponding ISO 10646
  * (UCS, Unicode) values.
diff --git a/hw/darwin/quartz/pseudoramiX.c b/hw/darwin/quartz/pseudoramiX.c
index 2dd7c3ae5..dad735e1d 100644
--- a/hw/darwin/quartz/pseudoramiX.c
+++ b/hw/darwin/quartz/pseudoramiX.c
@@ -32,7 +32,7 @@ shall not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from Digital
 Equipment Corporation.
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/pseudoramiX.c,v 1.3 2003/04/30 23:15:39 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/pseudoramiX.c,v 1.2 2002/10/16 21:13:33 dawes Exp $ */
 
 #include "pseudoramiX.h"
 
diff --git a/hw/darwin/quartz/pseudoramiX.h b/hw/darwin/quartz/pseudoramiX.h
index 23738cfb3..3dcae622a 100644
--- a/hw/darwin/quartz/pseudoramiX.h
+++ b/hw/darwin/quartz/pseudoramiX.h
@@ -1,7 +1,7 @@
 /*
  * Minimal implementation of PanoramiX/Xinerama
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/pseudoramiX.h,v 1.2 2003/04/30 23:15:39 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/pseudoramiX.h,v 1.1 2002/03/28 02:21:18 torrey Exp $ */
 
 extern int noPseudoramiXExtension;
 
diff --git a/hw/darwin/quartz/quartz.c b/hw/darwin/quartz/quartz.c
index 91ca9fa28..1c272df16 100644
--- a/hw/darwin/quartz/quartz.c
+++ b/hw/darwin/quartz/quartz.c
@@ -29,7 +29,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartz.c,v 1.14 2003/11/24 05:39:02 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartz.c,v 1.13 2003/11/12 20:21:51 torrey Exp $ */
 
 #include "quartzCommon.h"
 #include "quartz.h"
diff --git a/hw/darwin/quartz/quartz.h b/hw/darwin/quartz/quartz.h
index 2cec61d66..69de6cf5f 100644
--- a/hw/darwin/quartz/quartz.h
+++ b/hw/darwin/quartz/quartz.h
@@ -30,7 +30,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartz.h,v 1.8 2003/11/27 01:59:53 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartz.h,v 1.7 2003/11/12 20:21:51 torrey Exp $ */
 
 #ifndef _QUARTZ_H
 #define _QUARTZ_H
diff --git a/hw/darwin/quartz/quartzAudio.c b/hw/darwin/quartz/quartzAudio.c
index a3e6af127..64a4f33cc 100644
--- a/hw/darwin/quartz/quartzAudio.c
+++ b/hw/darwin/quartz/quartzAudio.c
@@ -35,7 +35,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzAudio.c,v 1.2 2003/05/14 05:27:56 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzAudio.c,v 1.1 2002/03/28 02:21:18 torrey Exp $ */
 
 #include "quartzCommon.h"
 #include "quartzAudio.h"
diff --git a/hw/darwin/quartz/quartzAudio.h b/hw/darwin/quartz/quartzAudio.h
index 1d213e36a..e20c21ad2 100644
--- a/hw/darwin/quartz/quartzAudio.h
+++ b/hw/darwin/quartz/quartzAudio.h
@@ -28,7 +28,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzAudio.h,v 1.1 2002/03/28 02:21:19 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/bundle/quartzAudio.h,v 1.2 2001/04/01 20:45:43 tsi Exp $ */
 
 #ifndef _QUARTZAUDIO_H
 #define _QUARTZAUDIO_H
diff --git a/hw/darwin/quartz/quartzCocoa.m b/hw/darwin/quartz/quartzCocoa.m
index bba71c041..e12260bd2 100644
--- a/hw/darwin/quartz/quartzCocoa.m
+++ b/hw/darwin/quartz/quartzCocoa.m
@@ -33,7 +33,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCocoa.m,v 1.4 2003/05/14 05:27:56 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCocoa.m,v 1.3 2003/01/19 06:52:54 torrey Exp $ */
 
 #include "quartzCommon.h"
 
diff --git a/hw/darwin/quartz/quartzCommon.h b/hw/darwin/quartz/quartzCommon.h
index e3ae4b850..faa827b37 100644
--- a/hw/darwin/quartz/quartzCommon.h
+++ b/hw/darwin/quartz/quartzCommon.h
@@ -31,7 +31,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCommon.h,v 1.14 2003/11/12 20:21:51 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCommon.h,v 1.13 2003/10/16 23:50:10 torrey Exp $ */
 
 #ifndef _QUARTZCOMMON_H
 #define _QUARTZCOMMON_H
diff --git a/hw/darwin/quartz/quartzCursor.c b/hw/darwin/quartz/quartzCursor.c
index 8abce2318..711ce64f0 100644
--- a/hw/darwin/quartz/quartzCursor.c
+++ b/hw/darwin/quartz/quartzCursor.c
@@ -29,7 +29,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCursor.c,v 1.5 2003/01/23 00:34:26 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCursor.c,v 1.4 2002/11/19 23:01:30 torrey Exp $ */
 
 #include "quartzCommon.h"
 #include "quartzCursor.h"
diff --git a/hw/darwin/quartz/quartzCursor.h b/hw/darwin/quartz/quartzCursor.h
index 9710d4be2..4db5531fa 100644
--- a/hw/darwin/quartz/quartzCursor.h
+++ b/hw/darwin/quartz/quartzCursor.h
@@ -29,7 +29,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCursor.h,v 1.1 2002/03/28 02:21:19 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/bundle/quartzCursor.h,v 1.2 2001/09/23 04:04:49 torrey Exp $ */
 
 #ifndef QUARTZCURSOR_H
 #define QUARTZCURSOR_H
diff --git a/hw/darwin/quartz/quartzKeyboard.c b/hw/darwin/quartz/quartzKeyboard.c
index eab86e27e..c434d227f 100644
--- a/hw/darwin/quartz/quartzKeyboard.c
+++ b/hw/darwin/quartz/quartzKeyboard.c
@@ -32,7 +32,7 @@
    promote the sale, use or other dealings in this Software without
    prior written authorization.
 */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzKeyboard.c,v 1.2 2004/01/19 01:22:47 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzKeyboard.c,v 1.1 2003/11/01 08:13:08 torrey Exp $ */
 
 #include "quartzCommon.h"
 
diff --git a/hw/darwin/quartz/quartzPasteboard.c b/hw/darwin/quartz/quartzPasteboard.c
index 658832aa1..e9f9d6698 100644
--- a/hw/darwin/quartz/quartzPasteboard.c
+++ b/hw/darwin/quartz/quartzPasteboard.c
@@ -29,7 +29,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzPasteboard.c,v 1.1 2002/03/28 02:21:19 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/bundle/quartzPasteboard.c,v 1.3 2001/09/23 04:04:49 torrey Exp $ */
 
 #include "quartzPasteboard.h"
 
diff --git a/hw/darwin/quartz/quartzPasteboard.h b/hw/darwin/quartz/quartzPasteboard.h
index fef375493..296c52c17 100644
--- a/hw/darwin/quartz/quartzPasteboard.h
+++ b/hw/darwin/quartz/quartzPasteboard.h
@@ -29,7 +29,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzPasteboard.h,v 1.1 2002/03/28 02:21:19 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/bundle/quartzPasteboard.h,v 1.1 2001/03/15 22:24:27 torrey Exp $ */
 
 #ifndef _QUARTZPASTEBOARD_H
 #define _QUARTZPASTEBOARD_H
diff --git a/hw/darwin/quartz/quartzStartup.c b/hw/darwin/quartz/quartzStartup.c
index bb7c7d214..5a11d5321 100644
--- a/hw/darwin/quartz/quartzStartup.c
+++ b/hw/darwin/quartz/quartzStartup.c
@@ -28,7 +28,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzStartup.c,v 1.9 2003/11/15 00:07:09 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzStartup.c,v 1.8 2003/11/05 00:15:00 torrey Exp $ */
 
 #include <fcntl.h>
 #include <unistd.h>
diff --git a/hw/darwin/quartz/xpr/Xplugin.h b/hw/darwin/quartz/xpr/Xplugin.h
index 8985f7b11..e2e97b4c8 100644
--- a/hw/darwin/quartz/xpr/Xplugin.h
+++ b/hw/darwin/quartz/xpr/Xplugin.h
@@ -30,7 +30,7 @@
 
    Note that these interfaces are provided solely for the use of the
    X11 server. Any other uses are unsupported and strongly discouraged. */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/Xplugin.h,v 1.3 2003/06/27 20:21:42 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/Xplugin.h,v 1.2 2003/05/02 00:08:49 torrey Exp $ */
 
 #ifndef XPLUGIN_H
 #define XPLUGIN_H 1
diff --git a/hw/darwin/quartz/xpr/appledri.c b/hw/darwin/quartz/xpr/appledri.c
index 3062d964a..0eba61cb2 100644
--- a/hw/darwin/quartz/xpr/appledri.c
+++ b/hw/darwin/quartz/xpr/appledri.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/appledri.c,v 1.1 2003/06/30 01:45:13 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/dri/xf86dri.c,v 1.10 2000/12/07 20:26:14 dawes Exp $ */
 /**************************************************************************
 
 Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
diff --git a/hw/darwin/quartz/xpr/dri.c b/hw/darwin/quartz/xpr/dri.c
index aa595af85..17f9e91a0 100644
--- a/hw/darwin/quartz/xpr/dri.c
+++ b/hw/darwin/quartz/xpr/dri.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/dri.c,v 1.1 2003/06/30 01:45:13 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/dri/dri.c,v 1.34 2001/12/10 19:07:19 dawes Exp $ */
 /**************************************************************************
 
 Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
diff --git a/hw/darwin/quartz/xpr/dri.h b/hw/darwin/quartz/xpr/dri.h
index 350f61b56..5d0b1fec8 100644
--- a/hw/darwin/quartz/xpr/dri.h
+++ b/hw/darwin/quartz/xpr/dri.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/dri.h,v 1.1 2003/06/30 01:45:13 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/dri/dri.h,v 1.18 2001/03/21 16:21:40 dawes Exp $ */
 /**************************************************************************
 
 Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
diff --git a/hw/darwin/quartz/xpr/dristruct.h b/hw/darwin/quartz/xpr/dristruct.h
index 1a2949b18..ae1b99db5 100644
--- a/hw/darwin/quartz/xpr/dristruct.h
+++ b/hw/darwin/quartz/xpr/dristruct.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/dristruct.h,v 1.1 2003/06/30 01:45:13 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/dri/dristruct.h,v 1.10 2001/03/21 16:21:40 dawes Exp $ */
 /**************************************************************************
 
 Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
diff --git a/hw/darwin/quartz/xpr/x-hash.c b/hw/darwin/quartz/xpr/x-hash.c
index ad36204c5..632ffdb33 100644
--- a/hw/darwin/quartz/xpr/x-hash.c
+++ b/hw/darwin/quartz/xpr/x-hash.c
@@ -27,7 +27,7 @@
    copyright holders shall not be used in advertising or otherwise to
    promote the sale, use or other dealings in this Software without
    prior written authorization. */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-hash.c,v 1.2 2003/06/30 01:45:13 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-hash.c,v 1.1 2003/04/30 23:15:42 torrey Exp $ */
 
 #include "x-hash.h"
 #include "x-list.h"
diff --git a/hw/darwin/quartz/xpr/x-hash.h b/hw/darwin/quartz/xpr/x-hash.h
index 2abb08cd7..97d4cc40c 100644
--- a/hw/darwin/quartz/xpr/x-hash.h
+++ b/hw/darwin/quartz/xpr/x-hash.h
@@ -27,7 +27,7 @@
    copyright holders shall not be used in advertising or otherwise to
    promote the sale, use or other dealings in this Software without
    prior written authorization. */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-hash.h,v 1.2 2003/06/30 01:45:13 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-hash.h,v 1.1 2003/04/30 23:15:42 torrey Exp $ */
 
 #ifndef X_HASH_H
 #define X_HASH_H 1
diff --git a/hw/darwin/quartz/xpr/x-hook.c b/hw/darwin/quartz/xpr/x-hook.c
index 3414e1543..dcd34fdc5 100644
--- a/hw/darwin/quartz/xpr/x-hook.c
+++ b/hw/darwin/quartz/xpr/x-hook.c
@@ -27,7 +27,7 @@
    copyright holders shall not be used in advertising or otherwise to
    promote the sale, use or other dealings in this Software without
    prior written authorization. */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-hook.c,v 1.1 2003/06/30 01:45:13 torrey Exp $ */
+/* $XFree86: $ */
 
 #include "x-hook.h"
 #include <stdlib.h>
diff --git a/hw/darwin/quartz/xpr/x-hook.h b/hw/darwin/quartz/xpr/x-hook.h
index 14e8ca1f5..0b5e038fe 100644
--- a/hw/darwin/quartz/xpr/x-hook.h
+++ b/hw/darwin/quartz/xpr/x-hook.h
@@ -27,7 +27,7 @@
    copyright holders shall not be used in advertising or otherwise to
    promote the sale, use or other dealings in this Software without
    prior written authorization. */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-hook.h,v 1.1 2003/06/30 01:45:13 torrey Exp $ */
+/* $XFree86: $ */
 
 #ifndef X_HOOK_H
 #define X_HOOK_H 1
diff --git a/hw/darwin/quartz/xpr/x-list.c b/hw/darwin/quartz/xpr/x-list.c
index 859a5163d..17843362a 100644
--- a/hw/darwin/quartz/xpr/x-list.c
+++ b/hw/darwin/quartz/xpr/x-list.c
@@ -27,7 +27,7 @@
    copyright holders shall not be used in advertising or otherwise to
    promote the sale, use or other dealings in this Software without
    prior written authorization. */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-list.c,v 1.2 2003/06/30 01:45:13 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-list.c,v 1.1 2003/04/30 23:15:42 torrey Exp $ */
 
 #include "x-list.h"
 #include <stdlib.h>
diff --git a/hw/darwin/quartz/xpr/x-list.h b/hw/darwin/quartz/xpr/x-list.h
index a65cfcb7c..991e2b1f6 100644
--- a/hw/darwin/quartz/xpr/x-list.h
+++ b/hw/darwin/quartz/xpr/x-list.h
@@ -27,7 +27,7 @@
    copyright holders shall not be used in advertising or otherwise to
    promote the sale, use or other dealings in this Software without
    prior written authorization. */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-list.h,v 1.2 2003/06/30 01:45:13 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-list.h,v 1.1 2003/04/30 23:15:42 torrey Exp $ */
 
 #ifndef X_LIST_H
 #define X_LIST_H 1
diff --git a/hw/darwin/quartz/xpr/xpr.h b/hw/darwin/quartz/xpr/xpr.h
index b3091f8e1..63f45c5a2 100644
--- a/hw/darwin/quartz/xpr/xpr.h
+++ b/hw/darwin/quartz/xpr/xpr.h
@@ -26,7 +26,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xpr.h,v 1.5 2003/11/27 01:59:53 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xpr.h,v 1.4 2003/11/12 20:21:52 torrey Exp $ */
 
 #ifndef XPR_H
 #define XPR_H
diff --git a/hw/darwin/quartz/xpr/xprAppleWM.c b/hw/darwin/quartz/xpr/xprAppleWM.c
index eca0de334..a5186d5f6 100644
--- a/hw/darwin/quartz/xpr/xprAppleWM.c
+++ b/hw/darwin/quartz/xpr/xprAppleWM.c
@@ -27,7 +27,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprAppleWM.c,v 1.1 2003/09/16 00:36:15 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprFrame.c,v 1.2 2003/06/30 01:45:13 torrey Exp $ */
 
 #include "xpr.h"
 #include "applewmExt.h"
diff --git a/hw/darwin/quartz/xpr/xprCursor.c b/hw/darwin/quartz/xpr/xprCursor.c
index a3dea69e2..ee06043df 100644
--- a/hw/darwin/quartz/xpr/xprCursor.c
+++ b/hw/darwin/quartz/xpr/xprCursor.c
@@ -30,7 +30,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprCursor.c,v 1.2 2003/09/16 00:36:15 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprCursor.c,v 1.1 2003/04/30 23:15:42 torrey Exp $ */
 
 #include "quartzCommon.h"
 #include "xpr.h"
diff --git a/hw/darwin/quartz/xpr/xprFrame.c b/hw/darwin/quartz/xpr/xprFrame.c
index 552153852..3c5caa64c 100644
--- a/hw/darwin/quartz/xpr/xprFrame.c
+++ b/hw/darwin/quartz/xpr/xprFrame.c
@@ -27,7 +27,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprFrame.c,v 1.5 2003/11/27 01:59:53 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprFrame.c,v 1.4 2003/11/12 20:21:52 torrey Exp $ */
 
 #include "xpr.h"
 #include "rootlessCommon.h"
diff --git a/hw/darwin/quartz/xpr/xprScreen.c b/hw/darwin/quartz/xpr/xprScreen.c
index 771b7c9f4..aa7adb4bc 100644
--- a/hw/darwin/quartz/xpr/xprScreen.c
+++ b/hw/darwin/quartz/xpr/xprScreen.c
@@ -27,7 +27,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprScreen.c,v 1.9 2003/11/27 01:59:53 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprScreen.c,v 1.8 2003/11/12 20:21:52 torrey Exp $ */
 
 #include "quartzCommon.h"
 #include "quartz.h"
diff --git a/hw/darwin/utils/README.txt b/hw/darwin/utils/README.txt
index 94d61b1f0..fb6d4399e 100644
--- a/hw/darwin/utils/README.txt
+++ b/hw/darwin/utils/README.txt
@@ -108,4 +108,4 @@ of the NeXT .keymapping file.
 
 
 
-$XFree86: xc/programs/Xserver/hw/darwin/utils/README.txt,v 1.2 2000/12/05 21:18:34 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/darwin/utils/README.txt,v 1.1 2000/12/01 19:47:39 dawes Exp $
diff --git a/hw/darwin/utils/dumpkeymap.c b/hw/darwin/utils/dumpkeymap.c
index a264cbc10..8f3340b15 100644
--- a/hw/darwin/utils/dumpkeymap.c
+++ b/hw/darwin/utils/dumpkeymap.c
@@ -1,4 +1,4 @@
-// $XFree86: xc/programs/Xserver/hw/darwin/utils/dumpkeymap.c,v 1.4 2003/04/13 14:52:51 herrb Exp $
+// $XFree86: dumpkeymap.c,v 1.3 2000/12/05 21:18:34 dawes Exp $
 //=============================================================================
 //
 // Copyright (C) 1999,2000 by Eric Sunshine <sunshine@sunshineco.com>
diff --git a/hw/darwin/utils/dumpkeymap.man b/hw/darwin/utils/dumpkeymap.man
index 2ad6d54d2..12983bada 100644
--- a/hw/darwin/utils/dumpkeymap.man
+++ b/hw/darwin/utils/dumpkeymap.man
@@ -30,7 +30,7 @@
 //
 //=============================================================================
 //
-// $XFree86: xc/programs/Xserver/hw/darwin/utils/dumpkeymap.man,v 1.2 2000/12/05 21:18:34 dawes Exp $
+// $XFree86$
 //
 ..
 .ig