aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2016-03-01 18:38:49 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2016-03-01 18:39:21 +0100
commite5121eb951c49b36b2b55069ab778a74bbf6bcb1 (patch)
treecce8f7a7456a4b14775031151df6a260a2cfed49 /doc
parent639ec582d0f31e4a15946ffff2e95b9ff7758bd2 (diff)
parentfa266524592cc18c789cc587d738fb0e548fd23a (diff)
Merge #7617: [doc/log] Fix markdown syntax and line terminate LogPrint
fa26652 Make sure LogPrintf strings are line-terminated (MarcoFalke) fa97f95 [doc] Fix markdown (MarcoFalke) fa06ce0 Fix doxygen comment for payTxFee (MarcoFalke)
Diffstat (limited to 'doc')
-rw-r--r--doc/README.md2
-rw-r--r--doc/release-notes/release-notes-0.12.0.md7
-rw-r--r--doc/release-process.md2
3 files changed, 5 insertions, 6 deletions
diff --git a/doc/README.md b/doc/README.md
index c0f9ee5220..cf475ef18e 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -49,7 +49,7 @@ The following are developer notes on how to build Bitcoin on your native platfor
Development
---------------------
-The Bitcoin repo's [root README](https://github.com/bitcoin/bitcoin/blob/master/README.md) contains relevant information on the development process and automated testing.
+The Bitcoin repo's [root README](/README.md) contains relevant information on the development process and automated testing.
- [Developer Notes](developer-notes.md)
- [Multiwallet Qt Development](multiwallet-qt.md)
diff --git a/doc/release-notes/release-notes-0.12.0.md b/doc/release-notes/release-notes-0.12.0.md
index 80a0fa9dad..135cd68a7c 100644
--- a/doc/release-notes/release-notes-0.12.0.md
+++ b/doc/release-notes/release-notes-0.12.0.md
@@ -99,7 +99,7 @@ Direct headers announcement (BIP 130)
Between compatible peers, [BIP 130]
(https://github.com/bitcoin/bips/blob/master/bip-0130.mediawiki)
-direct headers announcement is used. This means that blocks are advertized by
+direct headers announcement is used. This means that blocks are advertised by
announcing their headers directly, instead of just announcing the hash. In a
reorganization, all new headers are sent, instead of just the new tip. This
can often prevent an extra roundtrip before the actual block is downloaded.
@@ -272,7 +272,7 @@ at all. Therefore, a fallback value can be set with `-fallbackfee=<f>`
At all times, Bitcoin Core will cap fees at `-maxtxfee=<x>` (default:
0.10) BTC.
-Furthermore, Bitcoin Core will never create transactions smaller than
+Furthermore, Bitcoin Core will never create transactions paying less than
the current minimum relay fee.
Finally, a user can set the minimum fee rate for all transactions with
`-mintxfee=<i>`, which defaults to 1000 satoshis per kB.
@@ -701,7 +701,7 @@ git merge commit are mentioned.
- #7112 `96b8025` reduce cs_main locks during tip update, more fluently update UI (Jonas Schnelli)
- #7206 `f43c2f9` Add "NODE_BLOOM" to guiutil so that peers don't get UNKNOWN[4] (Matt Corallo)
- #7282 `5cadf3e` fix coincontrol update issue when deleting a send coins entry (Jonas Schnelli)
-- #7319 `1320300` Intro: Display required space (Jonas Schnelli)
+- #7319 `1320300` Intro: Display required space (MarcoFalke)
- #7318 `9265e89` quickfix for RPC timer interface problem (Jonas Schnelli)
- #7327 `b16b5bc` [Wallet] Transaction View: LastMonth calculation fixed (crowning-)
- #7364 `7726c48` [qt] Windows: Make rpcconsole monospace font larger (MarcoFalke)
@@ -842,7 +842,6 @@ Thanks to everyone who directly contributed to this release:
- Kevin Cooper
- lpescher
- Luke Dashjr
-- Marco
- MarcoFalke
- Mark Friedenbach
- Matt
diff --git a/doc/release-process.md b/doc/release-process.md
index 8fb083d0d4..2c83896c22 100644
--- a/doc/release-process.md
+++ b/doc/release-process.md
@@ -210,7 +210,7 @@ Note: check that SHA256SUMS itself doesn't end up in SHA256SUMS, which is a spur
- Optionally reddit /r/Bitcoin, ... but this will usually sort out itself
-- Notify BlueMatt so that he can start building [https://launchpad.net/~bitcoin/+archive/ubuntu/bitcoin](the PPAs)
+- Notify BlueMatt so that he can start building [the PPAs](https://launchpad.net/~bitcoin/+archive/ubuntu/bitcoin)
- Add release notes for the new version to the directory `doc/release-notes` in git master