From 2ea436b4335946e0dcf098cf948a58af48dafad1 Mon Sep 17 00:00:00 2001
From: Ken Brown <kbrown@cornell.edu>
Date: Wed, 6 Jun 2018 11:45:58 -0400
Subject: [PATCH] Cygwin: Document clearenv and bump API minor

Also add earlier "What changed" items to new-features.xml.
---
 winsup/cygwin/include/cygwin/version.h   |  3 ++-
 winsup/cygwin/release/{2.10.1 => 2.11.0} |  1 +
 winsup/doc/new-features.xml              | 20 ++++++++++++++++++++
 winsup/doc/posix.xml                     |  1 +
 4 files changed, 24 insertions(+), 1 deletion(-)
 rename winsup/cygwin/release/{2.10.1 => 2.11.0} (97%)

diff --git a/winsup/cygwin/include/cygwin/version.h b/winsup/cygwin/include/cygwin/version.h
index f08707eea..2991ab858 100644
--- a/winsup/cygwin/include/cygwin/version.h
+++ b/winsup/cygwin/include/cygwin/version.h
@@ -494,12 +494,13 @@ details. */
   323: scanf %l[ conversion.
   324: Export sigtimedwait.
   325: Export catclose, catgets, catopen.
+  326: Export clearenv
 
   Note that we forgot to bump the api for ualarm, strtoll, strtoull,
   sigaltstack, sethostname. */
 
 #define CYGWIN_VERSION_API_MAJOR 0
-#define CYGWIN_VERSION_API_MINOR 325
+#define CYGWIN_VERSION_API_MINOR 326
 
 /* There is also a compatibity version number associated with the shared memory
    regions.  It is incremented when incompatible changes are made to the shared
diff --git a/winsup/cygwin/release/2.10.1 b/winsup/cygwin/release/2.11.0
similarity index 97%
rename from winsup/cygwin/release/2.10.1
rename to winsup/cygwin/release/2.11.0
index 42d9d1110..ef7d08256 100644
--- a/winsup/cygwin/release/2.10.1
+++ b/winsup/cygwin/release/2.11.0
@@ -1,6 +1,7 @@
 What's new:
 -----------
 
+- New API: clearenv.
 
 What changed:
 -------------
diff --git a/winsup/doc/new-features.xml b/winsup/doc/new-features.xml
index 59af6efc0..5029b7c08 100644
--- a/winsup/doc/new-features.xml
+++ b/winsup/doc/new-features.xml
@@ -4,6 +4,26 @@
 
 <sect1 id="ov-new"><title>What's new and what changed in Cygwin</title>
 
+<sect2 id="ov-new2.11"><title>What's new and what changed in 2.11</title>
+
+<itemizedlist mark="bullet">
+
+<listitem><para>
+SO_RCVTIMEO and SO_SNDTIMEO socket options are now honored.
+</para></listitem>
+
+<listitem><para>
+/proc/cpuinfo now reports L3 cache size on Intel CPUs.
+</para></listitem>
+
+<listitem><para>
+New API: clearenv.
+</para></listitem>
+
+</itemizedlist>
+
+</sect2>
+
 <sect2 id="ov-new2.10"><title>What's new and what changed in 2.10</title>
 
 <itemizedlist mark="bullet">
diff --git a/winsup/doc/posix.xml b/winsup/doc/posix.xml
index 8b4bab1b0..0c95091ea 100644
--- a/winsup/doc/posix.xml
+++ b/winsup/doc/posix.xml
@@ -1284,6 +1284,7 @@ also IEEE Std 1003.1-2008 (POSIX.1-2008).</para>
     asprintf_r
     basename			(see chapter "Implementation Notes")
     canonicalize_file_name
+    clearenv
     clog10
     clog10f
     clog10l