head	1.2;
access;
symbols
	netbsd-6-0-6-RELEASE:1.1.1.1
	netbsd-6-1-5-RELEASE:1.1.1.1
	netbsd-6-1-4-RELEASE:1.1.1.1
	netbsd-6-0-5-RELEASE:1.1.1.1
	riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.2
	riastradh-drm2-base:1.2
	netbsd-6-1-3-RELEASE:1.1.1.1
	netbsd-6-0-4-RELEASE:1.1.1.1
	netbsd-6-1-2-RELEASE:1.1.1.1
	netbsd-6-0-3-RELEASE:1.1.1.1
	netbsd-6-1-1-RELEASE:1.1.1.1
	netbsd-6-1:1.1.1.1.0.6
	netbsd-6-0-2-RELEASE:1.1.1.1
	netbsd-6-1-RELEASE:1.1.1.1
	netbsd-6-1-RC4:1.1.1.1
	netbsd-6-1-RC3:1.1.1.1
	netbsd-6-1-RC2:1.1.1.1
	netbsd-6-1-RC1:1.1.1.1
	netbsd-6-0-1-RELEASE:1.1.1.1
	netbsd-6-0:1.1.1.1.0.4
	netbsd-6-0-RELEASE:1.1.1.1
	netbsd-6-0-RC2:1.1.1.1
	netbsd-6-0-RC1:1.1.1.1
	netbsd-6:1.1.1.1.0.2
	netbsd-6-base:1.1.1.1
	xorg-docs-1-5:1.1.1.1
	xorg:1.1.1;
locks; strict;
comment	@# @;


1.2
date	2013.06.05.07.40.53;	author mrg;	state dead;
branches;
next	1.1;
commitid	karlE7P1Jw6GIoSw;

1.1
date	2010.11.18.08.57.30;	author tron;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2010.11.18.08.57.30;	author tron;	state Exp;
branches;
next	;


desc
@@


1.2
log
@merge xorg-docs 1.7 (and put it in the right place.)
@
text
@<!DOCTYPE linuxdoc PUBLIC "-//XFree86//DTD linuxdoc//EN"[
<!ENTITY % defs SYSTEM "defs.ent"> %defs;
<!ENTITY % mdefs SYSTEM "mdefs.ent"> %mdefs;
]>
 
<article>

<!-- Title information -->
<title>Documentation for the X Window System Version 11 Release &relvers; (X11R&relvers;)
<author>The X.Org Foundation
<date>&reldate;

<!--
$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/index.pre,v 1.23 2004/02/15 02:16:49 dawes Exp $ 
-->

<p>
<itemize>

@


1.1
log
@Initial revision
@
text
@@


1.1.1.1
log
@Import version 1.5 of the "xorg-docs" package:
The documentation in this package is from xc/doc in the monolithic
source tree.
@
text
@@