Skip to content

Commit 70655d1

Browse files
tkrusecubbimew
authored andcommitted
Fix typos and change spellcheck call to not check URLs (#961)
1 parent 03dc7d3 commit 70655d1

File tree

3 files changed

+16
-14
lines changed

3 files changed

+16
-14
lines changed

CppCoreGuidelines.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8453,7 +8453,7 @@ The use of a `static_cast` is not pretty, but
84538453
return d = (d== Day::sun) ? Day::mon : Day{++d}; // error
84548454
}
84558455

8456-
is an infinite recursion, and writing it without a cast, using a `switch` on all cases is longwinded.
8456+
is an infinite recursion, and writing it without a cast, using a `switch` on all cases is long-winded.
84578457

84588458

84598459
##### Enforcement
@@ -19505,10 +19505,10 @@ A textbook for beginners and relative novices.
1950519505
* Bjarne Stroustrup: [The Essence of C++: With Examples in C++84, C++98, C++11, and C++14](http://channel9.msdn.com/Events/GoingNative/2013/Opening-Keynote-Bjarne-Stroustrup). 2013
1950619506
* All the talks from [CppCon '14](https://isocpp.org/blog/2014/11/cppcon-videos-c9)
1950719507
* Bjarne Stroustrup: [The essence of C++](https://www.youtube.com/watch?v=86xWVb4XIyE) at the University of Edinburgh. 2014.
19508-
* Bjarne Stroustrup: [The Evolution of C++ Past, Present and Future](https://www.youtube.com/watch?v=_wzc7a3McOs). Cppcon 2016 keynote.
19509-
* Bjarne Stroustrup: [Make Simple Tasks Simple!](https://www.youtube.com/watch?v=nesCaocNjtQ). Cppcon 2014 keynote.
19510-
* Bjarne Stroustrup: [Writing Good C++14](https://www.youtube.com/watch?v=1OEu9C51K2A). Cppcon 2015 keynote about the Core Guidelines.
19511-
* Herb Sutter: [Writing Good C++14... By Default](https://www.youtube.com/watch?v=hEx5DNLWGgA). Cppcon 2015 keynote about the Core Guidelines.
19508+
* Bjarne Stroustrup: [The Evolution of C++ Past, Present and Future](https://www.youtube.com/watch?v=_wzc7a3McOs). CppCon 2016 keynote.
19509+
* Bjarne Stroustrup: [Make Simple Tasks Simple!](https://www.youtube.com/watch?v=nesCaocNjtQ). CppCon 2014 keynote.
19510+
* Bjarne Stroustrup: [Writing Good C++14](https://www.youtube.com/watch?v=1OEu9C51K2A). CppCon 2015 keynote about the Core Guidelines.
19511+
* Herb Sutter: [Writing Good C++14... By Default](https://www.youtube.com/watch?v=hEx5DNLWGgA). CppCon 2015 keynote about the Core Guidelines.
1951219512
* CppCon 15
1951319513
* ??? C++ Next
1951419514
* ??? Meting C++
@@ -19529,17 +19529,17 @@ A textbook for beginners and relative novices.
1952919529
This section contains materials that has been useful for presenting the core guidelines and the ideas behind them:
1953019530

1953119531
* [Our documents directory](https://github.com/isocpp/CppCoreGuidelines/tree/master/docs)
19532-
* Stroustrup, Sutter, and Dos Reis: [A brief introduction to C++s model for type- and resource-safety](http://www.stroustrup.com/resource-model.pdf). A paper with lots of examples.
19533-
* Segey Subkov: [a Core Guidelines talk](https://www.youtube.com/watch?v=DyLwdl_6vmU)
19532+
* Stroustrup, Sutter, and Dos Reis: [A brief introduction to C++'s model for type- and resource-safety](http://www.stroustrup.com/resource-model.pdf). A paper with lots of examples.
19533+
* Sergey Zubkov: [a Core Guidelines talk](https://www.youtube.com/watch?v=DyLwdl_6vmU)
1953419534
and here are the [slides](http://2017.cppconf.ru/talks/sergey-zubkov). In Russian. 2017.
19535-
* Neil MacIntosh: [The Guideline Support Library: One Year Later](https://www.youtube.com/watch?v=_GhNnCuaEjo). Cppcon 2016.
19536-
* Bjarne Stroustrup: [Writing Good C++14](https://www.youtube.com/watch?v=1OEu9C51K2A). Cppcon 2015 keynote.
19537-
* Herb Sutter: [Writing Good C++14... By Default](https://www.youtube.com/watch?v=hEx5DNLWGgA). Cppcon 2015 keynote.
19535+
* Neil MacIntosh: [The Guideline Support Library: One Year Later](https://www.youtube.com/watch?v=_GhNnCuaEjo). CppCon 2016.
19536+
* Bjarne Stroustrup: [Writing Good C++14](https://www.youtube.com/watch?v=1OEu9C51K2A). CppCon 2015 keynote.
19537+
* Herb Sutter: [Writing Good C++14... By Default](https://www.youtube.com/watch?v=hEx5DNLWGgA). CppCon 2015 keynote.
1953819538
* Peter Sommerlad: [C++ Core Guidelines - Modernize your C++ Code Base](https://www.youtube.com/watch?v=fQ926v4ZzAM). ACCU 2017.
1953919539
* Bjarne Stroustrup: [No Littering!](https://www.youtube.com/watch?v=01zI9kV4h8c). Bay Area ACCU 2016.
19540-
It gives some idea of the ambition level for the Core uidelines.
19540+
It gives some idea of the ambition level for the Core Guidelines.
1954119541

19542-
Note that slides for Cppcon presentations are available (links with the posted videos videos).
19542+
Note that slides for CppCon presentations are available (links with the posted videos videos).
1954319543

1954419544
Contributions to this list would be most welcome.
1954519545

scripts/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,15 @@ check-badchars: $(SOURCEPATH) $(BUILD_DIR) Makefile
8686
.PHONY: hunspell-check
8787
hunspell-check: $(BUILD_DIR)/plain-nohtml.txt
8888
@echo '##################### Spell check ##################'
89-
hunspell -d hunspell/en_US -p hunspell/isocpp.dic -u < build/plain-nohtml.txt > $(BUILD_DIR)/hunspell-report.txt
89+
sed -e 's!http\(s\)\{0,1\}://[^[:space:]]*!!g' build/plain-nohtml.txt | hunspell -d hunspell/en_US -p hunspell/isocpp.dic -u > $(BUILD_DIR)/hunspell-report.txt
9090
@if [ -s $(BUILD_DIR)/hunspell-report.txt ]; then echo 'Warning: Spellcheck failed, fix words or add to dictionary:'; cat $(BUILD_DIR)/hunspell-report.txt; false; fi;
9191

9292
# only list words that are not in dict
9393
# to include all add them to bottom of hunspell/isocpp.dict, and run
9494
# cat hunspell/isocpp.dic | sort | uniq > hunspell/isocpp.dic2; mv hunspell/isocpp.dic2 hunspell/isocpp.dic
9595
.PHONY: hunspell-list
9696
hunspell-list: $(BUILD_DIR)/plain.txt
97-
hunspell -p hunspell/isocpp.dic -l < build/plain-nohtml.txt
97+
sed -e 's!http\(s\)\{0,1\}://[^[:space:]]*!!g' build/plain-nohtml.txt | hunspell -p hunspell/isocpp.dic -l
9898

9999
#### Cpplint
100100

scripts/hunspell/isocpp.dic

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ ABIs
2626
abstr
2727
accessor
2828
ack
29+
ACCU
2930
addressof
3031
adl
3132
ADL
@@ -480,6 +481,7 @@ smartptrget
480481
smartptrparam
481482
smartptrs
482483
SMS
484+
Sommerlad
483485
SomeLargeType
484486
specialization2
485487
spinlock

0 commit comments

Comments
 (0)