aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2011-09-18 11:55:41 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2011-09-18 12:47:49 +0200
commit0465c41c847ddee7eeb5caefb164149400ff8395 (patch)
treedab8b1a20ad888499939b04d1564f47f93e424b7
parente122e42354149386159fbff82fbd66e7a8ba1fdb (diff)
move current qt specific readme to doc/, restore original README.md
-rw-r--r--README.md (renamed from README-original.md)1
-rw-r--r--doc/readme-qt.rst (renamed from README.rst)10
2 files changed, 5 insertions, 6 deletions
diff --git a/README-original.md b/README.md
index a41eb2d770..67fa93d371 100644
--- a/README-original.md
+++ b/README.md
@@ -27,4 +27,3 @@ help test the Bitcoin core, please contact QA@Bitcoin.org.
Feature branches are created when there are major new features being
worked on by several people.
-
diff --git a/README.rst b/doc/readme-qt.rst
index c13134a39d..b12aa30904 100644
--- a/README.rst
+++ b/doc/readme-qt.rst
@@ -19,7 +19,7 @@ Features
- Asks for confirmation before sending coins, for your own safety
- CSV export of transactions and address book (for Excel bookkeeping)
-
+
- Shows alternative icon when connected to testnet, so you never accidentally send real coins during testing
- Shows a progress bar on initial block download, so that you don't have to wonder how many blocks it needs to download to be up to date
@@ -34,7 +34,7 @@ Features
- Accepts "bitcoin:" URLs from browsers and other sources through drag and drop
-Build instructions
+Build instructions
===================
Debian
@@ -138,7 +138,7 @@ You can execute the following commands in a terminal to install it:
Notification support for recent (k)ubuntu versions
---------------------------------------------------
-To see desktop notifications on (k)ubuntu versions starting from 10.04, enable usage of the
+To see desktop notifications on (k)ubuntu versions starting from 10.04, enable usage of the
FreeDesktop notification interface through DBUS using the following qmake option:
::
@@ -152,10 +152,10 @@ A warning for people using the *static binary* version of Bitcoin on a Linux/UNI
The static binary version of Bitcoin is linked against libdb4.7 or libdb4.8 (see also `this Debian issue`_).
-Now the nasty thing is that databases from 5.X are not compatible with 4.X.
+Now the nasty thing is that databases from 5.X are not compatible with 4.X.
If the globally installed development package of Berkely DB installed on your system is 5.X, any source you
-build yourself will be linked against that. The first time you run with a 5.X version the database will be upgraded,
+build yourself will be linked against that. The first time you run with a 5.X version the database will be upgraded,
and 4.X cannot open the new format. This means that you cannot go back to the old statically linked version without
significant hassle!