aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorWladimir J. van der Laan <[email protected]>2015-04-20 13:32:01 +0200
committerWladimir J. van der Laan <[email protected]>2015-04-20 13:32:04 +0200
commit6a0bcb80e4ce380a39f81b4fb01150d5b7e6cdf7 (patch)
tree1fceda4c3e22874df27471848264ec890837dfcb /doc
parentMerge pull request #6020 (diff)
parenttrivial string change in wallet.cpp (the -> that) (diff)
downloaddiscoin-6a0bcb80e4ce380a39f81b4fb01150d5b7e6cdf7.tar.xz
discoin-6a0bcb80e4ce380a39f81b4fb01150d5b7e6cdf7.zip
Merge pull request #6004
c6de7c3 trivial string change in wallet.cpp (the -> that) (Philip Kaufmann) 1e3473d Add operator names to DNS Seed list (Michael Ford) a21df62 ensure consistent header comment naming conventions (Philip Kaufmann) 9e16cb1 Make 'Default: %u' spacing consistent in help message (Wladimir J. van der Laan) 6cb37a3 [Qt, Trivial] remove two unneeded includes of wallet/db.h (Philip Kaufmann) 68f795e [Qt, Trivial] fix header groupings + space, intdentation fixes (Philip Kaufmann) 985ec17 [Qt, Trivial] misc minor string changes (Philip Kaufmann) c0555dc depends: latest config.guess and config.sub (Michael Ford) 89fc6b6 Remove leftover strlcpy.h copyright (Rob Van Mieghem) 468aa3b Re-wrote a passage of text that was difficult to understand. (Jason Lewicki) 71ad6bd [Trivial] format sync.h (Philip Kaufmann) abcec30 Update REST URL to match reality (paveljanik) 447d37e Use https link to bitcoin.org in Doxygen intro (Michael Ford) c069234 Fix typo in init.cpp interpration/interpretation (Michael Ford) 52070c8 Removed '()' where used without contents inside (Nicolas Benoit) 30c1db1 Replaced current function names with __func__ in LogPrintf() calls. (Nicolas Benoit) 9bdd03f Point to the Debian 7.8 installer (Michael Ford) 0b2f930 Fix docs for 'complete' field in 'signrawtransaction' response (charlescharles) c2f2161 Add x86_64* i686* mips* and arm* to depends .gitignore (Michael Ford) fa535f9 Remove folder and images for bootstrap.md (sandakersmann) 60c1469 [Qt] header group cleanup (Philip Kaufmann)
Diffstat (limited to 'doc')
-rw-r--r--doc/REST-interface.md2
-rw-r--r--doc/dnsseed-policy.md5
-rw-r--r--doc/gitian-building.md4
-rw-r--r--doc/img/bootstrap1.pngbin55028 -> 0 bytes
-rw-r--r--doc/img/bootstrap2.pngbin35195 -> 0 bytes
-rw-r--r--doc/img/bootstrap4.pngbin110060 -> 0 bytes
-rw-r--r--doc/img/bootstrap5.pngbin20825 -> 0 bytes
7 files changed, 5 insertions, 6 deletions
diff --git a/doc/REST-interface.md b/doc/REST-interface.md
index 23154ee90..f14aed728 100644
--- a/doc/REST-interface.md
+++ b/doc/REST-interface.md
@@ -36,4 +36,4 @@ Only supports JSON as output format.
Risks
-------------
-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:1234/tx/json/1234567890">` which might break the nodes privacy. \ No newline at end of file
+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.
diff --git a/doc/dnsseed-policy.md b/doc/dnsseed-policy.md
index 66a1757ac..f15ff44e5 100644
--- a/doc/dnsseed-policy.md
+++ b/doc/dnsseed-policy.md
@@ -7,9 +7,8 @@ As such, DNS seeds must be run by entities which have some minimum
level of trust within the Bitcoin community.
Other implementations of Bitcoin software may also use the same
-seeds and may be more exposed. In light of this exposure this
-document establishes some basic expectations for the expectations
-for the operation of dnsseeds.
+seeds and may be more exposed. In light of this exposure, this
+document establishes some basic expectations for operating dnsseeds.
0. A DNS seed operating organization or person is expected
to follow good host security practices and maintain control of
diff --git a/doc/gitian-building.md b/doc/gitian-building.md
index 25d3b8390..d285fffdb 100644
--- a/doc/gitian-building.md
+++ b/doc/gitian-building.md
@@ -74,11 +74,11 @@ In the VirtualBox GUI click "Create" and choose the following parameters in the
- Disk size: at least 40GB; as low as 20GB *may* be possible, but better to err on the safe side
- Push the `Create` button
-Get the [Debian 7.7 net installer](http://cdimage.debian.org/debian-cd/7.7.0/amd64/iso-cd/debian-7.7.0-amd64-netinst.iso) (a more recent minor version should also work, see also [Debian Network installation](https://www.debian.org/CD/netinst/)).
+Get the [Debian 7.8 net installer](http://cdimage.debian.org/debian-cd/7.8.0/amd64/iso-cd/debian-7.8.0-amd64-netinst.iso) (a more recent minor version should also work, see also [Debian Network installation](https://www.debian.org/CD/netinst/)).
This DVD image can be validated using a SHA256 hashing tool, for example on
Unixy OSes by entering the following in a terminal:
- echo "d440e85b4121f94608748139f25dbce1ad36771348b002fe07d4d44b9d9e623f debian-7.7.0-amd64-netinst.iso" | sha256sum -c
+ echo "e39c36d6adc0fd86c6edb0e03e22919086c883b37ca194d063b8e3e8f6ff6a3a debian-7.8.0-amd64-netinst.iso" | sha256sum -c
# (must return OK)
After creating the VM, we need to configure it.
diff --git a/doc/img/bootstrap1.png b/doc/img/bootstrap1.png
deleted file mode 100644
index 075930791..000000000
--- a/doc/img/bootstrap1.png
+++ /dev/null
Binary files differ
diff --git a/doc/img/bootstrap2.png b/doc/img/bootstrap2.png
deleted file mode 100644
index 6461f8181..000000000
--- a/doc/img/bootstrap2.png
+++ /dev/null
Binary files differ
diff --git a/doc/img/bootstrap4.png b/doc/img/bootstrap4.png
deleted file mode 100644
index ad6973792..000000000
--- a/doc/img/bootstrap4.png
+++ /dev/null
Binary files differ
diff --git a/doc/img/bootstrap5.png b/doc/img/bootstrap5.png
deleted file mode 100644
index d8d9baaf3..000000000
--- a/doc/img/bootstrap5.png
+++ /dev/null
Binary files differ