Skip to content
This repository has been archived by the owner on Jan 10, 2021. It is now read-only.

Fix typos and cleanup #2

Merged
merged 1 commit into from
Nov 21, 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 CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ All Bisq contributors submit changes via pull requests. The workflow is as follo
- Squash redundant or unnecessary commits
- Submit a pull request from your topic branch back to the `master` branch of the main repository

Pull requests should be focused on a single change. Do not mix, for example, refactorings with a bug fix or implementation of a new feature. This practice makes it easier for fellow contributors to review each pull request on its merits and and to give a clear ACK/NACK (see below).
Pull requests should be focused on a single change. Do not mix, for example, refactorings with a bug fix or implementation of a new feature. This practice makes it easier for fellow contributors to review each pull request on its merits and to give a clear ACK/NACK (see below).


## Reviewing Pull Requests
Expand Down
2 changes: 1 addition & 1 deletion docs/idea-import.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Most Bisq contributors use IDEA for development. The following instructions have
1. Restart IDEA
1. Go to `Import Project`, select the `settings.gradle` file and click `Open`
1. In the `Import Project from Gradle` screen, check the `Use auto-import` option and click `OK`
1. When prompted whether to overwrite the existing `.idea` directory, click `Yes` (This step was not required with 2019.2 but is kept here incase you are running an older version)
1. When prompted whether to overwrite the existing `.idea` directory, click `Yes` (This step was not required with 2019.2 but is kept here in case you are running an older version)
1. In the `Project` tool window, right click on the root-level `.idea` folder, select `Git->Revert...` and click OK in the dialog that appears (to restore source-controlled `.idea` configuration files that get overwritten during project import)
1. If you did not yet setup JDK10 in IntelliJ, Go to `File->Project Structure->Project` and under the `Project SDK` option locate your JAVA_HOME folder, then in `Project language level` beneath select `10 - ...`. (JDK10 is no longer supported but you can still download it from the [archive](https://jdk.java.net/archive/))
1. Select JDK 10 for gradle as well. Go to `Preferences->Build, Execution, Deployment->Build Tools->Gradle` and select the JDK10 location for Gradle JVM
Expand Down
4 changes: 2 additions & 2 deletions docs/release-process.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ Build output expected in deploy directory (opened after successful build process
2. `Bisq-${NEW-VERSION}.jar` Deterministic fat jar
3. `Bisq-${NEW-VERSION}.jar.txt` sha256 sum of deterministic fat jar

The build scripts also copies over the deterministic fat jar into the shared folders for the other VMs (Windows & Linux).
The build script also copies over the deterministic fat jar into the shared folders for the other VMs (Windows & Linux).
Before building the other binaries install the generated Bisq app on macOS and verify that everything works as expected.

#### Linux
Expand Down Expand Up @@ -117,7 +117,7 @@ Build output expected:
1. `F379A1C6.asc` Sig key of Manfred Karrer
2. `5BC5ED73.asc` Sig key of Chris Beams
3. `29CDFD3B.asc`Sig key of Christoph Atteneder
4. `signingkey.asc` Fingerprint of key that was used for this builds
4. `signingkey.asc` Fingerprint of key that was used for these builds
5. `Bisq-${NEW-VERSION}.jar.txt` Sha256 sum of deterministic fat jar
6. `Bisq-${NEW-VERSION}.dmg` macOS installer
7. `Bisq-${NEW-VERSION}.dmg.asc` Signature for macOS installer
Expand Down
4 changes: 2 additions & 2 deletions docs/testing.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,6 @@ When creating issues, it is important to provide sufficient information describi

### Testing Tips

- **Test from a new users perspective.** In addition to looking for obvious errors, be on the look out for any usability or workflow concerns.
- **Test from a new users perspective.** In addition to looking for obvious errors, be on the lookout for any usability or workflow concerns.

- **Reset the "dont show again" flags.** This will allow you to verify the popup messages are valid and appropriate.
- **Reset the "don't show again" flags.** This will allow you to verify the popup messages are valid and appropriate.
2 changes: 1 addition & 1 deletion docs/translation-process.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Being a base language English is managed directly in the project.
Edit `core/src/main/resources/i18n/displayStrings.properties` to add or modify English texts.
Mind the chapters. Fit your entry properly.

Once your changes get merged the Transifex will sync itself with Github.
Once your changes get merged the Transifex will sync itself with GitHub.

However, **do not** edit files for other languages. They are synced from Transifex.

Expand Down
4 changes: 2 additions & 2 deletions monitor/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ The *Settled* release features these metrics:
- P2P Round Trip Time: A metric hitchhiking the Ping/Pong messages of the Keep-Alive-Mechanism to determine the Round Trip Time when issuing a Ping to a seed node.
- P2P Seed Node Message Snapshot: Get absolute number and constellation of messages a fresh Bisq client will get on startup. Also reports diffs between seed nodes on a per-message-type basis.
- P2P Network Load: listens to the P2P network and its broadcast messages. Reports every X seconds.
- P2P Market Statistics: a demonstration metric which extracts market information from broadcast messages. This demo implementation reports the number of open offers per market .
- P2P Market Statistics: a demonstration metric which extracts market information from broadcast messages. This demo implementation reports the number of open offers per market.


The *Settled* release features these reporters:
Expand Down Expand Up @@ -243,4 +243,4 @@ A working connection to Graphite should let you add your data series in a *Graph

### Backup your data

Grafana stores every dashboard as a JSON model. This model can be accessed (copied/restored) within the dashboards settings and its *JSON Model* tab. Do with the data whatever you want.
Grafana stores every dashboard as a JSON model. This model can be accessed (copied/restored) within the dashboard's settings and its *JSON Model* tab. Do with the data whatever you want.