[qemu-web PATCH] new page: conservancy.md

["Alex Bennée" <alex.bennee@linaro.org>]

This is intended to replace the wiki
page (https://wiki.qemu.org/Conservancy) with a slightly more formal
page with the same information. I've also added the private list
address for governance issues that might want to be raised privately.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
 conservancy.md | 32 ++++++++++++++++++++++++++++++++
 index.html     |  2 +-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 conservancy.md

diff --git a/conservancy.md b/conservancy.md
new file mode 100644
index 0000000..4d3c39c
--- /dev/null
+++ b/conservancy.md
@@ -0,0 +1,32 @@
+---
+title: Conservancy
+permalink: /conservancy/
+---
+
+QEMU is a member of [Software Freedom Conservancy](https://sfconservancy.org/), 
+a not-for-profit organization that provides legal and administrative assistance
+to open source projects.
+
+The Software Freedom Conservancy holds assets on behalf of the
+project, including domain names and project funds/donations.
+
+QEMU interacts with Conservancy through a Leadership Committee,
+currently composed of the following members:
+
+* Alex Bennée
+* Paolo Bonzini
+* Andreas Färber
+* Alexander Graf
+* Stefan Hajnoczi
+* Peter Maydell
+
+The committee votes via simple majority. There cannot be more than two
+members employed by the same company at once.
+
+If you would like to raise an issue to the Leadership Committee,
+please email [qemu-devel@nongnu.org](mailto:qemu-devel@nongnu.org) and
+CC at least one of the members so they can bring the issue forward.
+For private emails you can send an email
+[qemu@sfconservancy.org](mailto:qemu@sfconservancy.org) which is a
+private list that all the leadership committee are subscribed to.
+
diff --git a/index.html b/index.html
index 37a0fbd..1de3fe3 100644
--- a/index.html
+++ b/index.html
@@ -62,7 +62,7 @@ $('.colorbox').on("click.random-namespace", function() {
 
 		</div>
 		<hr>
-		<p>QEMU is a member of <a href="https://wiki.qemu.org/Conservancy">Software Freedom Conservancy</a>.</p>
+		<p>QEMU is a member of <a href="/conservancy/">Software Freedom Conservancy</a>.</p>
 	</div>
 </div>
 
-- 
2.20.1