diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-20 10:51:44 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-20 10:51:44 +0200 |
| commit | 5921af43b0a9b04c0c6b7d3c1e042e05bd3acbb1 (patch) | |
| tree | b7206e85fd135f1cf45c1db3ad85d3dc7c2fa2d3 /libX11/specs/i18n/trans/trans.xml | |
| parent | 97f357506241a5314de9071befcd01be731f1dbb (diff) | |
| parent | 0470a59df89ab453bdbe0fc2f820278cfffdc61c (diff) | |
| download | vcxsrv-5921af43b0a9b04c0c6b7d3c1e042e05bd3acbb1.tar.gz vcxsrv-5921af43b0a9b04c0c6b7d3c1e042e05bd3acbb1.tar.bz2 vcxsrv-5921af43b0a9b04c0c6b7d3c1e042e05bd3acbb1.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'libX11/specs/i18n/trans/trans.xml')
| -rw-r--r-- | libX11/specs/i18n/trans/trans.xml | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/libX11/specs/i18n/trans/trans.xml b/libX11/specs/i18n/trans/trans.xml index 6f1a15c50..fe16c1d98 100644 --- a/libX11/specs/i18n/trans/trans.xml +++ b/libX11/specs/i18n/trans/trans.xml @@ -17,12 +17,7 @@ <affiliation><orgname>FUJITSU LIMITED</orgname></affiliation> </author> </authorgroup> - <copyright> - <year>1994</year> - <holder>FUJITSU LIMITED</holder> - <holder>X Consortium</holder> - </copyright> - + <copyright><year>1994</year><holder>FUJITSU LIMITED</holder></copyright> <abstract> <title>Abstract</title> @@ -35,6 +30,16 @@ which makes various channels usable such as X protocol or TCP/IP, DECnet and etc <legalnotice> <para> +Permission to use, copy, modify, and distribute this documentation for any purpose +and without fee is hereby granted, provided that the above copyright notice and +this permission notice appear in all copies. +Fujitsu makes no representations about the suitability for any purpose of the +information in this document. This documentation is provided as is +without express or implied warranty. +</para> + +<para role="multiLicensing">Copyright © 1994 X Consortium</para> +<para> 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, @@ -60,9 +65,9 @@ THE SOFTWARE. </para> <para> -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 X Consortium. +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. </para> <para>X Window System is a trademark of The Open Group.</para> |