diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/Tor.txt | 4 | ||||
| -rw-r--r-- | doc/assets-attribution.txt | 8 | ||||
| -rw-r--r-- | doc/build-osx.md | 12 | ||||
| -rw-r--r-- | doc/readme-qt.rst | 16 |
4 files changed, 30 insertions, 10 deletions
diff --git a/doc/Tor.txt b/doc/Tor.txt index f515f96f49..386e3b5466 100644 --- a/doc/Tor.txt +++ b/doc/Tor.txt @@ -3,7 +3,7 @@ TOR SUPPORT IN BITCOIN It is possible to run Bitcoin as a Tor hidden service, and connect to such services. -The following assumes you have a Tor proxy running on port 9050. Many distributions +The following directions assume you have a Tor proxy running on port 9050. Many distributions default to having a SOCKS proxy listening on port 9050, but others may not. In particular, the Tor Browser Bundle defaults to listening on a random port. See https://www.torproject.org/docs/faq.html.en#TBBSocksPort for how to properly @@ -77,7 +77,7 @@ In a typical situation, where you're only reachable via Tor, this should suffice ./bitcoind -proxy=127.0.0.1:9050 -externalip=57qr3yd1nyntf5k.onion -listen -(obviously replace the Onion address with your own). If you don't care too much +(obviously, replace the Onion address with your own). If you don't care too much about hiding your node, and want to be reachable on IPv4 as well, additionally specify: diff --git a/doc/assets-attribution.txt b/doc/assets-attribution.txt index efd5c65a29..2069c5d6e0 100644 --- a/doc/assets-attribution.txt +++ b/doc/assets-attribution.txt @@ -44,11 +44,6 @@ Designer: Everaldo (Everaldo Coelho) License: GNU/GPL Site: http://findicons.com/icon/17102/reload?id=17102 -Image: src/qt/res/images/splash2.jpg (Wallet image) -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/ @@ -57,6 +52,7 @@ License: Oxygen icon theme is dual licensed. You may copy it under the Creative Icon: src/qt/res/icons/bitcoin.icns, src/qt/res/src/bitcoin.svg, src/qt/res/src/bitcoin.ico, src/qt/res/src/bitcoin.png, src/qt/res/src/bitcoin_testnet.png, docs/bitcoin_logo_doxygen.png, - src/qt/res/icons/toolbar.png, src/qt/res/icons/toolbar_testnet.png + src/qt/res/icons/toolbar.png, src/qt/res/icons/toolbar_testnet.png, + src/qt/res/images/splash.png, src/qt/res/images/splash_testnet.png Designer: Jonas Schnelli (based on the original bitcoin logo from Bitboy) License: MIT diff --git a/doc/build-osx.md b/doc/build-osx.md index 1ed593d5eb..d9aa779f87 100644 --- a/doc/build-osx.md +++ b/doc/build-osx.md @@ -95,6 +95,18 @@ Instructions: HomeBrew brew install boost miniupnpc openssl berkeley-db4 +Note: After you have installed the dependencies, you should check that the Brew installed version of OpenSSL is the one available for compilation. You can check this by typing + + openssl version + +into Terminal. You should see OpenSSL 1.0.1e 11 Feb 2013. + +If not, you can ensure that the Brew OpenSSL is correctly linked by running + + brew link openssl --force + +Rerunning "openssl version" should now return the correct version. + ### Building `bitcoind` 1. Clone the github tree to get the source code and go into the directory. diff --git a/doc/readme-qt.rst b/doc/readme-qt.rst index 7283dc780b..1bc3d701ae 100644 --- a/doc/readme-qt.rst +++ b/doc/readme-qt.rst @@ -46,19 +46,31 @@ Mac OS X - Download and install the `Qt Mac OS X SDK`_. It is recommended to also install Apple's Xcode with UNIX tools. -- Download and install `MacPorts`_. +- Download and install either `MacPorts`_ or `HomeBrew`_. -- Execute the following commands in a terminal to get the dependencies: +- Execute the following commands in a terminal to get the dependencies using MacPorts: :: sudo port selfupdate sudo port install boost db48 miniupnpc +- Execute the following commands in a terminal to get the dependencies using HomeBrew: + +:: + + brew update + brew install boost miniupnpc openssl berkeley-db4 + +- If using HomeBrew, edit `bitcoin-qt.pro` to account for library location differences. There's a diff in `contrib/homebrew/bitcoin-qt-pro.patch` that shows what you need to change, or you can just patch by doing + + patch -p1 < contrib/homebrew/bitcoin.qt.pro.patch + - Open the bitcoin-qt.pro file in Qt Creator and build as normal (cmd-B) .. _`Qt Mac OS X SDK`: http://qt-project.org/downloads/ .. _`MacPorts`: http://www.macports.org/install.php +.. _`HomeBrew`: http://mxcl.github.io/homebrew/ Build configuration options |