Skip to content

Commit 1ff207d

Browse files
committed
Merge #1135: impersonation: switch Twitter for X
a467479 impersonation: switch Twitter for X (fanquake) be032ca lifestyle: update Transifex link (fanquake) 2a8e616 doc: remove references to Travis (fanquake) Pull request description: Also remove references to Travis. Update link in lifestyle. ACKs for top commit: glozow: lgtm ACK a467479 Tree-SHA512: 2b69b52fcafdcb4c135693eafeadcca710d803b41c38f902dbdf3b2dc82701dfbd23ea51cf8ff01ff899941dbee5b37ff13be7302b4a7c639423a319daa35f49
2 parents 29dda0a + a467479 commit 1ff207d

File tree

9 files changed

+19
-19
lines changed

9 files changed

+19
-19
lines changed

_config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ exclude:
3333
- README.md
3434
- CONTRIBUTING.md
3535
- CNAME
36-
- vendor # Travis CI creates a vendor/ dir with files we shouldn't render
36+
- vendor # CI creates a vendor/ dir with files we shouldn't render
3737
- contrib
3838
- Makefile
3939

_data/navigation.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ en:
4545
title: "Announcements"
4646
url: "/en/list/announcements/join/"
4747
twitter_impersonation:
48-
title: "Twitter impersonation"
48+
title: "X impersonation"
4949
url: "/en/twitter-impersonation"
5050
zh_CN:
5151
home:
@@ -228,5 +228,5 @@ es:
228228
title: "Announcements" # XXX
229229
url: "/en/list/announcements/join/" # XXX
230230
twitter_impersonation:
231-
title: "Twitter impersonation" # XXX
231+
title: "X impersonation" # XXX
232232
url: "/en/twitter-impersonation" # XXX

_includes/footer.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div>
22
<span>
3-
<a href="https://twitter.com/bitcoincoreorg" target="_blank" class=""><i class="fa fa-fw fa-twitter"></i>Twitter</a><br />
3+
<a href="https://x.com/bitcoincoreorg" target="_blank" class="">X</a><br />
44
<a href="/en/legal/">Legal</a> | <a href="/en/legal/privacy">Privacy Policy</a> | <a href="/{{ page.lang }}/rss/">RSS <img src="/assets/images/rss-24x24.png" alt="rss feeds" width="14" height="14"></a>
55
</span>
66
</div>

_includes/references.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
[BIP173]: https://github.com/bitcoin/bips/blob/master/bip-0173.mediawiki
117117
[BIP174]: https://github.com/bitcoin/bips/blob/master/bip-0174.mediawiki
118118

119-
[@bitcoincoreorg]: https://twitter.com/bitcoincoreorg
119+
[@bitcoincoreorg]: https://x.com/bitcoincoreorg
120120
[#bitcoin-core-dev]: https://web.libera.chat/#bitcoin-core-dev
121121
[#bitcoin-core-builds]: https://web.libera.chat/#bitcoin-core-builds
122122
[#bitcoin-core-gui]: https://web.libera.chat/#bitcoin-core-gui

_posts/en/pages/2016-01-15-lifecycle.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,4 +81,4 @@ Parts of Bitcoin, most notably the consensus rules, don't work that way. In ord
8181
For this reason, Bitcoin Core deviates from SemVer for changes to consensus rules and other updates where network-wide adoption is necessary or desirable. Bitcoin Core releases these changes as maintenance releases (`x.y`) instead of as major releases (`x.0`); this minimizes the size of the patch in order to make it easy for as many people as possible to inspect it, test it, and deploy it. It also makes it possible to backport the same patch to multiple previous major releases, further increasing the number of users who can easily upgrade, although there are not always enough volunteers to manage this.
8282

8383
[SemVer]: https://semver.org/
84-
[bitcoin-transifex-link]: https://www.transifex.com/bitcoin/bitcoin/
84+
[bitcoin-transifex-link]: https://explore.transifex.com/bitcoin/bitcoin/

_posts/en/pages/2016-03-12-contact.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ version: 2
1616
<hr>
1717
</center>
1818

19-
<i class="fa fa-fw fa-twitter"></i> <span style="color:black">Twitter: <a href="https://twitter.com/bitcoincoreorg/">@bitcoincoreorg</a></span>
19+
<span style="color:black">X: <a href="https://x.com/bitcoincoreorg/">@bitcoincoreorg</a></span>
2020

2121
You can report bugs in our software using the <i class="fa fa-fw fa-github"></i> [issue tracker][issues].
2222

_posts/en/pages/2017-01-01-twitter-impersonation.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
---
2-
title: Twitter Impersonation
2+
title: X Impersonation
33
name: twitter-impersonation
44
permalink: /en/twitter-impersonation/
55
type: pages
66
layout: page
77
lang: en
88
version: 1
99
---
10-
We are aware of several accounts on Twitter that violate [Twitter's
10+
We are aware of several accounts on X (previously Twitter) that violate [X's
1111
Impersonation Policy][] by pretending to be the Bitcoin Core project or
1212
well-known individuals associated with Bitcoin Core. These accounts
1313
have been spreading false and misleading information about Bitcoin Core
1414
and its contributors.
1515

16-
If you see one of these accounts, you may [report it to Twitter][]. If
17-
you are reporting an issue about the Bitcoin Core project and Twitter
16+
If you see one of these accounts, you may [report it to X][]. If
17+
you are reporting an issue about the Bitcoin Core project and X
1818
asks that you enter the project's official email address, please use:
1919
contact<span style="display:none"></span>@bitcoincore.org
2020

21-
This appears to be an unfortunately common issue on Twitter that affects
21+
This appears to be an unfortunately common issue on X that affects
2222
many other projects and individuals as well, so we urge you to carefully
23-
evaluate any posts you see on Twitter---and elsewhere---to determine
23+
evaluate any posts you see on X---and elsewhere---to determine
2424
whether or not they truly came from the indicated sender.
2525

2626
It is especially important to be careful about posts that recommend you
@@ -38,17 +38,17 @@ and aren't sure whether or not it is legitimate, you can safely shutdown
3838
your Bitcoin Core program to eliminate any immediate problems and give
3939
yourself time to investigate.
4040

41-
Although Bitcoin Core does have an official Twitter account,
41+
Although Bitcoin Core does have an official X account,
4242
[@bitcoincoreorg][], any important announcements about the project will
4343
also sent to our low-traffic [announcements mailing list][] or posted on
4444
the [front page of this website][] (which also has an [RSS feed][]). If
4545
you know how to use PGP security software, subscribing to the mailing
4646
list is particularly recommended as all announcements will be
4747
cryptographically signed by a developer.
4848

49-
[Twitter's Impersonation Policy]: https://support.twitter.com/articles/18366#
50-
[report it to Twitter]: https://support.twitter.com/forms/impersonation
51-
[@bitcoincoreorg]: https://twitter.com/bitcoincoreorg
49+
[X's Impersonation Policy]: https://help.x.com/en/rules-and-policies/authenticity
50+
[report it to X]: https://help.x.com/en/forms/authenticity/impersonation
51+
[@bitcoincoreorg]: https://x.com/bitcoincoreorg
5252
[announcements mailing list]: /en/list/announcements/join/
5353
[front page of this website]: /
5454
[RSS feed]: /en/rss.xml

_posts/ja/pages/2016-03-12-contact.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ version: 2
1313

1414
ソフトウェアのバグを報告する際は、<i class="fa fa-fw fa-github"></i> [issue tracker][issues] を使用してください。
1515

16-
<i class="fa fa-fw fa-twitter"></i> Twitter: <a href="https://twitter.com/bitcoincoreorg/">@bitcoincoreorg</a>
16+
X: <a href="https://x.com/bitcoincoreorg/">@bitcoincoreorg</a>
1717

1818
Bitcoin Coreの開発者は [IRC][#bitcoin-core-dev]にいます。
1919

contrib/qa/test-binary-availability.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
# Local builds and Travis CI builds of the BitcoinCore.org website do
3+
# Local builds and CI builds of the BitcoinCore.org website do
44
# not include the /bin directory holding Bitcoin Core binaries, so this
55
# test extracts the local URLs from the download page and checks that
66
# they exist on the remote server. Only the file's HTTP headers are

0 commit comments

Comments
 (0)