From fa22a1002873fb222a7ddb8d00c2bd727293ac13 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Wed, 25 Nov 2015 13:45:13 +0100
Subject: [PATCH] contrib: Del. gitian downloader config and update gitian
 README

---
 contrib/gitian-descriptors/README.md          | 13 +++---
 .../gitian-downloader/linux-download-config   | 45 -------------------
 .../gitian-downloader/win32-download-config   | 45 -------------------
 3 files changed, 6 insertions(+), 97 deletions(-)
 delete mode 100644 contrib/gitian-downloader/linux-download-config
 delete mode 100644 contrib/gitian-downloader/win32-download-config

diff --git a/contrib/gitian-descriptors/README.md b/contrib/gitian-descriptors/README.md
index 07c2ba98b..614970659 100644
--- a/contrib/gitian-descriptors/README.md
+++ b/contrib/gitian-descriptors/README.md
@@ -1,8 +1,7 @@
-### Gavin's notes on getting gitian builds up and running using KVM:###
+### Gavin's notes on getting gitian builds up and running using KVM
 
-These instructions distilled from:
-[  https://help.ubuntu.com/community/KVM/Installation](  https://help.ubuntu.com/community/KVM/Installation)
-... see there for complete details.
+These instructions distilled from
+[https://help.ubuntu.com/community/KVM/Installation](https://help.ubuntu.com/community/KVM/Installation).
 
 You need the right hardware: you need a 64-bit-capable CPU with hardware virtualization support (Intel VT-x or AMD-V). Not all modern CPUs support hardware virtualization.
 
@@ -33,14 +32,14 @@ Once you've got the right hardware and software:
     # Get inputs (see doc/release-process.md for exact inputs needed and where to get them)
     ...
 
-    # For further build instructions see doc/release-notes.md
+    # For further build instructions see doc/release-process.md
     ...
 
 ---------------------
 
 `gitian-builder` now also supports building using LXC. See
-[  https://help.ubuntu.com/12.04/serverguide/lxc.html](  https://help.ubuntu.com/12.04/serverguide/lxc.html)
-... for how to get LXC up and running under Ubuntu.
+[help.ubuntu.com](https://help.ubuntu.com/14.04/serverguide/lxc.html)
+for how to get LXC up and running under Ubuntu.
 
 If your main machine is a 64-bit Mac or PC with a few gigabytes of memory
 and at least 10 gigabytes of free disk space, you can `gitian-build` using
diff --git a/contrib/gitian-downloader/linux-download-config b/contrib/gitian-downloader/linux-download-config
deleted file mode 100644
index c0048d336..000000000
--- a/contrib/gitian-downloader/linux-download-config
+++ /dev/null
@@ -1,45 +0,0 @@
---- 
-name: bitcoin
-urls:
-- http://bitcoin.org/bitcoin-latest-linux-gitian.zip
-rss:
-- url: 
-  xpath: //item/link/text()
-  pattern: bitcoin-\d+.\d+.\d+-linux-gitian.zip
-signers:
-  0A82509767C7D4A5D14DA2301AE1D35043E08E54:
-    name: BlueMatt
-    key: bluematt
-  BF6273FAEF7CC0BA1F562E50989F6B3048A116B5:
-    name: Devrandom
-    key: devrandom
-  E463A93F5F3117EEDE6C7316BD02942421F4889F:
-    name: Luke-Jr
-    key: luke-jr
-  D762373D24904A3E42F33B08B9A408E71DAAC974:
-    name: "Pieter Wuille"
-    key: sipa
-  77E72E69DA7EE0A148C06B21B34821D4944DE5F7:
-    name: tcatm
-    key: tcatm
-  01CDF4627A3B88AAE4A571C87588242FBE38D3A8:
-    name: "Gavin Andresen"
-    key: gavinandresen
-  71A3B16735405025D447E8F274810B012346C9A6:
-    name: "Wladimir J. van der Laan"
-    key: laanwj
-  AEC1884398647C47413C1C3FB1179EB7347DC10D:
-    name: "Warren Togami"
-    key: wtogami
-  9692B91BBF0E8D34DFD33B1882C5C009628ECF0C:
-    name: michagogo
-    key: michagogo
-  E944AE667CF960B1004BC32FCA662BE18B877A60:
-    name: "Andreas Schildbach"
-    key: aschildbach
-  C060A6635913D98A3587D7DB1C2491FFEB0EF770:
-    name: "Cory Fields"
-    key: "cfields"
-  37EC7D7B0A217CDB4B4E007E7FAB114267E4FA04:
-    name: "Peter Todd"
-    key: "petertodd"
diff --git a/contrib/gitian-downloader/win32-download-config b/contrib/gitian-downloader/win32-download-config
deleted file mode 100644
index 0ad3bdd4f..000000000
--- a/contrib/gitian-downloader/win32-download-config
+++ /dev/null
@@ -1,45 +0,0 @@
---- 
-name: bitcoin
-urls:
-- http://bitcoin.org/bitcoin-latest-win32-gitian.zip
-rss:
-- url: 
-  xpath: //item/link/text()
-  pattern: bitcoin-\d+.\d+.\d+-win32-gitian.zip
-signers:
-  0A82509767C7D4A5D14DA2301AE1D35043E08E54:
-    name: BlueMatt
-    key: bluematt
-  BF6273FAEF7CC0BA1F562E50989F6B3048A116B5:
-    name: Devrandom
-    key: devrandom
-  E463A93F5F3117EEDE6C7316BD02942421F4889F:
-    name: Luke-Jr
-    key: luke-jr
-  D762373D24904A3E42F33B08B9A408E71DAAC974:
-    name: "Pieter Wuille"
-    key: sipa
-  77E72E69DA7EE0A148C06B21B34821D4944DE5F7:
-    name: tcatm
-    key: tcatm
-  01CDF4627A3B88AAE4A571C87588242FBE38D3A8:
-    name: "Gavin Andresen"
-    key: gavinandresen
-  71A3B16735405025D447E8F274810B012346C9A6:
-    name: "Wladimir J. van der Laan"
-    key: laanwj
-  AEC1884398647C47413C1C3FB1179EB7347DC10D:
-    name: "Warren Togami"
-    key: wtogami
-  9692B91BBF0E8D34DFD33B1882C5C009628ECF0C:
-    name: michagogo
-    key: michagogo
-  E944AE667CF960B1004BC32FCA662BE18B877A60:
-    name: "Andreas Schildbach"
-    key: aschildbach
-  C060A6635913D98A3587D7DB1C2491FFEB0EF770:
-    name: "Cory Fields"
-    key: "cfields"
-  37EC7D7B0A217CDB4B4E007E7FAB114267E4FA04:
-    name: "Peter Todd"
-    key: "petertodd"