Skip to content

Commit 780d623

Browse files
committed
Merge #1024: Revert "Remove bitcoin.pdf"
2f67650 Revert "Remove bitcoin.pdf" (laanwj) Pull request description: This reverts commit c131308 (#740). ACKs for top commit: katesalazar: ACK 2f67650 kanzure: ACK 2f67650 achow101: ACK 2f67650 Tree-SHA512: 11c85243fdae9644883ab2e19cb932a347bafe0813e13ac4fba319040850733c4ddc03fd85a337b51e1874fad996d56786d35ba236daede6dd14a11f4b915043
2 parents 6825a89 + 2f67650 commit 780d623

File tree

9 files changed

+10
-8
lines changed

9 files changed

+10
-8
lines changed

_posts/en/pages/2016-01-01-about.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ redirect_from:
1515

1616
Bitcoin Core is an [open source](https://opensource.org/) project which maintains and releases Bitcoin client software called "Bitcoin Core".
1717

18-
It is a direct descendant of the original Bitcoin software client released by Satoshi Nakamoto after he published the famous Bitcoin whitepaper.
18+
It is a direct descendant of the original Bitcoin software client released by Satoshi Nakamoto after he published the famous [Bitcoin whitepaper](/bitcoin.pdf).
1919

2020
[Bitcoin Core](https://github.com/bitcoin/bitcoin) consists of both "full-node" software for fully validating the blockchain as well as a bitcoin wallet. The project also currently maintains related software such as the cryptography library [libsecp256k1](https://github.com/bitcoin-core/secp256k1) and others located at [GitHub](https://github.com/bitcoin-core).
2121

_posts/en/posts/2016-01-28-clarification.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ permalink: /en/2016/01/28/clarification/
99
version: 2
1010
excerpt: Where to find official information about Bitcoin Core and how you can interact with other Bitcoin Core users and developers.
1111
---
12-
Initially, bitcoin.org was used to host the original Bitcoin paper and became the homepage for the [Bitcoin program](https://bitcoin.org/en/download). The site evolved into a general educational resource for Bitcoin, and is [not affiliated](https://bitcoin.org/en/bitcoin-core/about-site) with the modern Bitcoin Core project. The Bitcoin Core project's official website is bitcoincore.org and while other websites continue to host information about Bitcoin Core, their views do not represent Bitcoin Core. We know that the Bitcoin ecosystem can be confusing, and we are working hard to make these relationships more clear.
12+
Initially, bitcoin.org was used to host the [original Bitcoin paper](https://bitcoin.org/bitcoin.pdf) and became the homepage for the [Bitcoin program](https://bitcoin.org/en/download). The site evolved into a general educational resource for Bitcoin, and is [not affiliated](https://bitcoin.org/en/bitcoin-core/about-site) with the modern Bitcoin Core project. The Bitcoin Core project's official website is bitcoincore.org and while other websites continue to host information about Bitcoin Core, their views do not represent Bitcoin Core. We know that the Bitcoin ecosystem can be confusing, and we are working hard to make these relationships more clear.
1313

1414
For development work, Bitcoin Core mainly uses the `#bitcoin-core-dev` IRC channel on irc.libera.chat, [Github](https://github.com/bitcoin/bitcoin), and [the bitcoin-dev mailing list](http://lists.linuxfoundation.org/pipermail/bitcoin-dev/).
1515

_posts/en/posts/2016-10-27-release-0.13.1.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ Although 80 bits is very strong security, it is within the realm of possibility
9090

9191
### 7. More efficient almost-full-node security {#more-efficient-security}
9292

93-
Satoshi Nakamoto’s original Bitcoin paper describes a method for allowing newly-started full nodes to skip downloading and validating some data from historic blocks that are protected by large amounts of proof of work. Unfortunately, Nakamoto’s method can’t guarantee that a newly-started node using this method will produce an accurate copy of Bitcoin’s current ledger (called the UTXO set), making the node vulnerable to falling out of consensus with other nodes.
93+
Satoshi Nakamoto’s [original Bitcoin paper][] describes a method for allowing newly-started full nodes to skip downloading and validating some data from historic blocks that are protected by large amounts of proof of work. Unfortunately, Nakamoto’s method can’t guarantee that a newly-started node using this method will produce an accurate copy of Bitcoin’s current ledger (called the UTXO set), making the node vulnerable to falling out of consensus with other nodes.
9494

9595
Although the problems with Nakamoto’s method can’t be fixed in a soft fork, segwit accomplishes something similar to his original proposal: it makes it possible for a node to optionally skip downloading some blockchain data (specifically, the segregated witnesses) while still ensuring that the node can build an accurate copy of the UTXO set for the block chain with the most proof of work. Segwit enables this capability at the consensus layer, but note that Bitcoin Core does not provide an option to use this capability as of this 0.13.1 release.
9696

@@ -172,6 +172,7 @@ c1726ccc50635795c942c7d7e51d979c4f83a3d17f8982e9d02a114a15fef419 bitcoin-0.13.1
172172
[Script versioning]: #script-versioning
173173
[detailed segwit benefits]: #detailed-segwit-benefits
174174
[segwit benefits faq]: /en/2016/01/26/segwit-benefits/
175+
[original bitcoin paper]: https://bitcoin.org/bitcoin.pdf
175176
[elements project sidechain]: https://elementsproject.org/
176177
[met in switzerland]: https://bitcoincore.org/en/meetings/2016/05/20/
177178
[download page]: /en/download

_posts/ja/pages/2016-01-01-about.md

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

1414
Bitcoin Coreは、「Bitcoin Core」と呼ばれるBitcoinクライアントソフトウェアを保守およびリリースする[オープンソース](https://opensource.org/)プロジェクトです。
1515

16-
Bitcoin Coreは有名なBitcoin ホワイトペーパーが発表された後、Satoshi NakamotoがリリースしたオリジナルのBitcoinソフトウェアクライアントの子孫です。
16+
Bitcoin Coreは有名な[Bitcoin ホワイトペーパー](/bitcoin.pdf)が発表された後、Satoshi NakamotoがリリースしたオリジナルのBitcoinソフトウェアクライアントの子孫です。
1717

1818
[Bitcoin Core](https://github.com/bitcoin/bitcoin)はブロックチェーンを完全に検証する「フルノード」ソフトウェアとBitcoinウォレットの両方で構成されています。このプロジェクトでは現在、暗号ライブラリ[libsecp256k1](https://github.com/bitcoin/secp256k1)や他の[GitHub](https://github.com/bitcoin-core)に配置している関連ライブラリをメンテナンスしています。
1919

_posts/zh_CN/pages/2016-01-01-about.md

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

1313
比特币核心是一个[开源项目],主要负责维护和发布名为“比特币核心”的比特币客户端软件。
1414

15-
中本聪在发布著名的白皮书之后又发布了一个比特币软件客户端,而比特币核心正是这个客户端的后继者。
15+
中本聪在发布著名的[白皮书](/bitcoin.pdf)之后又发布了一个比特币软件客户端,而比特币核心正是这个客户端的后继者。
1616

1717
比特币核心包含有全节点验证和比特币钱包。同时该项目还在维护一些相关软件如密码库[libsecp256k1](https://github.com/bitcoin/secp256k1)和其他[GitHub](https://github.com/bitcoin)义务翻译.
1818

_posts/zh_CN/posts/2016-01-28-clarification.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ permalink: /zh_CN/2016/01/28/clarification/
99
version: 1
1010
excerpt: 在哪里可以找到关于比特币核心的官方信息,以及如何与其他比特币核心用户和开发者进行互动?
1111
---
12-
最初,bitcoin.org是用作放置比特币白皮书,并成为[比特币主程序](https://bitcoin.org/en/download)的主页。后来,该网站提供了比特币教学资料,但这与现在的Bitcoin Core计划[并无关系](https://bitcoin.org/en/bitcoin-core/about-site)。 Bitcoin Core的正式网站是bitcoincore.org,而虽然其它网站仍会提供有关Bitcoin Core的资讯,他们的观点并不代表Bitcoin Core。我们明白这可能令人感到混淆,因此我们正在努力地清楚说明这些关系。
12+
最初,bitcoin.org是用作放置[比特币白皮书](https://bitcoin.org/bitcoin.pdf),并成为[比特币主程序](https://bitcoin.org/en/download)的主页。后来,该网站提供了比特币教学资料,但这与现在的Bitcoin Core计划[并无关系](https://bitcoin.org/en/bitcoin-core/about-site)。 Bitcoin Core的正式网站是bitcoincore.org,而虽然其它网站仍会提供有关Bitcoin Core的资讯,他们的观点并不代表Bitcoin Core。我们明白这可能令人感到混淆,因此我们正在努力地清楚说明这些关系。
1313

1414
在开发方面,Bitcoin Core主要使用Freenode IRC上的#bitcoin-core-dev,[Github](https://github.com/bitcoin/bitcoin),以及[bitcoin-dev 电邮列表](http://lists.linuxfoundation.org/pipermail/bitcoin-dev/)
1515

_posts/zh_CN/posts/2016-10-27-release-0.13.1.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ Segwit时间轴:
115115

116116
### 7. 更加有效的“类全节点”安全性 {#more-efficient-security}
117117

118-
Satoshi Nakamoto的原始比特币文件描述了一种允许新启动的全节点跳过下载和验证来自受大量工作证明保护的历史块的一些数据的方法
118+
Satoshi Nakamoto的[原始比特币文件][original Bitcoin paper]描述了一种允许新启动的全节点跳过下载和验证来自受大量工作证明保护的历史块的一些数据的方法
119119
不幸的是,Nakamoto的方法不能保证使用这种方法新启动的节点将会生成比特币当前分类帐(称为UTXO集合)的精准副本,使得节点容易与其他节点不一致。
120120

121121
虽然Nakamoto方法的问题不能在软分叉中解决,segwit实现了一个类似他原来建议的方法:节点在选择性地跳过下载一些区块链数据(特别是隔离的见证)
@@ -220,6 +220,7 @@ c1726ccc50635795c942c7d7e51d979c4f83a3d17f8982e9d02a114a15fef419 bitcoin-0.13.1
220220
[Script versioning]: #script-versioning
221221
[detailed segwit benefits]: #detailed-segwit-benefits
222222
[segwit benefits faq]: /en/2016/01/26/segwit-benefits/
223+
[original bitcoin paper]: https://bitcoin.org/bitcoin.pdf
223224
[elements project sidechain]: https://elementsproject.org/
224225
[met in switzerland]: https://bitcoincore.org/en/meetings/2016/05/20/
225226
[download page]: /en/download

_posts/zh_TW/posts/2016-01-28-clarification.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ type: posts
77
lang: zh_TW
88
permalink: /zh_TW/2016/01/28/clarification/
99
---
10-
最初,bitcoin.org是用作放置比特幣白皮書,並成為[比特幣軟件](https://bitcoin.org/en/download)的主頁。後來,這網站提供了比特幣教育資訊,但這與現時的Bitcoin Core計劃[並無關係](https://bitcoin.org/en/bitcoin-core/about-site)。Bitcoin Core的正式網站是bitcoincore.org,而雖然其它網站仍會提供有關Bitcoin Core的資訊,他們的觀點並不代表Bitcoin Core。我們明白這可能令人感到混淆,因此我們正在努力地清楚說明這些關係。
10+
最初,bitcoin.org是用作放置[比特幣白皮書](https://bitcoin.org/bitcoin.pdf),並成為[比特幣軟件](https://bitcoin.org/en/download)的主頁。後來,這網站提供了比特幣教育資訊,但這與現時的Bitcoin Core計劃[並無關係](https://bitcoin.org/en/bitcoin-core/about-site)。Bitcoin Core的正式網站是bitcoincore.org,而雖然其它網站仍會提供有關Bitcoin Core的資訊,他們的觀點並不代表Bitcoin Core。我們明白這可能令人感到混淆,因此我們正在努力地清楚說明這些關係。
1111

1212
在開發方面,Bitcoin Core主要使用Freenode IRC上的#bitcoin-core-dev,[Github](https://github.com/bitcoin/bitcoin),以及[bitcoin-dev 電郵列表](http://lists.linuxfoundation.org/pipermail/bitcoin-dev/)
1313

bitcoin.pdf

180 KB
Binary file not shown.

0 commit comments

Comments
 (0)