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

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

commit d7cdf52fbe82a05fa724b6c7ca574537ffed7f29
Author: Jon Turney <[email protected]>
Date:   Sun Feb 2 17:09:45 2020 +0000

    Document conflicts: and provides:


Diff:
---
 setup.ini.html | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/setup.ini.html b/setup.ini.html
index dba6f60..bdfb073 100644
--- a/setup.ini.html
+++ b/setup.ini.html
@@ -163,6 +163,13 @@ for <tt>depends2:</tt>.</p>
 <p><tt>obsoletes: <i>version-relations</i></tt></p>
 <p>Indicates packages this package obsoletes.</p>
 
+<p><tt>conflicts: <i>version-relations</i></tt></p>
+<p>Indicates packages this package conflicts with.</p>
+
+<p><tt>provides: <i>package [, package ...]</i></tt></p>
+<p>Indicates additional package <tt>requires:</tt> and <tt>depends:</tt> this
+package satisfies.</p>
+
 <h4>Note: The following directives are not fully implemented yet.</h4>
 
 <p><tt>Build-Depends: <i>version-relations</i></i></tt></p>