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

[jturney@sourceware.org]

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

commit cdd0531c2cdbafca55f2f35e0639965dc2752540
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Mon Nov 6 14:30:02 2017 +0000

    Update section about version labels to match current practice

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

commit f4acb543e9807f3eac9bccdc25894b98099ecf78
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Mon Nov 6 14:29:09 2017 +0000

    Add header for version section

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

commit 935dab8a0ce5bba8c24cfb96061ff1b409b5ca2b
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Mon Nov 6 14:25:34 2017 +0000

    requires: appears in package section, not version section


Diff:
---
 setup.ini.html |   25 +++++++++++++------------
 1 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/setup.ini.html b/setup.ini.html
index b43800b..4db98b1 100644
--- a/setup.ini.html
+++ b/setup.ini.html
@@ -64,7 +64,7 @@ by Cygwin.</p>
 <p><tt>arch: x86|x86_64</tt><p>
 <p>The processor architecture this package set is built for.</p>
 
-<h3>Packages</h3>
+<h3>Package section</h3>
 
 <p><tt>@ <i>package</i></tt></p>
 <p><tt>Package: <i>package</i></tt></p>
@@ -92,26 +92,27 @@ information on categories.</p>
 <p>Optional.  This is text that will be displayed by setup when the package is
 installed.</p>
 
+<p><tt>requires: <i>package[ package...]</i></tt></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>
+
+<h4>Version description</h4>
+
 <p>
   <tt>
     [curr]<br/>
-    [prev]<br/>
     [test]<br/>
-    [ver&lt;digits&gt;]</tt>
+    [prev]<br/>
+    [&lt;label&gt;]</tt>
 </p>
 <p>These indicate the start of a version description within a package
 section. Note that <tt>[curr]</tt> is the default, and may be omitted if that
 version happens to be specified before the others. "curr" indicates the current
-stable (preferred) version, and "test" indicates a test
-version. "ver&lt;digits&gt;" carries no meaning except to be a unique label for
-a version. For historical reasons, "prev" is used for the version preceding the
-"curr" version.
+stable (preferred) version, and "test" indicates a test version.
+For historical reasons, "prev" is used for versions preceding the "curr" version.
+"&lt;label&gt;" carries no meaning except to be a label for a version.
 </p>
 
-<p><tt>requires: <i>package[ package...]</i></tt></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>version: <i>version</i></tt></p>
 <p>Indicates the version of the package.</p>
 
@@ -135,7 +136,7 @@ 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>
 
-<h3>Note: The following directives are not fully implemented yet.</h3>
+<h4>Note: The following directives are not fully implemented yet.</h4>
 
 <p><tt>Depends: <i>package [(= | &lt;= | &gt;= | &lt; | &gt;
     version-identifier)] [, package ...]</i></tt></p>