summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2019-02-19 16:32:58 -0800
committerAlan Coopersmith <alan.coopersmith@oracle.com>2019-02-23 09:20:21 -0800
commit606e019df1674f92cd9cfe08592c07c8d010ce1b (patch)
treefd13403cddd9a41be1923616bfdd1b6949b5722a
parent813b9c32130fea0ebccc21c7161a55299a587f69 (diff)
Update README.xml & XOrgFoundation.man to reflect SPI merger
Fixes: https://gitlab.freedesktop.org/xorg/doc/xorg-docs/issues/2 Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Bryce Harrington <bryce@bryceharrington.org>
-rw-r--r--general/README.xml6
-rw-r--r--man/XOrgFoundation.man7
2 files changed, 9 insertions, 4 deletions
diff --git a/general/README.xml b/general/README.xml
index cc67c7a..3129720 100644
--- a/general/README.xml
+++ b/general/README.xml
@@ -103,8 +103,10 @@ related documentation.
<para>
The X.Org Foundation X releases are produced by the X.Org Foundation.
-The X.Org Foundation has been formed as a Delaware corporation organized
-to operate as a scientific charity under IRS code 501(c)(3) chartered
+The X.Org Foundation is a member project of
+<ulink url="https://spi-inc.org/">Software in the Public Interest (SPI)</ulink>,
+which operates as a scientific charity under IRS code 501(c)(3).
+The X.Org Foundation is chartered
to develop and execute effective strategies which provide world-wide
stewardship of the X Window System technology and standards. Membership
in the X.Org Foundation is free to all participants. Applications for
diff --git a/man/XOrgFoundation.man b/man/XOrgFoundation.man
index d7f41d3..1ecf3fa 100644
--- a/man/XOrgFoundation.man
+++ b/man/XOrgFoundation.man
@@ -27,14 +27,15 @@ XOrgFoundation \- X.Org Foundation information
Release 6.7 and later of X Version 11 is brought to you by the
X.Org Foundation.
.SH DESCRIPTION
-The X.Org Foundation is an independent, not-for-profit 501(c)(3) charity
+The X.Org Foundation is a member project of Software in the Public Interest
+(SPI), an independent, not-for-profit 501(c)(3) charity
corporation. It was formed in 2004 as the successor to the X.Org Group at
The Open Group. The purpose of the X.Org Foundation is to foster the
development, evolution, and maintenance of the X Window System, a
comprehensive set of vendor-neutral, system-architecture neutral,
network-transparent windowing and user interface standards. Membership
in the X.Org Foundation is free and open to anyone. The X.Org Foundation
-hosts a public git repository of the source code on freedesktop.org.
+hosts public git repositories of the source code on freedesktop.org.
.PP
The X Window System was created in the mid-1980s at the Massachusetts
Institute of Technology. In 1988, MIT formed a member-funded consortium to
@@ -49,6 +50,8 @@ Open Software Foundation).
.PP
.SH "ADDRESSES"
The X.Org Foundation's web site is https://www.x.org/
+.SH "ADDRESSES"
+SPI's web site is https://spi-inc.org/
.PP
The X.Org Foundation's public ftp site is ftp://ftp.x.org/
.PP