aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/README2
-rw-r--r--doc/README_windows.txt2
-rw-r--r--doc/assets-attribution.txt4
-rw-r--r--doc/build-osx.txt2
-rw-r--r--doc/build-unix.txt7
-rw-r--r--doc/release-process.txt1
6 files changed, 13 insertions, 5 deletions
diff --git a/doc/README b/doc/README
index a196a461e5..4eda8bcd76 100644
--- a/doc/README
+++ b/doc/README
@@ -1,4 +1,4 @@
-Bitcoin 0.6.1 BETA
+Bitcoin 0.6.99 BETA
Copyright (c) 2009-2012 Bitcoin Developers
Distributed under the MIT/X11 software license, see the accompanying
diff --git a/doc/README_windows.txt b/doc/README_windows.txt
index ec0225fd92..eec252931d 100644
--- a/doc/README_windows.txt
+++ b/doc/README_windows.txt
@@ -1,4 +1,4 @@
-Bitcoin 0.6.1 BETA
+Bitcoin 0.6.99 BETA
Copyright (c) 2009-2012 Bitcoin Developers
Distributed under the MIT/X11 software license, see the accompanying
diff --git a/doc/assets-attribution.txt b/doc/assets-attribution.txt
index 0b0e377065..75062f7fef 100644
--- a/doc/assets-attribution.txt
+++ b/doc/assets-attribution.txt
@@ -54,3 +54,7 @@ Designer: Crobbo (forum)
Site: https://bitcointalk.org/index.php?topic=32273.0
License: Public domain
+Icon: src/qt/res/icons/debugwindow.png
+Designer: Vignoni David
+Site: http://www.oxygen-icons.org/
+License: Oxygen icon theme is dual licensed. You may copy it under the Creative Common Attribution-ShareAlike 3.0 License or the GNU Library General Public License.
diff --git a/doc/build-osx.txt b/doc/build-osx.txt
index 2ae77067fc..256614f7ab 100644
--- a/doc/build-osx.txt
+++ b/doc/build-osx.txt
@@ -44,7 +44,7 @@ sudo port install qrencode
4. Now you should be able to build bitcoind:
cd bitcoin/src
-make -f makefile.osx
+make -f makefile.osx USE_IPV6=1
Run:
./bitcoind --help # for a list of command-line options.
diff --git a/doc/build-unix.txt b/doc/build-unix.txt
index c5b4205084..c32563814d 100644
--- a/doc/build-unix.txt
+++ b/doc/build-unix.txt
@@ -40,9 +40,12 @@ turned off by default. Set USE_UPNP to a different value to control this:
libqrencode may be used for QRCode image generation. It can be downloaded
from http://fukuchi.org/works/qrencode/index.html.en, or installed via
your package manager. Set USE_QRCODE to control this:
- USE_QRCODE=0 (the default) No QRCode support - libarcode not required
+ USE_QRCODE=0 (the default) No QRCode support - libqrcode not required
USE_QRCODE=1 QRCode support enabled
+IPv6 support may be enabled by setting
+ USE_IPV6=1 Enable IPv6 support
+
Licenses of statically linked libraries:
Berkeley DB New BSD license with additional requirement that linked
software must be free open source
@@ -80,7 +83,7 @@ emerge -av1 --noreplace boost glib openssl sys-libs/db:4.8
Take the following steps to build (no UPnP support):
cd ${BITCOIN_DIR}/src
- make -f makefile.unix USE_UPNP= BDB_INCLUDE_PATH='/usr/include/db4.8'
+ make -f makefile.unix USE_UPNP= USE_IPV6=1 BDB_INCLUDE_PATH='/usr/include/db4.8'
strip bitcoind
diff --git a/doc/release-process.txt b/doc/release-process.txt
index 00fafa4818..efa2063459 100644
--- a/doc/release-process.txt
+++ b/doc/release-process.txt
@@ -93,6 +93,7 @@
* create SHA256SUMS for builds, and PGP-sign it
* update bitcoin.org version
+ make sure all OS download links go to the right versions
* update forum version