doc: Fix some typos

eltociear commented at 1:38 pm on December 24, 2020: contributor

accomodate -> accommodate

jonatack commented at 1:55 pm on December 24, 2020: member

If you’re going to fix typos, can you please fix all of them as seen in the spelling linter script test/lint/lint-spelling.sh, e.g. I believe:

src/core_read.cpp:131: presense ==> presence src/net_processing.h:68: anounce ==> announce src/netaddress.h:486: compatiblity ==> compatibility src/wallet/walletdb.cpp:429: Crypted ==> Encrypted src/test/validation_tests.cpp:78: excercise ==> exercise test/functional/feature_nulldummy.py:63: unnecssary ==> unnecessary

and update test/lint/lint-spelling.ignore-words.txt to ignore all of the current false positives.

DrahtBot added the label Build system on Dec 24, 2020

DrahtBot commented at 2:42 pm on December 27, 2020: member

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Conflicts

Reviewers, this pull request conflicts with the following ones:

#20811 (refactor: move net_processing implementation details out of header by ajtowns)
#20758 (net-processing refactoring – lose globals, move implementation details from .h to .cpp by ajtowns)

If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

michaelfolkson commented at 4:37 pm on December 27, 2020: contributor

Additional typos suggested by @jonatack have now been edited in second commit.

Can you squash the two commits @eltociear?
Are you going to do the second part of @jonatack suggestion @eltociear or do you want someone else to do that in another PR?

update test/lint/lint-spelling.ignore-words.txt to ignore all of the current false positives.

edit: The pull request title should be doc: rather than depends: See https://github.com/bitcoin/bitcoin/blob/master/CONTRIBUTING.md#creating-the-pull-request

practicalswift commented at 10:43 pm on December 27, 2020: contributor

ACK a95f3c364b71e122e773ba40ece7b614c79daa9f modulo addressing the nits suggested above

theStack commented at 2:46 pm on December 28, 2020: member

LGTM, happy to ACK as soon as the commits are squashed. Probably the PR title should also be updated, now that more typos than just the one in qt.mk are fixed.

eltociear renamed this:
~~depends: Fix typo in qt.mk~~
doc: Fix typo in qt.mk
on Dec 31, 2020

eltociear force-pushed on Dec 31, 2020

eltociear renamed this:
~~doc: Fix typo in qt.mk~~
doc: Fix some typos
on Dec 31, 2020

eltociear commented at 5:44 am on December 31, 2020: contributor

Update commit and PR title. @michaelfolkson I would like to ask another person for the second part.

theStack commented at 10:03 am on December 31, 2020: member

Running the spelling linter script, I saw that there is another instance of “crypted” that could be tackled in this PR:

0$ ./test/lint/lint-spelling.sh
1test/functional/wallet_encryption.py:81: crypted ==> encrypted

~~Will open a follow-up PR that updates the false positives list as soon as this is merged.~~ The false positives list is updated in #20817.

michaelfolkson commented at 2:18 pm on December 31, 2020: contributor

False positives are now dealt with in the follow up PR (thanks @theStack). All current and future generations of Atacks are eternally grateful.

Can you then just add the one remaining typo suggestion @eltociear, squash the commits and then this should be ready.

The label of the PR needs to be changed from Build System to Docs by a maintainer.

MarcoFalke removed the label Build system on Dec 31, 2020

MarcoFalke added the label Docs on Dec 31, 2020

practicalswift commented at 3:54 pm on December 31, 2020: contributor

ACK 7ce93c752d19f570952e26649134bcbd2447b3a5

Welcome as a contributor @eltociear :)

jonatack commented at 3:57 pm on December 31, 2020: member

In this commit, can you please fix the remaining error signaled by the linter after #20817:

0test/functional/wallet_encryption.py:81: crypted ==> encrypted

and prefix the commit with doc: rather than refactor:

eltociear force-pushed on Jan 1, 2021

eltociear commented at 6:39 am on January 1, 2021: contributor

@jonatack @michaelfolkson @practicalswift @theStack A Happy New Year🎍

I’d added fix commit and squash commits. Thank you for your continuous support.

practicalswift commented at 9:19 am on January 1, 2021: contributor

re-ACK 62a537652e2ae325980a683fb294ce017f21317f

yahiheb commented at 9:53 am on January 1, 2021: contributor

ACK 62a537652e2ae325980a683fb294ce017f21317f

theStack approved

theStack commented at 11:59 am on January 1, 2021: member

ACK 62a537652e2ae325980a683fb294ce017f21317f 🍾

hebasto commented at 12:15 pm on January 2, 2021: member

Concept ACK.

IIUC, this PR initially was motivated by a change

accomodate -> accommodate

in the depends/packages/qt.mk file.

Currently, the depends/ directory is ignored by the lint-spelling.sh linter.

With the following patch:

0--- a/test/lint/lint-spelling.sh
1+++ b/test/lint/lint-spelling.sh
2@@ -15,6 +15,6 @@ if ! command -v codespell > /dev/null; then
3 fi
4 
5 IGNORE_WORDS_FILE=test/lint/lint-spelling.ignore-words.txt
6-if ! codespell --check-filenames --disable-colors --quiet-level=7 --ignore-words=${IGNORE_WORDS_FILE} $(git ls-files -- ":(exclude)build-aux/m4/" ":(exclude)contrib/seeds/*.txt" ":(exclude)depends/" ":(exclude)doc/release-notes/" ":(exclude)src/leveldb/" ":(exclude)src/crc32c/" ":(exclude)src/qt/locale/" ":(exclude)src/qt/*.qrc" ":(exclude)src/secp256k1/" ":(exclude)src/univalue/"); then
7+if ! codespell --check-filenames --disable-colors --quiet-level=7 --ignore-words=${IGNORE_WORDS_FILE} $(git ls-files -- ":(exclude)build-aux/m4/" ":(exclude)contrib/seeds/*.txt" ":(exclude)depends/config.guess" ":(exclude)depends/config.sub" ":(exclude)doc/release-notes/" ":(exclude)src/leveldb/" ":(exclude)src/crc32c/" ":(exclude)src/qt/locale/" ":(exclude)src/qt/*.qrc" ":(exclude)src/secp256k1/" ":(exclude)src/univalue/"); then
8     echo "^ Warning: codespell identified likely spelling errors. Any false positives? Add them to the list of ignored words in ${IGNORE_WORDS_FILE}"
9 fi

more typos have been revealed:

0depends/packages/qt.mk:220: accomodate ==> accommodate
1depends/patches/fontconfig/gperf_header_regen.patch:5: inadvertant ==> inadvertent
2depends/patches/native_cctools/ld64_disable_threading.patch:11: noticable ==> noticeable
3depends/patches/qt/freetype_back_compat.patch:12: compatibile ==> compatible
4depends/patches/qt/no-xlib.patch:56: glpyh ==> glyph

michaelfolkson commented at 5:53 pm on January 2, 2021: contributor

Happy New Year @eltociear! Let us know if you’re happy to add these additional @hebasto typos or if you’d prefer someone to do these in a follow up PR.

hebasto commented at 6:36 pm on January 2, 2021: member

Another suggestion is to combine one more typo: s/Keypair/Key pair/ in https://github.com/bitcoin/bitcoin/blob/ae8f79713543d3db24a886cc27340b1570c2657d/src/bench/verify_script.cpp#L27

doc: fix some typos e251f7d1fb

eltociear force-pushed on Jan 3, 2021

eltociear commented at 1:20 pm on January 3, 2021: contributor

@michaelfolkson @hebasto Thank you! Added 5 typo fix.

in depends/patches/qt/no-xlib.patch:56 in e251f7d1fb

52@@ -53,7 +53,7 @@ index 7c62c2e2b3..c05c6c0a07 100644
53      cursor = createNonStandardCursor(cshape);
54  
55 +#if QT_CONFIG(xcb_xlib) && QT_CONFIG(library)
56-     // Create a glpyh cursor if everything else failed
57+     // Create a glyph cursor if everything else failed

fanquake commented at 1:30 pm on January 3, 2021:

You can’t modify the actual contents of a patch like this, because it will no longer apply. See all the CIs that are now failing:

0patching file qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp
1Hunk [#5](/bitcoin-bitcoin/5/) FAILED at 595.
21 out of 6 hunks FAILED -- saving rejects to file qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp.rej
3funcs.mk:267: recipe for target '/tmp/cirrus-ci-build/depends/work/build/x86_64-w64-mingw32/qt/5.9.8-ed5ca6e91a4/.stamp_preprocessed' failed
4make: *** [/tmp/cirrus-ci-build/depends/work/build/x86_64-w64-mingw32/qt/5.9.8-ed5ca6e91a4/.stamp_preprocessed] Error 1
5make: Leaving directory '/tmp/cirrus-ci-build/depends'

fanquake referenced this in commit f52f427b8e on Jan 4, 2021

fanquake commented at 5:59 am on January 4, 2021: member

Thanks for your contribution. However to move things along I’m going to fix this up and consolidate it with some other changes. Your commit will still be attributed to you.

fanquake closed this on Jan 4, 2021

MarcoFalke referenced this in commit 34322b7f5c on Jan 5, 2021

fanquake locked this on Feb 22, 2021

doc: Fix some typos #20762

Conflicts