diff options
| author | marha <marha@users.sourceforge.net> | 2011-11-25 08:32:21 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-11-25 08:32:21 +0100 |
| commit | 849d328b25c2f3c87d539e1fe7af38e7580a0409 (patch) | |
| tree | 349c425a87ddb3aaa1d7832d5a8e68252fc73ddb /xorg-server/doc | |
| parent | a8a12d4c8be177f63cae7dc96c2b52f09e228a76 (diff) | |
| parent | a0b4a1330be6a36ad095222d2ea83927cd33514d (diff) | |
| download | vcxsrv-849d328b25c2f3c87d539e1fe7af38e7580a0409.tar.gz vcxsrv-849d328b25c2f3c87d539e1fe7af38e7580a0409.tar.bz2 vcxsrv-849d328b25c2f3c87d539e1fe7af38e7580a0409.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/glx/glxdriswrast.c
xorg-server/glx/single2.c
xorg-server/hw/xwin/winconfig.c
xorg-server/os/osinit.c
xorg-server/os/xdmcp.c
xorg-server/xkb/xkbInit.c
Diffstat (limited to 'xorg-server/doc')
| -rw-r--r-- | xorg-server/doc/Xinput.xml | 2 | ||||
| -rw-r--r-- | xorg-server/doc/Xserver-spec.xml | 4 | ||||
| -rw-r--r-- | xorg-server/doc/dtrace/Xserver-DTrace.xml | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/xorg-server/doc/Xinput.xml b/xorg-server/doc/Xinput.xml index 0a7ec8dc0..7f576a135 100644 --- a/xorg-server/doc/Xinput.xml +++ b/xorg-server/doc/Xinput.xml @@ -15,7 +15,7 @@ <affiliation><orgname>Hewlett-Packard</orgname></affiliation> </author> </authorgroup> - <releaseinfo>X server version &xserver.version;</releaseinfo> + <releaseinfo>X Server Version &xserver.version;</releaseinfo> <copyright><year>1989</year><year>1990</year><year>1991</year> <holder>Hewlett-Packard Company</holder> </copyright> diff --git a/xorg-server/doc/Xserver-spec.xml b/xorg-server/doc/Xserver-spec.xml index 2bf4fb3b7..2b11828fc 100644 --- a/xorg-server/doc/Xserver-spec.xml +++ b/xorg-server/doc/Xserver-spec.xml @@ -43,7 +43,7 @@ </author> <publisher><publishername>The X.Org Foundation</publishername></publisher> <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo> - <releaseinfo>X server version &xserver.version;</releaseinfo> + <releaseinfo>X Server Version &xserver.version;</releaseinfo> <copyright><year>1994</year><holder>X Consortium, Inc.</holder></copyright> <copyright><year>2004</year><holder>X.org Foundation, Inc.</holder></copyright> <legalnotice> @@ -565,7 +565,7 @@ should be called by InitExtensions. ExtensionEntry *AddExtension(name, NumEvents,NumErrors, MainProc, SwappedMainProc, CloseDownProc, MinorOpcodeProc) - char *name; /*Null terminate string; case matters*/ + const char *name; /*Null terminate string; case matters*/ int NumEvents; int NumErrors; int (* MainProc)(ClientPtr);/*Called if client matches server order*/ diff --git a/xorg-server/doc/dtrace/Xserver-DTrace.xml b/xorg-server/doc/dtrace/Xserver-DTrace.xml index fa8bc809a..5ef062980 100644 --- a/xorg-server/doc/dtrace/Xserver-DTrace.xml +++ b/xorg-server/doc/dtrace/Xserver-DTrace.xml @@ -14,7 +14,7 @@ <orgdiv>Solaris Engineering</orgdiv> </affiliation> </author> - <releaseinfo>X.Org Xserver version &xserver.version;</releaseinfo> + <releaseinfo>X Server Version &xserver.version;</releaseinfo> <copyright><year>2005</year><year>2006</year><year>2007</year><year>2010</year> <holder>Oracle and/or its affiliates. All rights reserved.</holder> </copyright> |