Skip to content

Commit

Permalink
Fix typos
Browse files Browse the repository at this point in the history
  • Loading branch information
rex4539 authored May 8, 2018
1 parent 96718fb commit d1a1a5c
Show file tree
Hide file tree
Showing 15 changed files with 32 additions and 32 deletions.
2 changes: 1 addition & 1 deletion blog.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
layout: page
title: Blog ‹ Bisq - The decentralized bitcoin exchange
title: Blog ‹ Bisq - The decentralized Bitcoin exchange
---

<ul>
Expand Down
2 changes: 1 addition & 1 deletion community.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
layout: page
title: Community &lsaquo; Bisq - The decentralized bitcoin exchange
title: Community &lsaquo; Bisq - The decentralized Bitcoin exchange
banner: /images/community.png
---
# Community
Expand Down
2 changes: 1 addition & 1 deletion contact.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
layout: page
title: Contact &lsaquo; Bisq - The decentralized bitcoin exchange
title: Contact &lsaquo; Bisq - The decentralized Bitcoin exchange
banner: /images/contact.png
---
# Contact
Expand Down
4 changes: 2 additions & 2 deletions contribute.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
layout: page
title: Contribute to Bisq &lsaquo; Bisq - The decentralized bitcoin exchange
title: Contribute to Bisq &lsaquo; Bisq - The decentralized Bitcoin exchange
banner: /images/contribute.png
---
# Contribute to Bisq
Expand Down Expand Up @@ -36,7 +36,7 @@ Please check out our [forum](https://forum.bitsquare.io/t/bitsquare-bounties-rul
</div>
By donating bitcoin to our donation wallet you will be helping Bisq pay for our [direct costs](/finances/) like web hosting, domain names, SSL certificates, a Vimeo account and so on. So if you support this project and are in a position to help us out then that would be wonderful.

_**Note:** Donations to Bisq are not tax deductable as we are not formally registered in the jurisdiction of any Government. We do not accept donations in Altcoins at this point in time. We would be really grateful if you converted them to Bitcoin and donated them that way though!_
_**Note:** Donations to Bisq are not tax deductible as we are not formally registered in the jurisdiction of any Government. We do not accept donations in Altcoins at this point in time. We would be really grateful if you converted them to Bitcoin and donated them that way though!_

<br>

Expand Down
6 changes: 3 additions & 3 deletions crowdfunding.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
layout: page
title: Crowdfunding Bisq Development &lsaquo; Bisq - The decentralized bitcoin exchange
title: Crowdfunding Bisq Development &lsaquo; Bisq - The decentralized Bitcoin exchange
banner: /images/crowdfunding.png
---
<h1>Crowdfunding Bisq Development</h1>
Expand Down Expand Up @@ -35,7 +35,7 @@ <h2>The crowd funding campaign has ended and has not reached its goal</h2>
<p>The crowdfunding campaign has started and will end on the <strong>9th of February (midnight CET)</strong>.</p>
<p>We hope we can count on you!</p>
<h2>Getting started</h2>
<p>It is easy to contribute to our decentrentralized crowdfunding project.</p>
<p>It is easy to contribute to our decentralized crowdfunding project.</p>
<p>Download both the Lighthouse application and the Bisq project file and import the project file into the Lighthouse application:</p>
<div style="text-align: center;">
<a href="http://web.archive.org/web/20160305181446/http://vinumeris.com/lighthouse"><img src="/images/get_lighthouse_button-300x62.png" alt="Get Lighthouse" width="250"/></a>
Expand Down Expand Up @@ -65,7 +65,7 @@ <h2>Why crowdfunding?</h2>
</p>
<p>After we have achieved each iterative milestone we will use feedback from the community to plan our next delivery milestone. The community can decide if we deserve their trust and financial support for funding the next development cycle.</p>
<p>The iterative milestones leading up to a fully functional 1.0 release of Bisq are described in our
<a href="/roadmap">roadmap</a>. Due to the novelty of the concept and technology we use, as well as the dependency on community support, we can not predict the date of our 1.0 release. We can only make firm estimates for each upcoming iterative milestone. We expect our final release to be completed in 2015.
<a href="/roadmap">roadmap</a>. Due to the novelty of the concept and technology we use, as well as the dependency on community support, we cannot predict the date of our 1.0 release. We can only make firm estimates for each upcoming iterative milestone. We expect our final release to be completed in 2015.
</p>
<p>We hope this approach will progressively build trust from our user community and keep the project aligned to its constitutional ideas of decentralization.</p>
<h2>We will remember you</h2>
Expand Down
2 changes: 1 addition & 1 deletion dao.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
layout: page
title: DAO &lsaquo; Bisq - The decentralized bitcoin exchange
title: DAO &lsaquo; Bisq - The decentralized Bitcoin exchange
banner: /images/community.png
---
# The Bisq DAO
Expand Down
2 changes: 1 addition & 1 deletion downloads.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
layout: page
title: Bisq Downloads &lsaquo; Bisq - The decentralized bitcoin exchange
title: Bisq Downloads &lsaquo; Bisq - The decentralized Bitcoin exchange
banner: /images/roadmap1.png
---
<h1>Bisq Downloads</h1>
Expand Down
6 changes: 3 additions & 3 deletions faq.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
layout: page
title: FAQ &lsaquo; Bisq - The decentralized bitcoin exchange
title: FAQ &lsaquo; Bisq - The decentralized Bitcoin exchange
banner: /images/faq.png
---
<h1>FAQ</h1>
Expand Down Expand Up @@ -51,7 +51,7 @@ <h2>Core Functions</h2>
<a href="https://bitcoinmagazine.com/11108/multisig-future-bitcoin/" target="_blank">multisignature</a> address.</p>
<p style="padding-left: 30px;">2. Both traders are required to pay security deposits. These are refunded to them after a trade completes.</p>
<p style="padding-left: 30px;">3. Bisq features an arbitrator system, to be used in case a trade dispute arises.</p>
<p>If you trade fiat currency there is some chargeback risk open because all banks have the option for reversing a transaction. Bisq supports only payment methods which are known that they it is very difficult to chargback with them. Paypal and credit cards are not supported for that reason. Read <a href="#11">here</a> more about chargback risks.
<p>If you trade fiat currency there is some chargeback risk open because all banks have the option for reversing a transaction. Bisq supports only payment methods which are known that they it is very difficult to chargeback with them. Paypal and credit cards are not supported for that reason. Read <a href="#11">here</a> more about chargeback risks.
<p><a name="2"></a><strong>There are already other decentralized exchanges. How is Bisq different?</strong></p>
<p>Currently no other project fits our definition of a decentralized bitcoin-to-fiat exchange. <a href="https://openbazaar.org/" target="_blank">Open Bazaar</a> stands alone in mirroring Bisq&#8217;s principles, but they&#8217;re a full market place, not a specialized currency exchange. Most exchanges claiming to be decentralized are either not supporting fiat exchange or operate with a server architecture and do not fit our definition. And of course there are a lot of ICO projects with whitepapers but they have not proven yet that they can deliver any working software.
</p>
Expand Down Expand Up @@ -242,7 +242,7 @@ <h2>Trading Details</h2>
The trading fees for the offer maker is based on trade amount and distance to market price.<br/>
Min. fee (MinFee) = 0.00005 BTC, default fee (DefFee) = 0.002 BTC/per Bitcoin, market price factor (MF) = square root of percent value (e.g. 1% -> 1, 9% -> 3, 0.01% -> 0.1).<br/>
Makers trading fee = max(MinFee, DefFee * amount * MF). E.g. 0.002 BTC for 1 BTC trade at 1% market price distance equivalent to 0.2% of the trade amount.<br/>
The trading fees for the offer taker depends only on the the trade amount.<br/>
The trading fees for the offer taker depends only on the trade amount.<br/>
Min. fee (MinFee) = 0.00005 BTC, default fee (DefFee) = 0.002 BTC/per Bitcoin.<br/>
Takers trading fee = max(MinFee, DefFee * amount). E.g. 0.002 BTC for 1 BTC trade. That is 0.2% of the trade amount.<br/>
The maker has to pay the miner fee for the trade fee transaction. The taker has to pay 3 times the miner fee (trade fee transaction, deposit transaction and payout transaction). That is because we use a fee estimation service and the maker cannot know which fee will be required at take-offer-time. The mining fee is taken from the recommendation from a <a href="https://bitcoinfees.earn.com/api/v1/fees/list" target="_blank">fee estimation service</a> and can vary between 20 Satoshi/byte up to 400 Satoshi/byte. The users can see the actual mining fee when creating or taking an offer.
Expand Down
4 changes: 2 additions & 2 deletions finances.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
layout: page
title: Finances &lsaquo; Bisq - The decentralized bitcoin exchange
title: Finances &lsaquo; Bisq - The decentralized Bitcoin exchange
---
# Finances

Expand Down Expand Up @@ -46,7 +46,7 @@ With Bisq we try to keep our expenses down! Our main expense is the time of our
<td>24.00 USD</td>
</tr>
<tr>
<td>Apple OSX developer certificate for code signing (1 year)</td>
<td>Apple macOS developer certificate for code signing (1 year)</td>
<td>99.00 EUR</td>
</tr>
<p>
Expand Down
4 changes: 2 additions & 2 deletions funding-voices.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
layout: page
title: The messages of our supporters &lsaquo; Bisq - The decentralized bitcoin exchange
title: The messages of our supporters &lsaquo; Bisq - The decentralized Bitcoin exchange
---
<h1>The messages of our supporters</h1>

Expand Down Expand Up @@ -40,7 +40,7 @@ <h1>The messages of our supporters</h1>
<tr>
<td height="19" align="right" sdval="0,23125765" sdnum="3079;">0,23125765</td>
<td align="left">Ivor Thomas</td>
<td align="left">Good luck. This type of project along with Open Bazaar and oher censorship resistant projects is just so critical for our future well being.</td>
<td align="left">Good luck. This type of project along with Open Bazaar and other censorship resistant projects is just so critical for our future well being.</td>
</tr>
<tr>
<td height="19" align="right" sdval="0,17543859" sdnum="3079;">0,17543859</td>
Expand Down
2 changes: 1 addition & 1 deletion governance.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
layout: page
title: Governance &lsaquo; Bisq - The decentralized bitcoin exchange
title: Governance &lsaquo; Bisq - The decentralized Bitcoin exchange
---
# Governance

Expand Down
4 changes: 2 additions & 2 deletions index.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
layout: page
title: Bisq - The P2P exchange network
title: Bisq - The decentralized Bitcoin exchange
banner: /images/bitsquare-home2.jpg
---

Expand All @@ -25,7 +25,7 @@ Bisq is unique in that it enables you to start trading in less than 10 minutes:
Unlike traditional online exchanges, Bisq is designed to be:

- **Instantly accessible** – no need for registration or approval from a central authority.
- **Decentralized** – there is no single point of failure. The system is peer-to-peer and trading can not be stopped or censored.
- **Decentralized** – there is no single point of failure. The system is peer-to-peer and trading cannot be stopped or censored.
- **Safe** – Bisq never holds your funds. Decentralized arbitration system and security deposits protect traders.
- **Private** – no one except trading partners exchange personally identifying data. All personal data is stored locally.
- **Secure** – end-to-end encrypted communication routed over Tor.
Expand Down
2 changes: 1 addition & 1 deletion philosophy.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
layout: page
title: Philosophy &lsaquo; Bisq - The decentralized bitcoin exchange
title: Philosophy &lsaquo; Bisq - The decentralized Bitcoin exchange
banner: /images/philosophy.png
---
# Philosophy
Expand Down
2 changes: 1 addition & 1 deletion press.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
layout: page
title: Press &lsaquo; Bisq - The decentralized bitcoin exchange
title: Press &lsaquo; Bisq - The decentralized Bitcoin exchange
banner: /images/press.png
---
# Press
Expand Down
20 changes: 10 additions & 10 deletions roadmap.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
layout: page
title: Roadmap &lsaquo; Bisq - The decentralized bitcoin exchange
title: Roadmap &lsaquo; Bisq - The decentralized Bitcoin exchange
banner: /images/roadmap1.png
---
# Roadmap
Expand Down Expand Up @@ -49,7 +49,7 @@ Released [February 23th 2018](https://github.com/bitsquare/bitsquare/releases/ta
- Change max. deviation of market price to 30% (in settings it can be extended to 50%)
- Fix wrong fee estimation (#1325)
- Fix bug with deactivated Cash deposit offers
- Fix bug with currency selection in create offer screen when a mulit-currency account is used
- Fix bug with currency selection in create offer screen when a multi-currency account is used


### Version 0.6.5
Expand Down Expand Up @@ -80,7 +80,7 @@ Released [January 11th 2018](https://github.com/bitsquare/bitsquare/releases/tag
- Request initial data from several seed nodes instead of only one for more redundancy
- Optimize fee estimation policy for taker
- Add new altcoins: DeepOnion, WILD Token
- Deactivate stream isolation (hidden service are stream isolated by default)
- Deactivate stream isolation (hidden services are stream isolated by default)
- Fix wrong year at backup file name
- Fix NullPointer exception at seed word restore if data is not set
- Suppurt cmd+Enter shortcut for sending a dispute message
Expand Down Expand Up @@ -190,7 +190,7 @@ Released [July 1st 2017](https://github.com/bitsquare/bitsquare/releases/tag/v0.
- Separate resource files for PersistedEntryMap by base currency (separate trade statistics)
- Move base currency/network selection from network settings to preferences
- Add btc address validator to last trade step for withdrawal.
- Remove dont show again option for tx summary popup at withdrawal.
- Remove don't show again option for tx summary popup at withdrawal.
- Add support for different REFERENCE_DEFAULT_MIN_TX_FEE by base currency
- Fix issue with German as default language if OS is Windows/German
- Add warning for CXC regrading daily or monthly transfer limits
Expand All @@ -200,7 +200,7 @@ Released [June 28th 2017](https://github.com/bitsquare/bitsquare/releases/tag/v0
- Support multiple base currencies. Beside BTC the user can choose to use LTC or DOGE as base market. More will come in future releases.
- Use fee estimation service form https://bitcoinfees.21.co to use dynamic mining fees.
- Use dynamic trading fees. Trading fees are based on trade amount and distance to market price.
Min. fee (MF) = 0.0002 BTC, default fee (DF) = 0.002 BTC, amount factor (AF) = 1/BTC, market price factor (MF) = square root of percent value (e.g. 1% -> 1, 9% 0 -> 3, 0.01% -> 0.1). Tradeing fee = max(MF, DF * amount * AF * MF). E.g. 0.002 BTC for 1 BTC trade at 1% market price distance.
Min. fee (MF) = 0.0002 BTC, default fee (DF) = 0.002 BTC, amount factor (AF) = 1/BTC, market price factor (MF) = square root of percent value (e.g. 1% -> 1, 9% 0 -> 3, 0.01% -> 0.1). Trading fee = max(MF, DF * amount * AF * MF). E.g. 0.002 BTC for 1 BTC trade at 1% market price distance.
- Make security deposit for buyer customizable at offer creation (allowed range: 0.001 BTC - 0.2 BTC)
- Use fixed security deposit for seller (0.01 BTC)
- Simplify trade process by removing locktime support (removed finalize payout step)
Expand Down Expand Up @@ -285,7 +285,7 @@ Released [February 11th 2017](https://github.com/bitsquare/bitsquare/releases/ta
- Add Georgia, Botswana
- Add new blockexplores: SoChain, Bitaps
- Added check for ZEC addresses (only t addresses are permitted) and info popup for ZEC and ZXC
- Added input validation for altocin addresses: IOP, PIVX, GBYTE
- Added input validation for altcoin addresses: IOP, PIVX, GBYTE
- Added input validation for IBAN, BIC, email
- Rename Cash/ATM deposit to Cash deposit
- Increase max. allowed deviation from market price to 30%
Expand All @@ -310,7 +310,7 @@ Released [November 19th 2016](https://github.com/bitsquare/bitsquare/releases/ta
- Add option for setting custom bitcoin nodes in network settings (additional possible via program argument)
- Add new block explorers to settings
- Increase max. trade period for US postal money order to 8 days
- Use default btc format (allow more then 4 decimal places)
- Use default btc format (allow more than 4 decimal places)
- Add tool for exporting wallet data
- Fix critical bug with BitcoinJ Bloomfilter handling
- Ignore TTL for persisted data objects (trade statistics) in local data map
Expand Down Expand Up @@ -601,11 +601,11 @@ Released [March 11th 2016](https://github.com/bitsquare/bitsquare/releases/tag/v
- P2P network optimizations (refresh offers)
- Reconnect and republish offers after inactivity (detect standby/sleep mode)
- Display detailed info for P2P connections
- Display inboud and outbound traffic
- Display inbound and outbound traffic
- Measure round trip time
- Throttle max. traffic
- Add "Show all currencies" option to the offer book
- Make market price invertable
- Make market price invertible
- Notifications and advanced popup handling

### Alpha Version 0.3.4
Expand Down Expand Up @@ -675,7 +675,7 @@ Released [March 30th 2015](https://github.com/bitsquare/bitsquare/releases/tag/v
- Encryption for DHT mailbox
- Use P2SH for MultiSig
- Add data protection for DHT storage
- When trader goes offline his offers get removed from the offer book and will get added again when he goes online again (app should run in background when window gets closed, but that is deactivaed at the moment)
- When trader goes offline his offers get removed from the offer book and will get added again when he goes online again (app should run in background when window gets closed, but that is deactivated at the moment)
- Update to TomP2P Beta 6
- Update to tag of latest BitcoinJ master

Expand Down

0 comments on commit d1a1a5c

Please sign in to comment.