Skip to content

Commit e872a56

Browse files
committed
Merge bitcoin/bitcoin#32644: doc: miscellaneous changes
e50312e doc: fix typos (fanquake) c797e50 ci: update codespell to 2.4.1 (fanquake) 21ee656 doc: Remove obselete link in notificator.cpp (strmfos) ee4406c doc: update URLs (fanquake) Pull request description: A round up of #32629 + some other changes that had previously been PR'd. ACKs for top commit: maflcko: review ACK e50312e 🥗 Tree-SHA512: 8fa3e14fdfa0cf65a42debc9cbb1f8b379aba44aa185e2e27337431e884d169bf1e811655c3a884d918e65ea28c5767ddaabaf25c862ebd9b4b38a0229ec5a93
2 parents 2d819fa + e50312e commit e872a56

31 files changed

+42
-45
lines changed

CONTRIBUTING.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ facilitates social contribution, easy testing and peer review.
8080

8181
To contribute a patch, the workflow is as follows:
8282

83-
1. Fork repository ([only for the first time](https://docs.github.com/en/get-started/quickstart/fork-a-repo))
83+
1. Fork repository ([only for the first time](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/fork-a-repo))
8484
1. Create topic branch
8585
1. Commit patches
8686

@@ -121,7 +121,7 @@ Commit messages should be verbose by default consisting of a short subject line
121121
paragraph(s), unless the title alone is self-explanatory (like "Correct typo
122122
in init.cpp") in which case a single title line is sufficient. Commit messages should be
123123
helpful to people reading your code in the future, so explain the reasoning for
124-
your decisions. Further explanation [here](https://chris.beams.io/posts/git-commit/).
124+
your decisions. Further explanation [here](https://cbea.ms/git-commit/).
125125

126126
If a particular commit references another issue, please add the reference. For
127127
example: `refs #1234` or `fixes #4321`. Using the `fixes` or `closes` keywords
@@ -182,7 +182,7 @@ for more information on helping with translations.
182182
### Work in Progress Changes and Requests for Comments
183183

184184
If a pull request is not to be considered for merging (yet), please
185-
prefix the title with [WIP] or use [Tasks Lists](https://docs.github.com/en/github/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax#task-lists)
185+
prefix the title with [WIP] or use [Tasks Lists](https://docs.github.com/en/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax#task-lists)
186186
in the body of the pull request to indicate tasks are pending.
187187

188188
### Address Feedback
@@ -401,7 +401,7 @@ about:
401401
- It may be because your code is too complex for all but a few people, and those people
402402
may not have realized your pull request even exists. A great way to find people who
403403
are qualified and care about the code you are touching is the
404-
[Git Blame feature](https://docs.github.com/en/github/managing-files-in-a-repository/managing-files-on-github/tracking-changes-in-a-file). Simply
404+
[Git Blame feature](https://docs.github.com/en/repositories/working-with-files/using-files/viewing-and-understanding-files). Simply
405405
look up who last modified the code you are changing and see if you can find
406406
them and give them a nudge. Don't be incessant about the nudging, though.
407407
- Finally, if all else fails, ask on IRC or elsewhere for someone to give your pull request

ci/lint/04_install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ command -v python3
3737
python3 --version
3838

3939
${CI_RETRY_EXE} pip3 install \
40-
codespell==2.2.6 \
40+
codespell==2.4.1 \
4141
lief==0.13.2 \
4242
mypy==1.4.1 \
4343
pyzmq==25.1.0 \

contrib/macdeploy/gen-sdk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def run():
5454
out_sdktgz_path = pathlib.Path("./{}.tar.gz".format(out_name))
5555

5656
def tarfp_add_with_base_change(tarfp, dir_to_add, alt_base_dir):
57-
"""Add all files in dir_to_add to tarfp, but prepent alt_base_dir to the files'
57+
"""Add all files in dir_to_add to tarfp, but prepend alt_base_dir to the files'
5858
names
5959
6060
e.g. if the only file under /root/bazdir is /root/bazdir/qux, invoking:

contrib/signet/getcoins.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ def bitcoin_cli(rpc_command_and_params):
152152
elif res.status_code == 404:
153153
print('The specified faucet URL does not exist. Please check for any server issues/typo.')
154154
elif res.status_code == 429:
155-
print('The script does not allow for repeated transactions as the global faucet is rate-limitied to 1 request/IP/day. You can access the faucet website to get more coins manually')
155+
print('The script does not allow for repeated transactions as the global faucet is rate-limited to 1 request/IP/day. You can access the faucet website to get more coins manually')
156156
else:
157157
print(f'Returned Error Code {res.status_code}\n{res.text}\n')
158158
print('Please check the provided arguments for their validity and/or any possible typo.')

doc/build-windows-msvc.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ The former is assumed hereinafter.
1919

2020
### 2. Git
2121

22-
Download and install [Git for Windows](https://git-scm.com/download/win). Once installed, Git is available from PowerShell or the Command Prompt.
22+
Download and install [Git for Windows](https://git-scm.com/downloads/win). Once installed, Git is available from PowerShell or the Command Prompt.
2323

2424
### 3. Clone Bitcoin Repository
2525

doc/files.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ Subdirectory | File | Description
9898

9999
## GUI settings
100100

101-
`bitcoin-qt` uses [`QSettings`](https://doc.qt.io/qt-5/qsettings.html) class; this implies platform-specific [locations where application settings are stored](https://doc.qt.io/qt-5/qsettings.html#locations-where-application-settings-are-stored).
101+
`bitcoin-qt` uses [`QSettings`](https://doc.qt.io/qt-6/qsettings.html) class; this implies platform-specific [locations where application settings are stored](https://doc.qt.io/qt-6/qsettings.html#locations-where-application-settings-are-stored).
102102

103103
## Legacy subdirectories and files
104104

doc/productivity.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ You can do:
194194
git range-diff master previously-reviewed-head new-head
195195
```
196196

197-
Note that `git range-diff` also work for rebases:
197+
Note that `git range-diff` also works for rebases:
198198

199199
```
200200
P1--P2--P3--P4--P5 <-- previously-reviewed-head

doc/release-notes-27826.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
- Logs now include which peer sent us a header. Additionaly there are fewer
1+
- Logs now include which peer sent us a header. Additionally there are fewer
22
redundant header log messages. A side-effect of this change is that for
33
some untypical cases new headers aren't logged anymore, e.g. a direct
44
`BLOCK` message with a previously unknown header and `submitheader` RPC. (#27826)

doc/tracing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ The two main eBPF front-ends with support for USDT are [bpftrace] and
4545
`bpftrace` is preferred for one-liners and shorter scripts. Examples for both can
4646
be found in [contrib/tracing].
4747

48-
[bpftrace]: https://github.com/iovisor/bpftrace
48+
[bpftrace]: https://github.com/bpftrace/bpftrace
4949
[BPF Compiler Collection (BCC)]: https://github.com/iovisor/bcc
5050
[contrib/tracing]: ../contrib/tracing/
5151

doc/translation_process.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Transifex is setup to monitor the GitHub repo for updates, and when code contain
88

99
Multiple language support is critical in assisting Bitcoin’s global adoption, and growth. One of Bitcoin’s greatest strengths is cross-border money transfers, any help making that easier is greatly appreciated.
1010

11-
See the [Transifex Bitcoin project](https://www.transifex.com/bitcoin/bitcoin/) to assist in translations. You should also join the translation mailing list for announcements - see details below.
11+
See the [Transifex Bitcoin project](https://explore.transifex.com/bitcoin/bitcoin/) to assist in translations. You should also join the translation mailing list for announcements - see details below.
1212

1313
### Writing code with translations
1414
We use automated scripts to help extract translations in both Qt, and non-Qt source files. It is rarely necessary to manually edit the files in `src/qt/locale/`. The translation source files must adhere to the following format:
@@ -39,9 +39,9 @@ git commit
3939
```
4040

4141
### Creating a Transifex account
42-
Visit the [Transifex Signup](https://www.transifex.com/signup/) page to create an account. Take note of your username and password, as they will be required to configure the command-line tool.
42+
Visit the [Transifex Signup](https://app.transifex.com/signup/open-source/) page to create an account. Take note of your username and password, as they will be required to configure the command-line tool.
4343

44-
You can find the Bitcoin translation project at [https://www.transifex.com/bitcoin/bitcoin/](https://www.transifex.com/bitcoin/bitcoin/).
44+
You can find the Bitcoin translation project at [https://www.transifex.com/bitcoin/bitcoin/](https://explore.transifex.com/bitcoin/bitcoin/).
4545

4646
### Installing the Transifex client command-line tool
4747
The client is used to fetch updated translations. Please check installation instructions and any other details at https://developers.transifex.com/docs/cli.

0 commit comments

Comments
 (0)