diff options
| author | marha <marha@users.sourceforge.net> | 2011-10-05 17:44:57 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-10-05 17:44:57 +0200 |
| commit | 8af87a5b60e37ae84fdd759e2c1602be38be4905 (patch) | |
| tree | 2e621c7fbdc4dfe9eb8d733af4cc232bc03643d4 /xorg-server/hw/xfree86/doc | |
| parent | 8238de0fe0c28bd54b3e6cdd1fc94513cf21d3cc (diff) | |
| parent | f7025b4baa1ba35ee796785641f04eac5bedb0a6 (diff) | |
| download | vcxsrv-8af87a5b60e37ae84fdd759e2c1602be38be4905.tar.gz vcxsrv-8af87a5b60e37ae84fdd759e2c1602be38be4905.tar.bz2 vcxsrv-8af87a5b60e37ae84fdd759e2c1602be38be4905.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mapi/glapi/glapi.h
mesalib/src/mesa/main/syncobj.h
xorg-server/dix/events.c
xorg-server/dix/getevents.c
xorg-server/include/misc.h
Diffstat (limited to 'xorg-server/hw/xfree86/doc')
| -rw-r--r-- | xorg-server/hw/xfree86/doc/ddxDesign.xml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/xorg-server/hw/xfree86/doc/ddxDesign.xml b/xorg-server/hw/xfree86/doc/ddxDesign.xml index bc25c56d8..a4baad557 100644 --- a/xorg-server/hw/xfree86/doc/ddxDesign.xml +++ b/xorg-server/hw/xfree86/doc/ddxDesign.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="ISO-8859-1"?> <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [ + <!ENTITY % xorg-defs SYSTEM "defs.ent"> %xorg-defs; <!ENTITY % defs SYSTEM "/xserver/doc/xml/xserver.ent"> %defs; <!-- config file keyword markup --> <!-- specific config file keywords --> @@ -19,13 +20,11 @@ <article id="ddxDesign"> <articleinfo> - <title>XFree86 DDX Design (Xorg server version &xserver.version;)</title> + <title>XFree86 DDX Design</title> <authorgroup> - <corpauthor><ulink url="http://www.xfree86.org/"> - The XFree86 Project, Inc.</ulink></corpauthor> - <corpauthor><ulink url="http://www.x.org/"> - The X.Org Foundation, Inc.</ulink></corpauthor> + <corpauthor>The XFree86 Project</corpauthor> + <corpauthor>The X.Org Foundation</corpauthor> <othercredit> <firstname>Jim</firstname><surname>Gettys</surname> @@ -34,6 +33,7 @@ </authorgroup> <pubdate>&xserver.reldate;</pubdate> + <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo> <releaseinfo>Xorg server version &xserver.version;</releaseinfo> </articleinfo> |