aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2015-04-03 07:48:51 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2015-04-03 07:49:39 +0200
commit24e48991d3e602f2aa6ead36aa8aa118ec285ec7 (patch)
tree4b90311d061244414f9bb055db050704345a21a0
parent9e1cc16296578a7b6f27b4a1c48e38cc031060b0 (diff)
parentbf1cc803729cf63c74467b6ec8dd236274be70bb (diff)
downloadbitcoin-24e48991d3e602f2aa6ead36aa8aa118ec285ec7.tar.xz
Merge pull request #5961
bf1cc80 Docs: Use new Bitcoin.org download URLs (David A. Harding)
-rw-r--r--doc/release-notes.md4
-rw-r--r--doc/release-process.md17
2 files changed, 14 insertions, 7 deletions
diff --git a/doc/release-notes.md b/doc/release-notes.md
index f30436fd8d..3f1c9669c3 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -1,6 +1,6 @@
Bitcoin Core version 0.10.1 is now available from:
- https://bitcoin.org/bin/0.10.1/
+ <https://bitcoin.org/bin/bitcoin-core-0.10.1/>
This is a new minor version release, bringing bug fixes and translation
updates. If you are using 0.10.0, it is recommended to upgrade to this
@@ -8,7 +8,7 @@ version.
Please report bugs using the issue tracker at github:
- https://github.com/bitcoin/bitcoin/issues
+ <https://github.com/bitcoin/bitcoin/issues>
Upgrading and downgrading
=========================
diff --git a/doc/release-process.md b/doc/release-process.md
index eb2eb619bd..8c90243d77 100644
--- a/doc/release-process.md
+++ b/doc/release-process.md
@@ -132,15 +132,22 @@ rm SHA256SUMS
(the digest algorithm is forced to sha256 to avoid confusion of the `Hash:` header that GPG adds with the SHA256 used for the files)
- Upload zips and installers, as well as `SHA256SUMS.asc` from last step, to the bitcoin.org server
+ into `/var/www/bin/bitcoin-core-${VERSION}`
- Update bitcoin.org version
- - Make a pull request to add a file named `YYYY-MM-DD-vX.Y.Z.md` with the release notes
- to https://github.com/bitcoin/bitcoin.org/tree/master/_releases
- ([Example for 0.9.2.1](https://raw.githubusercontent.com/bitcoin/bitcoin.org/master/_releases/2014-06-19-v0.9.2.1.md)).
+ - First, check to see if the Bitcoin.org maintainers have prepared a
+ release: https://github.com/bitcoin/bitcoin.org/labels/Releases
- - After the pull request is merged, the website will automatically show the newest version, as well
- as update the OS download links. Ping Saivann in case anything goes wrong
+ - If they have, it will have previously failed their Travis CI
+ checks because the final release files weren't uploaded.
+ Trigger a Travis CI rebuild---if it passes, merge.
+
+ - If they have not prepared a release, follow the Bitcoin.org release
+ instructions: https://github.com/bitcoin/bitcoin.org#release-notes
+
+ - After the pull request is merged, the website will automatically show the newest version within 15 minutes, as well
+ as update the OS download links. Ping @saivann/@harding (saivann/harding on Freenode) in case anything goes wrong
- Announce the release: