Merge #658: Flatten About page

f29ba1a Flatten About page (MarcoFalke)

Pull request description:

  There is a useless dropdown menu to switch between "About us" and "Team". Remove it and combine both sections under "About"

ACKs for commit f29ba1:
  jnewbery:
    ACK f29ba1a
  harding:
    Tested ACK f29ba1a Thanks!

Tree-SHA512: f76129e76fd921f1b981d2a5f935901f4c1fbbf083518fe74f861739060955c39d17903854e342279c8a8d5284e7bdcb36212dac7ed918683e1ccefc84b2477d

Author: harding

_data/navigation.yml

@@ -5,14 +5,7 @@ en:
     url:   "/"
   about:
     title: "About"
-    submenu: true
-    tree:
-      about:
-        title: "About Us"
-        url:   "/en/about/"
-      team:
-        title: "Team"
-        url:   "/en/team/"
+    url:   "/en/about/"
   download:
     title: "Download"
     url: "/en/download"
@@ -82,14 +75,7 @@ zh_CN:
     url:   "/zh_CN/"
   about:
     title: "关于我们"
-    submenu: true
-    tree:
-      about:
-        title: "关于我们"
-        url:   "/zh_CN/about/"
-      team:
-        title: "团队"
-        url:   "/zh_CN/team/"
+    url:   "/zh_CN/about/"
   blog:
     title: "博客"
     url:   "/zh_CN/blog/"
@@ -156,14 +142,7 @@ zh_TW:
     url:   "/zh_TW/"
   about:
     title: "關於我們"
-    submenu: true
-    tree:
-      about:
-        title: "About Us"
-        url:   "/zh_TW/about/"
-      team:
-        title: "Team"
-        url:   "/en/team/"
+    url:   "/en/about/"
   blog:
     title: "網誌"
     url:   "/zh_TW/blog/"
@@ -227,14 +206,7 @@ ja:
     url:   "/ja/"
   about:
     title: "概要"
-    submenu: true
-    tree:
-      about:
-        title: "プロジェクト概要"
-        url:   "/en/about/"
-      team:
-        title: "チーム"
-        url:   "/en/team/"
+    url:   "/en/about/"
   download:
     title: "ダウンロード"
     url: "/ja/download/"

_data/source_navigation.txt

@@ -5,14 +5,7 @@ en:
     url:   "/"
   about:
     title: "About"
-    submenu: true
-    tree:
-      about:
-        title: "About Us"
-        url:   "/en/about/"
-      team:
-        title: "Team"
-        url:   "/en/team/"
+    url:   "/en/about/"
   blog:
     title: "blog"
     url:   "/en/blog/"

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

@@ -5,15 +5,36 @@ permalink: /en/about/
 type: pages
 layout: page
 lang: en
-version: 1
+version: 2
 redirect_from:
   - /zh_TW/about/
+  - /en/team/
 ---
 
+## About us
+
 Bitcoin Core is an [open source](https://opensource.org/) project which maintains and releases Bitcoin client software called "Bitcoin Core".
 
 It is a direct descendant of the original Bitcoin software client released by Satoshi Nakamoto after he published the famous [Bitcoin whitepaper](/bitcoin.pdf).
 
 Bitcoin Core 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/secp256k1) and others located at [GitHub](https://github.com/bitcoin).
 
 Anyone can [contribute to Bitcoin Core](/en/contribute/).
+
+## Team
+
+The Bitcoin Core project has a large open source developer community with many casual contributors to the codebase.
+There are many more who contribute research, peer review, testing, documentation, and translation.
+
+### Maintainers
+      
+Project maintainers have commit access and are responsible for merging patches from contributors. They perform a janitorial role merging patches that the team agrees should be merged. They also act as a final check to ensure that patches are safe and in line with the project goals. The maintainers' role is by agreement of project contributors.  
+
+### Contributors
+
+Everyone is free to propose code changes and to test, review and comment on open Pull Requests.
+Anyone who contributes code, review, test, translation or documentation to the Bitcoin Core project is considered a contributor.
+The release notes for each Bitcoin Core software release contain a credits section to recognize all those who have contributed to the project over the previous release cycle.
+A list of code contributors for the last year can be found on [Github][recent-contributors].
+
+{% include references.md %}

_posts/en/pages/team/2016-03-14-team.md

@@ -5,13 +5,31 @@ permalink: /zh_CN/about/
 type: pages
 layout: page
 lang: zh_CN
-version: 1
+version: 2
 ---
 
+## 关于我们
+
 比特币核心是一个[开源项目]，主要负责维护和发布名为“比特币核心”的比特币客户端软件。
 
 中本聪在发布著名的[白皮书](/bitcoin.pdf)之后又发布了一个比特币软件客户端，而比特币核心正是这个客户端的后继者。
 
 比特币核心包含有全节点验证和比特币钱包。同时该项目还在维护一些相关软件如密码库[libsecp256k1](https://github.com/bitcoin/secp256k1)和其他[GitHub](https://github.com/bitcoin)义务翻译.
 
-所有人都可以[资助比特币核心团队](/zh_CN/contribute/).
+所有人都可以[资助比特币核心团队](/zh_CN/contribute/).
+
+## 团队
+
+核心比特币项目有一个包括许多短期贡献者的大型开源开发者社区。还有更多的人在调查研究、同行评价、测试、文档和翻译方面做出贡献.
+此页面列出了本项目一些更像全职开发的人员，以及拥有一些管理角色的成员.
+
+### 维护人员
+
+项目维护人员有提交权限，并负责合并贡献者开发的补丁。在合并团队认可的补丁的过程中，他们扮演了看门人的角色. 它们还充当最终检查员，以确保补丁是安全的，并且与项目目标一致. 维护人员的角色是由项目贡献者协商决定的.
+  
+### 贡献者
+
+任何对比特币核心项目做出贡献的人员都被认为是一个贡献者。下面的列表是项目当前的一些贡献者。还有其他许多人士做出参与时间较短或不愿被署名。去年的代码贡献者名单可以在 [Github][recent-contributors] 上，以及在每一个比特币核心软件版本的 [historical release notes][1] 中找到.
+  
+{% include references.md %}
+[1]: https://github.com/bitcoin/bitcoin/tree/master/doc/release-notes