Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix typos #289

Merged
merged 1 commit into from
Nov 22, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Please submit proposed changes as pull requests, ideally with commit messages th

A pull requests should generally have a singular, well-defined purpose. For example, a pull request to add a blog post should just add a blog post, not add a blog post _and_ change spacing/indentation on some other page.

You should fork this repository, create a new branch, and and make all your changes there. Please don't commit your changes to the `master` branch.
You should fork this repository, create a new branch, and make all your changes there. Please don't commit your changes to the `master` branch.

**Please thoroughly test pull requests before submitting.**

Expand Down
2 changes: 1 addition & 1 deletion _data/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ faq:
<p>Bisq provides a 3-layer mechanism for resolving disputes: trader chat, mediation, and arbitration.</p><p>Trader chat enables traders to resolve small issues themselves privately over end-to-end encrypted chat right in Bisq. If this doesn't work, traders can engage a mediator to examine the situation and suggest a payout. In rare circumstances that mediation fails, a trader can choose to engage an arbitrator to re-examine the situation and make a payout.</p><p>Please note that the scope of the arbitrator role changed significantly with the launch of the new trade protocol on v1.2.</p><p>See <a href="https://docs.bisq.network/trading-rules" target="_blank">documentation</a> for more details on how this process works.</p>
hCollusion: "How is collusion between mediators, arbitrators, and traders prevented?"
pCollusion: >
<p>With the launch of the new trading procotol in v1.2, arbitrators no longer have a key in the multisig escrow. This means that traders retain absolute control of their funds, and there is no possibility of collusion.</p><p>Mediators and arbitrators are still <a href="https://docs.bisq.network/user-dao-intro.html#ensure-honesty-in-high-trust-roles" target="_blank">bonded roles</a>, however, because even though they cannot sign a payout transaction to resolve a dispute, they can <span class="note">advise</span> how to resolve a dispute, and it's important that they are responsible and fair when doing so.</p>
<p>With the launch of the new trading protocol in v1.2, arbitrators no longer have a key in the multisig escrow. This means that traders retain absolute control of their funds, and there is no possibility of collusion.</p><p>Mediators and arbitrators are still <a href="https://docs.bisq.network/user-dao-intro.html#ensure-honesty-in-high-trust-roles" target="_blank">bonded roles</a>, however, because even though they cannot sign a payout transaction to resolve a dispute, they can <span class="note">advise</span> how to resolve a dispute, and it's important that they are responsible and fair when doing so.</p>
hChargeback: "What happens if the person buying bitcoin does a chargeback after the bitcoin has been released from the multisig address?"
pChargeback: >
<p>Bisq only supports payment methods for which chargebacks are not easy (e.g., this is why PayPal and credit cards are not supported). But there is still a little chargeback risk with banks. If a bank executes a chargeback after the BTC has been released, there is nothing a mediator or arbitrator can do.</p> <p>Bisq's goal is to make this scenario as unattractive as possible, using three primary mechanisms</a>:</p> <ol>
Expand Down