Skip to content

Commit 8491375

Browse files
committed
Merge pull request #6413
9fbca20 doc: Remove recommendation to add old repos for libd4.8* (tailsjoin)
2 parents 11edb0d + 9fbca20 commit 8491375

File tree

2 files changed

+6
-20
lines changed

2 files changed

+6
-20
lines changed

doc/REST-interface.md

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,15 @@ Supported API
99
####Transactions
1010
`GET /rest/tx/<TX-HASH>.<bin|hex|json>`
1111

12-
Given a transaction hash,
13-
Returns a transaction, in binary, hex-encoded binary or JSON formats.
12+
Given a transaction hash: returns a transaction in binary, hex-encoded binary, or JSON formats.
1413

1514
For full TX query capability, one must enable the transaction index via "txindex=1" command line / configuration option.
1615

1716
####Blocks
1817
`GET /rest/block/<BLOCK-HASH>.<bin|hex|json>`
1918
`GET /rest/block/notxdetails/<BLOCK-HASH>.<bin|hex|json>`
2019

21-
Given a block hash,
22-
Returns a block, in binary, hex-encoded binary or JSON formats.
20+
Given a block hash: returns a block, in binary, hex-encoded binary or JSON formats.
2321

2422
The HTTP request and response are both handled entirely in-memory, thus making maximum memory usage at least 2.66MB (1 MB max block, plus hex encoding) per request.
2523

@@ -28,8 +26,7 @@ With the /notxdetails/ option JSON response will only contain the transaction ha
2826
####Blockheaders
2927
`GET /rest/headers/<COUNT>/<BLOCK-HASH>.<bin|hex|json>`
3028

31-
Given a block hash,
32-
Returns <COUNT> amount of blockheaders in upward direction.
29+
Given a block hash: returns <COUNT> amount of blockheaders in upward direction.
3330

3431
####Chaininfos
3532
`GET /rest/chaininfo.json`
@@ -79,4 +76,4 @@ $ curl localhost:18332/rest/getutxos/checkmempool/b2cdfd7b89def827ff8af7cd9bff76
7976

8077
Risks
8178
-------------
82-
Running a webbrowser on the same node with a REST enabled bitcoind can be a risk. Accessing prepared XSS websites could read out tx/block data of your node by placing links like `<script src="http://127.0.0.1:8332/rest/tx/1234567890.json">` which might break the nodes privacy.
79+
Running a web browser on the same node with a REST enabled bitcoind can be a risk. Accessing prepared XSS websites could read out tx/block data of your node by placing links like `<script src="http://127.0.0.1:8332/rest/tx/1234567890.json">` which might break the nodes privacy.

doc/build-unix.md

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Build requirements:
5959

6060
sudo apt-get install build-essential libtool autotools-dev autoconf pkg-config libssl-dev
6161

62-
for Ubuntu 12.04 and later or Debian 7 and later libboost-all-dev has to be installed:
62+
For Ubuntu 12.04 and later or Debian 7 and later libboost-all-dev has to be installed:
6363

6464
sudo apt-get install libboost-all-dev
6565

@@ -72,18 +72,7 @@ for Ubuntu 12.04 and later or Debian 7 and later libboost-all-dev has to be inst
7272
Ubuntu 12.04 and later have packages for libdb5.1-dev and libdb5.1++-dev,
7373
but using these will break binary wallet compatibility, and is not recommended.
7474

75-
for Debian 7 (Wheezy) and later:
76-
The oldstable repository contains db4.8 packages.
77-
Add the following line to /etc/apt/sources.list,
78-
replacing [mirror] with any official debian mirror.
79-
80-
deb http://[mirror]/debian/ oldstable main
81-
82-
To enable the change run
83-
84-
sudo apt-get update
85-
86-
for other Debian & Ubuntu (with ppa):
75+
For other Debian & Ubuntu (with ppa):
8776

8877
sudo apt-get install libdb4.8-dev libdb4.8++-dev
8978

0 commit comments

Comments
 (0)