--- a/BUILD_INSTRUCTIONS	Thu Apr 06 22:27:29 2017 -0700
+++ b/BUILD_INSTRUCTIONS	Fri Apr 07 15:26:24 2017 -0700
@@ -1,28 +1,6 @@
 Solaris X Window System Consolidation Build Instructions
 --------------------------------------------------------
 
-Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
-
-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, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice (including the next
-paragraph) shall be included in all copies or substantial portions of the
-Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-____________________________________________________________________________
-
 == Build requirements & preparation ==
 
 To build X, you need to set up a machine with the correct build environment:
@@ -79,7 +57,7 @@
 proto/pkg_sparc or proto/pkg_i386 as appropriate.
 
 Builds made by individual developers default to using the publisher
-name "xnv-devel" but that can be overridden via flags to the buildit or
+name "nightly" but that can be overridden via flags to the buildit or
 make_release_packages scripts.  They will depend on the versions of
 packages from other consolidations that were installed on the system
 they built them on.
@@ -89,12 +67,9 @@
 to get a local copy installed as /opt/onbld/bin/onu .
 
 onu will create a new boot environment and install the packages there - you
-will then need to reboot into that BE to use them. Since none of the X
-packages have the reboot required flag, it is possible to use pkg to install
-them to the live BE, but then you have more work to do if you need to switch
-back to the previous versions.
+will then need to reboot into that BE to use them.
 
-Note that onu uses pkg image-update, which means there are two important
+Note that onu uses pkg update, which means there are two important
 things to remember:
 
 1) It will upgrade all of your packages and not just the X packages.
@@ -104,6 +79,29 @@
 
 Example: Install to a new BE named "X14" that is cloned from the current BE:
 
- # onu -O -u file://`pwd`/proto/pkgs_i386 -U xnv-devel -t X14
+ # onu -O -u file://`pwd`/proto/pkgs_i386 -U nightly -t X14
 
 ____________________________________________________________________________
+
+Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
+
+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, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+____________________________________________________________________________
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/README.md	Fri Apr 07 15:26:24 2017 -0700
@@ -0,0 +1,29 @@
+# Getting started with the X Consolidation
+
+## Getting Started
+This README provides a very brief overview of the gate (i.e., source
+code repository), how to retrieve a copy, and how to build it.  
+
+## Overview
+The X consolidation maintains a project at
+
+     https://github.com/oracle/solaris-xorg
+
+That repo contains Makefile, patches, IPS (i.e., pkg(7)) manifests,
+and other files necessary to build, package and publish the Xorg bits
+on Solaris.
+
+## Getting the Bits
+The canonical repository internal to Oracle is stored in Mercurial, and
+is mirrored to an external Git repository on GitHub.  In order to build
+or develop in the gate, you will need to clone it.  You can do so with
+the following command.  
+
+    $ git clone https://github.com/oracle/solaris-xorg your-clone
+
+## Building the software
+Please review BUILD_INSTRUCTIONS for details on how to build and generate
+IPS packages.
+
+# Copyright
+Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.

--- a/pkg/Makefile	Thu Apr 06 22:27:29 2017 -0700
+++ b/pkg/Makefile	Fri Apr 07 15:26:24 2017 -0700
@@ -2,7 +2,7 @@
 #
 # Makefile for X Consolidation packages
 #
-# Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -415,9 +415,7 @@
 
 ### Repo setup
 
-# Default in developer builds is "xnv-devel"
-# X RE cronjob build scripts override to "xnv-nightly"
-PKGPUBLISHER = xnv-devel
+PKGPUBLISHER = nightly
 
 # Initialize the empty on-disk repositories
 $(PKGDEST):

--- a/pkg/manifests/x11-demo.p5m	Thu Apr 06 22:27:29 2017 -0700
+++ b/pkg/manifests/x11-demo.p5m	Fri Apr 07 15:26:24 2017 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -25,7 +25,7 @@
     value="ico, xeyes, xgc, and xlogo sample clients to demonstrate or test various X operations."
 # Silence pkglint WARNING pkglint.manifest004:
 #	last name component demo in package name clashes across
-#	pkg://solaris/library/java/demo pkg://xnv-devel/x11/
+#	pkg://solaris/library/java/demo pkg://nightly/x11/
 set name=pkg.linted value=True
 link path=usr/X11/bin/ico target=../../bin/ico
 link path=usr/X11/bin/xeyes target=../../bin/xeyes