-The XOrg Foundation, (a.k.a. X.org) has changed to an Open Source model to
-maintain the official Public Implementation of X11.
+The X server accepts requests from client applications to create windows,
+which are (normally rectangular) "virtual screens" that the client program
+can draw into.
-The XOrg Foundation invites anyone who has an interest to join in. Anyone
-may create and work on a branch in the repository. See XOrgRepository for
-more information about the XOrg Foundation repository.
-
-The repository consists of an imported XFree86 tree that is very close
-to their 4.4 release. Just before its 4.4 release, XFree86 adopted a
-new licensing scheme incompatible with the GPL. For this reason, we have
-recreated its tree as closely as possible without importing files affected
-by the new license. Our tree is being referred to as simply "XOrg", and a
-public release will be made shortly.
+Windows are then composed on the actual screen by the X server
+(or by a separate composite manager) as directed by the window manager,
+which usually communicates with the user via graphical controls such as
buttons
+and draggable titlebars and borders.
EOF
diff --git a/xorg-xserver/xorg-server/HISTORY
b/xorg-xserver/xorg-server/HISTORY
index 3a4f3e1..123e386 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,10 @@
+2015-02-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 1.17.0
+ update description
+ * CONFLICTS: add xf86-video-modesetting, glamor
+ * CONFIGURE: delete obsolete options
+ * DEPENDS: presentproto is required
+
2014-12-20 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: 1.16.3
CVE-2014-8092..8103
[SM-Commit] GIT changes to devel-xorg-modular grimoire by Treeve Jelbert (11068b9a574500e26909788cc9eb43dd0cc20e0b),
Treeve Jelbert, 02/05/2015