Skip to content

Commit

Permalink
Merge pull request #5443 from m52go/other-docs-links
Browse files Browse the repository at this point in the history
Switch remaining docs links in repository
  • Loading branch information
ripcurlx committed Apr 28, 2021
2 parents af8e5e2 + 6d9c53e commit 81b3c0a
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/boring-cyborg.yml
Expand Up @@ -6,7 +6,7 @@ labelPRBasedOnFilePath:
- assets/**/*

firstPRWelcomeComment: >
**Thanks for opening this pull request!**<br/><br/>Please check out our [contributor checklist](https://docs.bisq.network/contributor-checklist.html) and check if *Travis* or *Codacy* found any issues with your PR. Also make sure your commits are signed, and that you applied [Bisq's code style](https://github.com/bisq-network/style/issues) and [formatting](.editorconfig).<br/><br/>A maintainer will add an `is:priority` label to your PR if it is up for compensation. Please see our [Bisq Q1 2020 Update post](https://bisq.network/blog/q1-2020-update/) for more details.
**Thanks for opening this pull request!**<br/><br/>Please check out our [contributor checklist](https://bisq.wiki/Contributor_checklist) and check if *Travis* or *Codacy* found any issues with your PR. Also make sure your commits are signed, and that you applied [Bisq's code style](https://github.com/bisq-network/style/issues) and [formatting](.editorconfig).<br/><br/>A maintainer will add an `is:priority` label to your PR if it is up for compensation. Please see our [Bisq Q1 2020 Update post](https://bisq.network/blog/q1-2020-update/) for more details.
firstPRMergeComment: >
Awesome work, congrats on your first merged pull request!
Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Expand Up @@ -11,7 +11,7 @@ Install Keybase and enter "bisq" from the teams tab. This is an "open" team, whi

Discussion about code changes happens in GitHub issues and pull requests.

Discussion about larger changes to the way Bisq works happens in issues the [bisq-network/proposals](https://github.com/bisq-network/proposals/issues) repository. See https://docs.bisq.network/proposals.html for details.
Discussion about larger changes to the way Bisq works happens in issues the [bisq-network/proposals](https://github.com/bisq-network/proposals/issues) repository. See https://bisq.wiki/Proposals for details.


## Contributor Workflow
Expand Down Expand Up @@ -50,7 +50,7 @@ Bisq is not a company, but operates as a _decentralized autonomous organization_
Since our [Q1 2020 update](https://bisq.network/blog/q1-2020-update/) contributions are NOT eligible for compensation unless they are allocated as part of the development budget. Fixes for [critical bugs](https://bisq.wiki/Critical_Bugs) are eligible for compensation when delivered.
In any case please contact the team lead for development (@ripcurlx) upfront if you want to get compensated for your contributions.

For any work that was approved and merged into Bisq's `master` branch, you can [submit a compensation request](https://docs.bisq.network/dao/phase-zero.html#how-to-request-compensation) and earn BSQ (the Bisq DAO native token). Learn more about the Bisq DAO and BSQ [here](https://docs.bisq.network/dao/phase-zero.html).
For any work that was approved and merged into Bisq's `master` branch, you can [submit a compensation request](https://bisq.wiki/Making_a_compensation_request) and earn BSQ (the Bisq DAO native token). Learn more about the Bisq DAO and BSQ [here](https://bisq.wiki/Introduction_to_the_DAO).


## Style and Coding Conventions
Expand Down Expand Up @@ -95,7 +95,7 @@ See the issues in the [bisq-network/style](https://github.com/bisq-network/style

## See also

- [contributor checklist](https://docs.bisq.network/contributor-checklist.html)
- [contributor checklist](https://bisq.wiki/Contributor_checklist)
- [developer docs](docs#readme) including build and dev environment setup instructions
- [project management process](https://bisq.wiki/Project_management)

Expand Up @@ -157,7 +157,7 @@ public void cleanupDisputes() {
@Override
protected String getDisputeInfo(Dispute dispute) {
String role = Res.get("shared.arbitrator").toLowerCase();
String link = "https://docs.bisq.network/trading-rules.html#legacy-arbitration";
String link = "https://bisq.wiki/Arbitrator#Arbitrator_versus_Legacy_Arbitrator";
return Res.get("support.initialInfo", role, role, link);
}

Expand Down
Expand Up @@ -144,7 +144,7 @@ public void cleanupDisputes() {
@Override
protected String getDisputeInfo(Dispute dispute) {
String role = Res.get("shared.mediator").toLowerCase();
String link = "https://docs.bisq.network/trading-rules.html#mediation";
String link = "https://bisq.wiki/Dispute_resolution#Level_2:_Mediation";
return Res.get("support.initialInfo", role, role, link);
}

Expand Down
Expand Up @@ -133,7 +133,7 @@ public void cleanupDisputes() {
@Override
protected String getDisputeInfo(Dispute dispute) {
String role = Res.get("shared.refundAgent").toLowerCase();
String link = "https://docs.bisq.network/trading-rules.html#arbitration";
String link = "https://bisq.wiki/Dispute_resolution#Level_3:_Arbitration";
return Res.get("support.initialInfo", role, role, link);
}

Expand Down
Expand Up @@ -244,7 +244,7 @@ private void onSaveNewAccount(PaymentAccount paymentAccount) {
new Popup().information(Res.get("payment.f2f.info"))
.width(700)
.closeButtonText(Res.get("payment.f2f.info.openURL"))
.onClose(() -> GUIUtil.openWebPage("https://docs.bisq.network/trading-rules.html#f2f-trading"))
.onClose(() -> GUIUtil.openWebPage("https://bisq.wiki/Face-to-face_(payment_method)"))
.actionButtonText(Res.get("shared.iUnderstand"))
.onAction(() -> doSaveNewAccount(paymentAccount))
.show();
Expand Down
2 changes: 1 addition & 1 deletion docs/README.md
Expand Up @@ -8,4 +8,4 @@
- [dao-setup.md](dao-setup.md): (deprecated) Set up a complete Bisq DAO development environment
- [testing.md](testing.md): Learn about the Bisq testing process and how you can contribute.

Looking for user-facing documentation? See https://docs.bisq.network.
Looking for user-facing documentation? See https://bisq.wiki.
2 changes: 1 addition & 1 deletion docs/testing.md
Expand Up @@ -17,7 +17,7 @@ Here you could also request access to TestPad (https://bisq.ontestpad.com).

## Compensation

Testing activities are eligible for [compensation](https://docs.bisq.network/dao/phase-zero.html#how-to-request-compensation).
Testing activities are eligible for [compensation](https://bisq.wiki/Making_a_compensation_request).
When submitting a compensation request, please include links to artifacts on TestPad (results/reports) indicating the activities that were performed (e.g. tests that were executed), as well as any bugs that were discovered and entered as a result of testing.

## Testing Process
Expand Down

0 comments on commit 81b3c0a

Please sign in to comment.