aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/README.md2
-rw-r--r--doc/README_windows.txt2
-rw-r--r--doc/build-msw.md83
-rw-r--r--doc/release-notes.md46
-rw-r--r--doc/tor.md5
5 files changed, 2 insertions, 136 deletions
diff --git a/doc/README.md b/doc/README.md
index 9c724ec1e9..f8bb8020d4 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -73,5 +73,5 @@ The Bitcoin repo's [root README](https://github.com/bitcoin/bitcoin/blob/master/
License
---------------------
Distributed under the [MIT/X11 software license](http://www.opensource.org/licenses/mit-license.php).
-This product includes software developed by the OpenSSL Project for use in the [OpenSSL Toolkit](http://www.openssl.org/). This product includes
+This product includes software developed by the OpenSSL Project for use in the [OpenSSL Toolkit](https://www.openssl.org/). This product includes
cryptographic software written by Eric Young ([eay@cryptsoft.com](mailto:eay@cryptsoft.com)), and UPnP software written by Thomas Bernard.
diff --git a/doc/README_windows.txt b/doc/README_windows.txt
index 18fd4216f9..368f2b45e1 100644
--- a/doc/README_windows.txt
+++ b/doc/README_windows.txt
@@ -5,7 +5,7 @@ Copyright (c) 2009-2014 Bitcoin Core Developers
Distributed under the MIT/X11 software license, see the accompanying
file COPYING or http://www.opensource.org/licenses/mit-license.php.
This product includes software developed by the OpenSSL Project for use in
-the OpenSSL Toolkit (http://www.openssl.org/). This product includes
+the OpenSSL Toolkit (https://www.openssl.org/). This product includes
cryptographic software written by Eric Young (eay@cryptsoft.com).
diff --git a/doc/build-msw.md b/doc/build-msw.md
deleted file mode 100644
index 9e4eaee3f5..0000000000
--- a/doc/build-msw.md
+++ /dev/null
@@ -1,83 +0,0 @@
-WINDOWS BUILD NOTES
-===================
-
-
-Compilers Supported
--------------------
-TODO: What works?
-Note: releases are cross-compiled using mingw running on Linux.
-
-
-Dependencies
-------------
-Libraries you need to download separately and build:
-
- name default path download
- --------------------------------------------------------------------------------------------------------------------
- OpenSSL \openssl-1.0.1c-mgw http://www.openssl.org/source/
- Berkeley DB \db-4.8.30.NC-mgw http://www.oracle.com/technology/software/products/berkeley-db/index.html
- Boost \boost-1.50.0-mgw http://www.boost.org/users/download/
- miniupnpc \miniupnpc-1.6-mgw http://miniupnp.tuxfamily.org/files/
-
-Their licenses:
-
- OpenSSL Old BSD license with the problematic advertising requirement
- Berkeley DB New BSD license with additional requirement that linked software must be free open source
- Boost MIT-like license
- miniupnpc New (3-clause) BSD license
-
-Versions used in this release:
-
- OpenSSL 1.0.1c
- Berkeley DB 4.8.30.NC
- Boost 1.50.0
- miniupnpc 1.6
-
-
-OpenSSL
--------
-MSYS shell:
-
-un-tar sources with MSYS 'tar xfz' to avoid issue with symlinks (OpenSSL ticket 2377)
-change 'MAKE' env. variable from 'C:\MinGW32\bin\mingw32-make.exe' to '/c/MinGW32/bin/mingw32-make.exe'
-
- cd /c/openssl-1.0.1c-mgw
- ./config
- make
-
-Berkeley DB
------------
-MSYS shell:
-
- cd /c/db-4.8.30.NC-mgw/build_unix
- sh ../dist/configure --enable-mingw --enable-cxx
- make
-
-Boost
------
-MSYS shell:
-
- downloaded boost jam 3.1.18
- cd \boost-1.50.0-mgw
- bjam toolset=gcc --build-type=complete stage
-
-MiniUPnPc
----------
-UPnP support is optional, make with `USE_UPNP=` to disable it.
-
-MSYS shell:
-
- cd /c/miniupnpc-1.6-mgw
- make -f Makefile.mingw
- mkdir miniupnpc
- cp *.h miniupnpc/
-
-Bitcoin
--------
-MSYS shell:
-
- cd \bitcoin
- sh autogen.sh
- sh configure
- mingw32-make
- strip bitcoind.exe
diff --git a/doc/release-notes.md b/doc/release-notes.md
index 66059800b6..967a39a0e7 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -39,49 +39,3 @@ estimate.
Statistics used to estimate fees and priorities are saved in the
data directory in the 'fee_estimates.dat' file just before
program shutdown, and are read in at startup.
-
-Double-Spend Relay and Alerts
-=============================
-VERY IMPORTANT: *It has never been safe, and remains unsafe, to rely*
-*on unconfirmed transactions.*
-
-Relay
------
-When an attempt is seen on the network to spend the same unspent funds
-more than once, it is no longer ignored. Instead, it is broadcast, to
-serve as an alert. This broadcast is subject to protections against
-denial-of-service attacks.
-
-Wallets and other bitcoin services should alert their users to
-double-spends that affect them. Merchants and other users may have
-enough time to withhold goods or services when payment becomes
-uncertain, until confirmation.
-
-Bitcoin Core Wallet Alerts
---------------------------
-The Bitcoin Core wallet now makes respend attempts visible in several
-ways.
-
-If you are online, and a respend affecting one of your wallet
-transactions is seen, a notification is immediately issued to the
-command registered with `-respendnotify=<cmd>`. Additionally, if
-using the GUI:
- - An alert box is immediately displayed.
- - The affected wallet transaction is highlighted in red until it is
- confirmed (and it may never be confirmed).
-
-A `respendsobserved` array is added to `gettransaction`, `listtransactions`,
-and `listsinceblock` RPC results.
-
-Warning
--------
-*If you rely on an unconfirmed transaction, these change do VERY*
-*LITTLE to protect you from a malicious double-spend, because:*
-
- - You may learn about the respend too late to avoid doing whatever
- you were being paid for
- - Using other relay rules, a double-spender can craft his crime to
- resist broadcast
- - Miners can choose which conflicting spend to confirm, and some
- miners may not confirm the first acceptable spend they see
-
diff --git a/doc/tor.md b/doc/tor.md
index b5eb91e12e..560f71fa27 100644
--- a/doc/tor.md
+++ b/doc/tor.md
@@ -13,11 +13,6 @@ configure Tor.
The first step is running Bitcoin behind a Tor proxy. This will already make all
outgoing connections be anonymized, but more is possible.
- -socks=5 SOCKS5 supports connecting-to-hostname, which can be used instead
- of doing a (leaking) local DNS lookup. SOCKS5 is the default,
- but SOCKS4 does not support this. (SOCKS4a does, but isn't
- implemented).
-
-proxy=ip:port Set the proxy server. If SOCKS5 is selected (default), this proxy
server will be used to try to reach .onion addresses as well.