https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/xorg-doc.git;h=d1fb0b5c6d4b01105c5b557bf15290386be8c60a

commit d1fb0b5c6d4b01105c5b557bf15290386be8c60a
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Fri Dec 29 17:59:58 2017 +0000

    Bump version to 20171229

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/xorg-doc.git;h=372d155826731482b6627328a3c8076f077e9ba7

commit 372d155826731482b6627328a3c8076f077e9ba7
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Fri Dec 29 17:49:52 2017 +0000

    Recommend installing the cygserver service.
    
    It's part of the cyginw package, so doesn't need explicityl installing.
    Remove note about Cygwin 1.5 cygserver, only of historical interest.

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/xorg-doc.git;h=2064d3782ec3017bf7a808d8a7b896a7f831ebde

commit 2064d3782ec3017bf7a808d8a7b896a7f831ebde
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Fri Dec 29 17:41:26 2017 +0000

    Reverse order of installers to put 64-bit first

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/xorg-doc.git;h=edc3331a945ddd507f0038a6223fa2b4c2a1256e

commit edc3331a945ddd507f0038a6223fa2b4c2a1256e
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Fri Dec 29 17:39:31 2017 +0000

    Update copyright date range


Diff:
---
 cg/cygwin-x-cg.xml   |    2 +-
 faq/cygwin-x-faq.xml |    2 +-
 ug/cygwin-x-ug.xml   |    2 +-
 ug/setup.xml         |   10 ++++++++--
 ug/using.xml         |   25 +------------------------
 version              |    2 +-
 6 files changed, 13 insertions(+), 30 deletions(-)

diff --git a/cg/cygwin-x-cg.xml b/cg/cygwin-x-cg.xml
index e971f04..8326d1c 100644
--- a/cg/cygwin-x-cg.xml
+++ b/cg/cygwin-x-cg.xml
@@ -155,7 +155,7 @@ Distribution">
 
 <legalnotice id="legal-notice">
 <blockquote id="legal-notice-quote"><para>
-Copyright (C) 2004 Harold L Hunt II.  Copyright (C) 2009-2015 Jon Turney.
+Copyright (C) 2004 Harold L Hunt II.  Copyright (C) 2009-2017 Jon Turney.
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3
 or any later version published by the Free Software Foundation;
diff --git a/faq/cygwin-x-faq.xml b/faq/cygwin-x-faq.xml
index b70c51b..ea566ec 100644
--- a/faq/cygwin-x-faq.xml
+++ b/faq/cygwin-x-faq.xml
@@ -108,7 +108,7 @@
 
 <legalnotice id="legal-notice">
 <blockquote id="legal-notice-quote"><para> Copyright (c) 2001 Harold L Hunt II.
-Copyright (c) 2009-2015 the editors and contributors.
+Copyright (c) 2009-2017 the editors and contributors.
 Permission is granted to copy, distribute and/or modify this
 document under the terms of the GNU Free Documentation License,
 Version 1.3 or any later version published by the Free Software
diff --git a/ug/cygwin-x-ug.xml b/ug/cygwin-x-ug.xml
index 53c581e..76bd723 100644
--- a/ug/cygwin-x-ug.xml
+++ b/ug/cygwin-x-ug.xml
@@ -59,7 +59,7 @@
 <legalnotice id="legal-notice">
 <blockquote id="legal-notice-quote"><para>
 Copyright (c)  2000  Harold L Hunt II.
-Copyright © 2009-2015 Jon Turney.
+Copyright © 2009-2017 Jon Turney.
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3
 or any later version published by the Free Software Foundation;
diff --git a/ug/setup.xml b/ug/setup.xml
index 38a9707..fd99a44 100644
--- a/ug/setup.xml
+++ b/ug/setup.xml
@@ -19,8 +19,8 @@ browser</para>
 
 <listitem>
 <para>Click on the
-<ulink url="http://cygwin.com/setup-x86.exe"><quote>setup-x86.exe</quote></ulink> (32-bit installation) or
-<ulink url="http://cygwin.com/setup-x86_64.exe"><quote>setup-x86_64.exe</quote></ulink> (64-bit installation) link
+<ulink url="http://cygwin.com/setup-x86_64.exe"><quote>setup-x86_64.exe</quote></ulink> (64-bit installation) or
+<ulink url="http://cygwin.com/setup-x86.exe"><quote>setup-x86.exe</quote></ulink> (32-bit installation) link
 to download the appropriate setup program from the primary &cygwin; server.
 Save it to the directory that you would like to store the downloaded packages in
 (e.g. <filename class="directory">c:\download</filename>).  Do not
@@ -315,6 +315,12 @@ format="PNG"></imagedata>
 <para>Click <guibutton>Finish</guibutton> to close the setup program.</para>
 </listitem>
 
+<listitem>
+  <para>
+    (optional but recommended) Install the cygserver service.  See the
+    instructions in <xref linkend="using-shared-memory"></xref>).
+  </para>
+</listitem>
 
 </orderedlist>
 
diff --git a/ug/using.xml b/ug/using.xml
index fd88213..9eb1967 100644
--- a/ug/using.xml
+++ b/ug/using.xml
@@ -551,33 +551,10 @@ and are written to use those extensions.
 </para>
 <para>
 In Cygwin, XSI shared memory is provided by the <command>cygserver</command> Windows service.
-To install <command>cygserver</command>, install it using the setup program,
+To install <command>cygserver</command>
 run the <command>cygserver-config</command> script to install the service,
 and then reboot or use <command>cygrunsrv -S cygserver</command> to start the service.</para>
 
-<note>
-<para>
-<emphasis>
-This note is applicable to Cygwin 1.5 only.  Cygwin 1.7 automatically enables shared
-memory if the <command>cygserver</command> Windows service is running.
-</emphasis>
-</para>
-<para>
-Shared memory will only be used if the
-<parameter>CYGWIN</parameter> environment variable contains the <parameter>server</parameter>
-keyword.
-</para>
-<para>For example, starting <command>&file-server-exe;</command> with
-<screen>
-CYGWIN=server &file-server-exe;
-</screen>
-or setting the <parameter>CYGWIN</parameter> environment variable
-in the Windows control panel to contain <parameter>server</parameter>
-will enable shared memory support if the <command>cygserver</command>
-service is running.
-</para>
-</note>
-
 </sect1>
 
 <!-- END shared memory support -->
diff --git a/version b/version
index 2b4c384..16e9efc 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.1.20170220
+20171229