[cygwin-apps htdocs - The cygwin-apps website files] branch master, updated. ff1b531cdc574fec12b5afaa784dc3ce41f63ca9

[jturney@sourceware.org]

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/apps-htdocs.git;h=ff1b531cdc574fec12b5afaa784dc3ce41f63ca9

commit ff1b531cdc574fec12b5afaa784dc3ce41f63ca9
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Mon Jan 29 18:20:15 2018 +0000

    Document additional syntax supported by setup >=2.885

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/apps-htdocs.git;h=e50c26c962a4b482bedb1ab636c0b0fdc9b01182

commit e50c26c962a4b482bedb1ab636c0b0fdc9b01182
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Mon Jan 29 18:12:33 2018 +0000

    Clarify who gets to use the release label 'cygwin'


Diff:
---
 setup.ini.html |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/setup.ini.html b/setup.ini.html
index cdb92e8..1b89b0b 100644
--- a/setup.ini.html
+++ b/setup.ini.html
@@ -58,7 +58,7 @@ operate correctly on a <tt>setup.ini</tt> file to do so without warnings.</p>
 
 <p><tt>release: text</tt><p>
 <p>A label for the package set.  The label <tt>cygwin</tt> is reserved for use
-by Cygwin.</p>
+by cygwin.com</p>
 
 <p><tt>arch: x86|x86_64</tt><p>
 <p>The processor architecture this package set is built for.</p>
@@ -95,6 +95,10 @@ installed.</p>
 <p>Indicates a list of packages that this package needs at runtime in order
 to function correctly. Multiple packages should be separated by a space.</p>
 
+<p><tt>replace-versions:<i>version[ version...]</i></tt><p>
+<p>Optional.  This is a list of withdrawn versions, which, if installed, should
+be replaced with the curr: version, even if it is lower.</p>
+
 <h4>Version description</h4>
 
 <p>
@@ -147,15 +151,16 @@ for the current package version. i.e. for package foo-dev, one might have
 "Source: foo-src" to indicate that the source package for foo-dev is foo-src.
 This entry should not be used in conjunction with the "source:" entry.</p>
 
-<h4>Note: The following directives are not fully implemented yet.</h4>
-
-<p><tt>Depends: <i>version-relations</i></tt></p>
+<p><tt>depends2: <i>version-relations</i></tt></p>
 <p>This is a more sophisticated version of <tt>requires:</tt>, allowing the
-specification of version relationships.</p>
+specification of version relationships. <tt>depends:</tt> is a synonym
+for <tt>depends2:</tt>.</p>
 
-<p><tt>Obsoletes: <i>version-relations</i></tt></p>
+<p><tt>obsoletes: <i>version-relations</i></tt></p>
 <p>Indicates packages this package obsoletes.</p>
 
+<h4>Note: The following directives are not fully implemented yet.</h4>
+
 <p><tt>Build-Depends: <i>version-relations</i></i></tt></p>
 <p>Indicates the binary packages required to build the source package.</p>