Skip to content

Commit

Permalink
Merge pull request #1 from IXCore/DocUpdate
Browse files Browse the repository at this point in the history
Doc update
  • Loading branch information
ArchimedesIX committed Jan 28, 2018
2 parents 757d698 + 318faf1 commit 161b3ca
Showing 1 changed file with 14 additions and 20 deletions.
34 changes: 14 additions & 20 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,49 +1,44 @@
Bitcoin Core integration/staging tree
IXCoin Core integration/staging tree
=====================================

[![Build Status](https://travis-ci.org/bitcoin/bitcoin.svg?branch=master)](https://travis-ci.org/bitcoin/bitcoin)

https://bitcoincore.org

What is Bitcoin?
What is IXCoin?
----------------

Bitcoin is an experimental digital currency that enables instant payments to
anyone, anywhere in the world. Bitcoin uses peer-to-peer technology to operate
with no central authority: managing transactions and issuing money are carried
out collectively by the network. Bitcoin Core is the name of open source
software which enables the use of this currency.
IXCoin is an experimental digital currency that enables instant payments to
anyone, anywhere in the world. IXCoin uses the same peer-to-peer technology as Bitcoin
to operate with no central authority: managing transactions and issuing money are
carried out collectively by the network. IXCoin Core is the name of open source
software which enables the use of this currency. IXCoin is merged mined with
Bitcoin for added security and use as a Bitcoin side chain.

For more information, as well as an immediately useable, binary version of
the Bitcoin Core software, see https://bitcoin.org/en/download, or read the
the IXCoin Core software, see https://ixcoin.net, or read the
[original whitepaper](https://bitcoincore.org/bitcoin.pdf).

License
-------

Bitcoin Core is released under the terms of the MIT license. See [COPYING](COPYING) for more
IXCoin Core is released under the terms of the MIT license. See [COPYING](COPYING) for more
information or see https://opensource.org/licenses/MIT.

Development Process
-------------------

The `master` branch is regularly built and tested, but is not guaranteed to be
completely stable. [Tags](https://github.com/bitcoin/bitcoin/tags) are created
regularly to indicate new official, stable release versions of Bitcoin Core.
completely stable. [Tags](https://github.com/IXCore/IXCoin/tags) are created
regularly to indicate new official, stable release versions of IXCoin Core.

The contribution workflow is described in [CONTRIBUTING.md](CONTRIBUTING.md).

The developer [mailing list](https://lists.linuxfoundation.org/mailman/listinfo/bitcoin-dev)
should be used to discuss complicated or controversial changes before working
on a patch set.

Developer IRC can be found on Freenode at #bitcoin-core-dev.

Testing
-------

Testing and code review is the bottleneck for development; we get more pull
requests than we can review and test on short notice. Please be patient and help out by testing
Testing and code review is the bottleneck for development. Please be patient and help out by testing
other people's pull requests, and remember this is a security-critical project where any mistake might cost people
lots of money.

Expand All @@ -70,12 +65,11 @@ Translations
------------

Changes to translations as well as new translations can be submitted to
[Bitcoin Core's Transifex page](https://www.transifex.com/projects/p/bitcoin/).
[IXCoin Core's Transifex page](https://www.transifex.com/projects/p/IXCoin/).

Translations are periodically pulled from Transifex and merged into the git repository. See the
[translation process](doc/translation_process.md) for details on how this works.

**Important**: We do not accept translation changes as GitHub pull requests because the next
pull from Transifex would automatically overwrite them again.

Translators should also subscribe to the [mailing list](https://groups.google.com/forum/#!forum/bitcoin-translators).

0 comments on commit 161b3ca

Please sign in to comment.