public inbox for cygwin-apps-cvs@sourceware.org
help / color / mirror / Atom feed
From: jturney@sourceware.org
To: cygwin-apps-cvs@sourceware.org
Subject: [cygwin-apps htdocs - The cygwin-apps website files] branch master, updated. d7cdf52fbe82a05fa724b6c7ca574537ffed7f29
Date: Sun, 02 Feb 2020 17:11:00 -0000	[thread overview]
Message-ID: <20200202171114.49778.qmail@sourceware.org> (raw)




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

commit d7cdf52fbe82a05fa724b6c7ca574537ffed7f29
Author: Jon Turney <jon.turney@dronecode.org.uk>
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>


                 reply	other threads:[~2020-02-02 17:11 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200202171114.49778.qmail@sourceware.org \
    --to=jturney@sourceware.org \
    --cc=cygwin-apps-cvs@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).