diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6424f9b26a9d9..646d709a694d4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -9,9 +9,8 @@ describes how to get involved, raise issues and submit patches. ## Getting in touch -Join the [LLVM Discourse forums](https://discourse.llvm.org/), [Discord -chat](https://discord.gg/xS7Z362), or #llvm IRC channel on -[OFTC](https://oftc.net/). +Join the [LLVM Discourse forums](https://discourse.llvm.org/) or [Discord +chat](https://discord.gg/xS7Z362). The LLVM project has adopted a [code of conduct](https://llvm.org/docs/CodeOfConduct.html) for participants to all modes of communication within the project. diff --git a/bolt/Maintainers.txt b/bolt/Maintainers.txt index 39439bb1b3fe0..d3438fc3c52dd 100644 --- a/bolt/Maintainers.txt +++ b/bolt/Maintainers.txt @@ -5,9 +5,8 @@ what goes in or not. The list is sorted by surname and formatted to allow easy grepping and beautification by scripts. The fields are: name (N), email (E), web-address -(W), PGP key ID and fingerprint (P), description (D), snail-mail address -(S) and (I) IRC handle. Each entry should contain at least the (N), (E) and -(D) fields. +(W), PGP key ID and fingerprint (P), and description (D). Each entry should +contain at least the (N), (E) and (D) fields. N: Maksim Panchenko, Rafael Auler E: maks@fb.com, rafaelauler@fb.com diff --git a/clang-tools-extra/Maintainers.txt b/clang-tools-extra/Maintainers.txt index 689f2408820e9..43dfd48ad1f57 100644 --- a/clang-tools-extra/Maintainers.txt +++ b/clang-tools-extra/Maintainers.txt @@ -15,7 +15,7 @@ assistance. Lead Maintainer --------------- | Aaron Ballman -| aaron@aaronballman.com (email), aaron.ballman (Phabricator), AaronBallman (GitHub), AaronBallman (Discourse), aaronballman (Discord), AaronBallman (IRC) +| aaron@aaronballman.com (email), aaron.ballman (Phabricator), AaronBallman (GitHub), AaronBallman (Discourse), aaronballman (Discord) clang-tidy @@ -33,7 +33,7 @@ clang-tidy clang-query ----------- | Aaron Ballman -| aaron@aaronballman.com (email), aaron.ballman (Phabricator), AaronBallman (GitHub), AaronBallman (Discourse), aaronballman (Discord), AaronBallman (IRC) +| aaron@aaronballman.com (email), aaron.ballman (Phabricator), AaronBallman (GitHub), AaronBallman (Discourse), aaronballman (Discord) clang-doc diff --git a/clang/Maintainers.rst b/clang/Maintainers.rst index 8dfa1690ad846..f0704231ee5d9 100644 --- a/clang/Maintainers.rst +++ b/clang/Maintainers.rst @@ -20,7 +20,7 @@ assistance. Lead Maintainer --------------- | Aaron Ballman -| aaron\@aaronballman.com (email), aaron.ballman (Phabricator), AaronBallman (GitHub), AaronBallman (Discourse), aaronballman (Discord), AaronBallman (IRC) +| aaron\@aaronballman.com (email), aaron.ballman (Phabricator), AaronBallman (GitHub), AaronBallman (Discourse), aaronballman (Discord) Contained Components @@ -31,7 +31,7 @@ Clang that are typically contained to one area of the compiler. AST matchers ~~~~~~~~~~~~ | Aaron Ballman -| aaron\@aaronballman.com (email), aaron.ballman (Phabricator), AaronBallman (GitHub), AaronBallman (Discourse), aaronballman (Discord), AaronBallman (IRC) +| aaron\@aaronballman.com (email), aaron.ballman (Phabricator), AaronBallman (GitHub), AaronBallman (Discourse), aaronballman (Discord) AST Visitors @@ -300,7 +300,7 @@ standard, when fixing standards bugs, or when implementing a new standard featur C conformance ~~~~~~~~~~~~~ | Aaron Ballman -| aaron\@aaronballman.com (email), aaron.ballman (Phabricator), AaronBallman (GitHub), AaronBallman (Discourse), aaronballman (Discord), AaronBallman (IRC) +| aaron\@aaronballman.com (email), aaron.ballman (Phabricator), AaronBallman (GitHub), AaronBallman (Discourse), aaronballman (Discord) C++ conformance diff --git a/clang/www/menu.html.incl b/clang/www/menu.html.incl index 9d886c7dae964..ef510b9d23401 100755 --- a/clang/www/menu.html.incl +++ b/clang/www/menu.html.incl @@ -36,7 +36,7 @@ Clang Forum cfe-commits List Bug Reports - IRC: irc.oftc.net#llvm + Discord