change the category

nebulasio · Oct 17, 2018 · a518c24 · a518c24
1 parent 771a5cf
commit a518c24
Show file tree

Hide file tree

Showing 53 changed files with 143 additions and 29 deletions.
diff --git a/docs/community-ecosystem/README.rst b/docs/community-ecosystem/README.rst
@@ -0,0 +1,10 @@
+Community & Ecosystem
+=====================
+
+.. toctree::
+    :titlesonly:
+
+
+    nas-nano.md
+    ecosystem-dapps-list.md
+    events.md
diff --git a/docs/community-ecosystem/ecosystem-dapps-list.md b/docs/community-ecosystem/ecosystem-dapps-list.md
@@ -0,0 +1,7 @@
+# Ecosystem DApps List
+
+You can find recommend DApps and monthly/weekly champions in the Nebulas Incentive Program Season 1 here: [Summary](https://incentive.nebulas.io/summary.html)
+
+Wecome to recommend more DApps!
+
+[Nebulas DApps Store](https://www.nebulasdapps.com/) from the community.
diff --git a/docs/community-ecosystem/events.md b/docs/community-ecosystem/events.md
@@ -0,0 +1,9 @@
+# Events
+
+Since June 2017, the Nebulas meetups and hackathon have been hold in 17 cities, 8 countries around the world. We have visited University of California, Berkeley, New York University, Columbia University, Harvard University, Singapore University of Social Sciences, Tsinghua University, Tongji University and many other universities.
+
+[Events History >](https://medium.com/nebulasio/nebulas-events-7a8674690d77)
+
+Welcome to organize local meetups and write the history of Nebulas!
+
+![Nebulas Community](https://nebulas.io/assets/images/community/events.jpg)
diff --git a/docs/community-ecosystem/nas-nano.md b/docs/community-ecosystem/nas-nano.md
@@ -0,0 +1,5 @@
+# NAS nano
+
+NAS nano is the official wallet. Please download it [here](https://nano.nebulas.io/index_en.html)
+
+Help documents for NAS nano is coming soon.
diff --git a/docs/dapp-development/README.rst b/docs/dapp-development/README.rst
@@ -8,5 +8,8 @@ DApp Development
     testnet.md
     smart_contract.md
     nrc20.md
+    tools.md
+    dapps-design-guide.md
+    learning-resources.md
     rpc/README.md
     console.md
diff --git a/docs/frequently-asked-questions.md b/docs/frequently-asked-questions.md
@@ -0,0 +1,5 @@
+# Frequently Asked Questions
+
+TBA
+
+Please visit [here](https://nebulas.io/faq.html) and you can also get more information on [Reddit](https://reddit.com/r/nebulas)
diff --git a/docs/go-nebulas/README.rst b/docs/go-nebulas/README.rst
@@ -4,9 +4,12 @@ Go-Nebulas
 .. toctree::
     :titlesonly:
 
+    What's Nebulas <whats-nebulas/README.md>
+    Papers <papers/README.rst>
     Design Overview <overview/README.md>
     How to Develop <develop/README.md>
     Tutorials <tutorials/README.md>
     Todo List <todo/README.md>
     Roadmap of Nebulas <roadmap.md>
-    Frequently Asked Questions <faq.md>
+    Frequently Asked Questions <faq.md>
+    Infrastructure <infrastructure/README.rst>
diff --git a/docs/go-nebulas/overview/README.md → docs/go-nebulas/design-overview/README.md b/docs/go-nebulas/overview/README.md → docs/go-nebulas/design-overview/README.md
diff --git a/docs/go-nebulas/overview/README.rst → docs/go-nebulas/design-overview/README.rst b/docs/go-nebulas/overview/README.rst → docs/go-nebulas/design-overview/README.rst
diff --git a/docs/go-nebulas/overview/address.md → docs/go-nebulas/design-overview/address.md b/docs/go-nebulas/overview/address.md → docs/go-nebulas/design-overview/address.md
diff --git a/docs/go-nebulas/overview/blockchain.md → .../go-nebulas/design-overview/blockchain.md b/docs/go-nebulas/overview/blockchain.md → .../go-nebulas/design-overview/blockchain.md
diff --git a/docs/go-nebulas/overview/consensus.md → docs/go-nebulas/design-overview/consensus.md b/docs/go-nebulas/overview/consensus.md → docs/go-nebulas/design-overview/consensus.md
diff --git a/docs/go-nebulas/overview/event.md → docs/go-nebulas/design-overview/event.md b/docs/go-nebulas/overview/event.md → docs/go-nebulas/design-overview/event.md
diff --git a/docs/go-nebulas/overview/gas.md → docs/go-nebulas/design-overview/gas.md b/docs/go-nebulas/overview/gas.md → docs/go-nebulas/design-overview/gas.md
diff --git a/docs/go-nebulas/overview/log.md → docs/go-nebulas/design-overview/log.md b/docs/go-nebulas/overview/log.md → docs/go-nebulas/design-overview/log.md
diff --git a/docs/go-nebulas/overview/merkle_trie.md → ...go-nebulas/design-overview/merkle_trie.md b/docs/go-nebulas/overview/merkle_trie.md → ...go-nebulas/design-overview/merkle_trie.md
diff --git a/...o-nebulas/overview/transaction_process.md → ...as/design-overview/transaction_process.md b/...o-nebulas/overview/transaction_process.md → ...as/design-overview/transaction_process.md
diff --git a/docs/infrastructure/README.rst → docs/go-nebulas/infrastructure/README.rst b/docs/infrastructure/README.rst → docs/go-nebulas/infrastructure/README.rst
diff --git a/docs/infrastructure/crypto/README.md → ...o-nebulas/infrastructure/crypto/README.md b/docs/infrastructure/crypto/README.md → ...o-nebulas/infrastructure/crypto/README.md
diff --git a/docs/infrastructure/crypto/README.rst → ...-nebulas/infrastructure/crypto/README.rst b/docs/infrastructure/crypto/README.rst → ...-nebulas/infrastructure/crypto/README.rst
diff --git a/docs/infrastructure/crypto/nvm.md → docs/go-nebulas/infrastructure/crypto/nvm.md b/docs/infrastructure/crypto/nvm.md → docs/go-nebulas/infrastructure/crypto/nvm.md
diff --git a/docs/infrastructure/llvm_engine.md → .../go-nebulas/infrastructure/llvm_engine.md b/docs/infrastructure/llvm_engine.md → .../go-nebulas/infrastructure/llvm_engine.md
diff --git a/docs/infrastructure/nebulas_v8.md → docs/go-nebulas/infrastructure/nebulas_v8.md b/docs/infrastructure/nebulas_v8.md → docs/go-nebulas/infrastructure/nebulas_v8.md
diff --git a/docs/infrastructure/network_protocol.md → ...ebulas/infrastructure/network_protocol.md b/docs/infrastructure/network_protocol.md → ...ebulas/infrastructure/network_protocol.md
diff --git a/...e/permission_control_in_smart_contract.md → ...e/permission_control_in_smart_contract.md b/...e/permission_control_in_smart_contract.md → ...e/permission_control_in_smart_contract.md
diff --git a/docs/go-nebulas/tutorials/README.md → docs/go-nebulas/mainnet-tutorials/README.md b/docs/go-nebulas/tutorials/README.md → docs/go-nebulas/mainnet-tutorials/README.md
diff --git a/docs/go-nebulas/tutorials/README.rst → docs/go-nebulas/mainnet-tutorials/README.rst b/docs/go-nebulas/tutorials/README.rst → docs/go-nebulas/mainnet-tutorials/README.rst
diff --git a/...ls/english-nebulas-101-01-installation.md → ...ls/english-nebulas-101-01-installation.md b/...ls/english-nebulas-101-01-installation.md → ...ls/english-nebulas-101-01-installation.md
diff --git a/...als/english-nebulas-101-02-transaction.md → ...als/english-nebulas-101-02-transaction.md b/...als/english-nebulas-101-02-transaction.md → ...als/english-nebulas-101-02-transaction.md
diff --git a/...ulas-101-03-smart-contracts-javascript.md → ...ulas-101-03-smart-contracts-javascript.md b/...ulas-101-03-smart-contracts-javascript.md → ...ulas-101-03-smart-contracts-javascript.md
diff --git a/...-nebulas-101-04-smart-contract-storage.md → ...-nebulas-101-04-smart-contract-storage.md b/...-nebulas-101-04-smart-contract-storage.md → ...-nebulas-101-04-smart-contract-storage.md
diff --git a/...05-interacting-with-nebulas-by-rpc-api.md → ...05-interacting-with-nebulas-by-rpc-api.md b/...05-interacting-with-nebulas-by-rpc-api.md → ...05-interacting-with-nebulas-by-rpc-api.md
diff --git a/...g-wen-nebulas-101-01-bian-yi-an-zhuang.md → ...g-wen-nebulas-101-01-bian-yi-an-zhuang.md b/...g-wen-nebulas-101-01-bian-yi-an-zhuang.md → ...g-wen-nebulas-101-01-bian-yi-an-zhuang.md
diff --git a/...ong-wen-nebulas-101-02-fa-song-jiao-yi.md → ...ong-wen-nebulas-101-02-fa-song-jiao-yi.md b/...ong-wen-nebulas-101-02-fa-song-jiao-yi.md → ...ong-wen-nebulas-101-02-fa-song-jiao-yi.md
diff --git a/...ebulas-101-03-bian-xie-zhi-neng-he-yue.md → ...ebulas-101-03-bian-xie-zhi-neng-he-yue.md b/...ebulas-101-03-bian-xie-zhi-neng-he-yue.md → ...ebulas-101-03-bian-xie-zhi-neng-he-yue.md
diff --git a/...ulas-101-04-zhi-neng-he-yue-cun-chu-qu.md → ...ulas-101-04-zhi-neng-he-yue-cun-chu-qu.md b/...ulas-101-04-zhi-neng-he-yue-cun-chu-qu.md → ...ulas-101-04-zhi-neng-he-yue-cun-chu-qu.md
diff --git a/...o-rpc-jie-kou-yu-xing-yun-lian-jiao-hu.md → ...o-rpc-jie-kou-yu-xing-yun-lian-jiao-hu.md b/...o-rpc-jie-kou-yu-xing-yun-lian-jiao-hu.md → ...o-rpc-jie-kou-yu-xing-yun-lian-jiao-hu.md
diff --git a/docs/go-nebulas/papers/README.rst b/docs/go-nebulas/papers/README.rst
@@ -0,0 +1,9 @@
+Papers
+===============
+
+.. toctree::
+    :titlesonly:
+
+    nebulas-technical-white-paper.md
+    nebulas-rank-yellow-paper.md
+
diff --git a/docs/go-nebulas/papers/nebulas-rank-yellow-paper.md b/docs/go-nebulas/papers/nebulas-rank-yellow-paper.md
@@ -0,0 +1,5 @@
+# Nebulas Rank Yellow Paper
+
+You can download PDF [here](https://nebulas.io/docs/NebulasYellowPaper.pdf).
+
+Welcome to translate Yellow Paper on Nebulas wiki. [Learn more](how-to-contribute.md) about how to contribute.
diff --git a/docs/go-nebulas/papers/nebulas-technical-white-paper.md b/docs/go-nebulas/papers/nebulas-technical-white-paper.md
@@ -0,0 +1,5 @@
+# Nebulas Technical White Paper
+
+You can download PDF [here](https://nebulas.io/docs/NebulasTechnicalWhitePaper.pdf).
+
+Welcome to translate Yellow Paper on Nebulas wiki. [Learn more](how-to-contribute.md) about how to contribute.
diff --git a/docs/go-nebulas/roadmap.md b/docs/go-nebulas/roadmap.md
@@ -1,5 +1,7 @@
 # Roadmap of Nebulas
 
+[Please visit our new Roadmap here](https://nebulas.io/roadmap.html).
+
 ## Milestones
 
 * In 2017 December, Nebulas test-net will be online.

diff --git a/docs/whats-nebulas/README.md → docs/go-nebulas/whats-nebulas/README.md b/docs/whats-nebulas/README.md → docs/go-nebulas/whats-nebulas/README.md
diff --git a/docs/whats-nebulas/README.rst → docs/go-nebulas/whats-nebulas/README.rst b/docs/whats-nebulas/README.rst → docs/go-nebulas/whats-nebulas/README.rst
diff --git a/docs/whats-nebulas/nebulas-force.md → ...go-nebulas/whats-nebulas/nebulas-force.md b/docs/whats-nebulas/nebulas-force.md → ...go-nebulas/whats-nebulas/nebulas-force.md
diff --git a/docs/whats-nebulas/nebulas-incentive-ni.md → ...las/whats-nebulas/nebulas-incentive-ni.md b/docs/whats-nebulas/nebulas-incentive-ni.md → ...las/whats-nebulas/nebulas-incentive-ni.md
diff --git a/docs/whats-nebulas/nebulas-rank-nr.md → ...-nebulas/whats-nebulas/nebulas-rank-nr.md b/docs/whats-nebulas/nebulas-rank-nr.md → ...-nebulas/whats-nebulas/nebulas-rank-nr.md
diff --git a/docs/how-to-contribute.md b/docs/how-to-contribute.md
@@ -17,9 +17,9 @@ the whole community. Thus, we call upon developers!
 
 Learn more:
 
-Our github：[https://github.com/nebulasio/go-nebulas](https://github.com/nebulasio/go-nebulas)
+Our github：[github.com/nebulasio/go-nebulas](https://github.com/nebulasio/go-nebulas)
 
-Our Roadmap: [https://nebulas.io/roadmap.html](https://nebulas.io/roadmap.html) (Stay tuned)
+Our Roadmap: [nebulas.io/roadmap.html](https://nebulas.io/roadmap.html) (Stay tuned)
 
 ### 1.2. Bug Reporting
 We have always valued bug reporting!
@@ -31,11 +31,11 @@ If you have suggestions on how to fix bugs, or improve upon an affiliated projec
 
 To submit bugs and related information, please post the information in the related Nebulas mail groups. When submitting reports, please be careful and pay attention to the mail group in order to prevent bugs from being exploited or create duplicates. We welcome you to follow the mail group and join the discussion.
 
-Mail group list: [https://lists.nebulas.io/cgi-bin/mailman/listinfo](https://lists.nebulas.io/cgi-bin/mailman/listinfo)
+Mail group list: [lists.nebulas.io/cgi-bin/mailman/listinfo](https://lists.nebulas.io/cgi-bin/mailman/listinfo)
 
-Mainnet bug list: [https://lists.nebulas.io/cgi-bin/mailman/listinfo/mainnet-bugs](https://lists.nebulas.io/cgi-bin/mailman/listinfo/mainnet-bugs)
+Mainnet bug list: [lists.nebulas.io/cgi-bin/mailman/listinfo/mainnet-bugs](https://lists.nebulas.io/cgi-bin/mailman/listinfo/mainnet-bugs)
 
-Testnet bug list: [https://lists.nebulas.io/cgi-bin/mailman/listinfo/testnet-bugs](https://lists.nebulas.io/cgi-bin/mailman/listinfo/testnet-bugs)
+Testnet bug list: [lists.nebulas.io/cgi-bin/mailman/listinfo/testnet-bugs](https://lists.nebulas.io/cgi-bin/mailman/listinfo/testnet-bugs)
 
 ### 1.3.   Translation
 Translating is important to spread Nebulas to the whole world!
@@ -53,24 +53,25 @@ Your contribution will be of use to all community developers and members, and ma
 ### 1.5. Wiki UI Design
 We welcome UI developers to optimize our wiki page and make it more user friendly and easier to read.
 
-Download our wiki > (design template)
+[Download design template of Nebulas wiki](https://drive.google.com/drive/folders/10ZWW1ygjnLa3VtjJ88fhv1jUai9SXNNz?usp=sharing)
+
+[Download LOGO material >](https://nebulas.io/docs/NEBULAS-LOGO-SVG.zip)
 
-Download LOGO material >
 If you have any questions or comments, please do not hesitate to post on our github.
 
 ## 2. User Groups
 Communication is key for building a vibrant community. People need to talk with each
 other in order to share their ideas and thoughts on Nebulas.
 
 
-Nebulas utilizes several platforms to connect our global community. Please refer to the “Community” link on official website for more information: [https://nebulas.io/community.html](https://nebulas.io/community.html)
+Nebulas utilizes several platforms to connect our global community. Please refer to the [“Community”](https://nebulas.io/community.html) page on official website for more information.
 
 Discord: Available for all community members. You can subscribe to Nebulas News, as well as participate in group discussions. Discord is many users' first choice.
 
 Mailing lists: Discussion groups for core development and bug reporting. We welcome developers to subscribe.
 
-Forum: Reddit/r/nebulas (for all), Reddit/r/nasdev(for developers)
-Communication: Slack(for developers), Telegram(for non-developers)
+Forum: [Reddit/r/nebulas(for all)](https://reddit.com/r/nebulas), [Reddit/r/nasdev(for developers)](https://reddit.com/r/nasdev)
+Communication: [Slack(for developers)](https://nebulasio.herokuapp.com/), [Telegram(for non-developers)](https://t.me/nebulasio)
 We welcome community developers to create an IRC (Internet Relay Chat) channel for better communication among developers.
 
 ## 3. Bounties
@@ -83,5 +84,5 @@ Nebulas Bounty rewards include:
 Developer Bounty：please refer to the Developer Bounty List
 Wiki Bounty: Based on the contribution, we will give different sized rewards to users who greatly contribute to the Nebulas Wiki, based on Github activity. For example, the reward for translating the Nebulas Yellow Paper will be 200 NAS. The deadline of the first evaluation is Dec. 31, 2018. The specific reward amount and number of recipients will be public. Depending on participation, the reward size will be adjusted in the future.
 
-## 4. Donation
-We welcome donations to develop Nebulas from the community. Both NAS and ETH are accepted. We also welcome community members to support us in material terms. For example, the donation of meetup locations/spaces, local guides, photography, etcetera. We can also make your contribution known to the community if you would like. If you are an enthusiastic community member and are willing to contribute to our community, please send an email to contact@nebulas.io for more details.
+## 4. Donations
+We welcome donations to develop Nebulas from the community. Both NAS and ETH are accepted. We also welcome community members to support us in material terms. For example, the donation of meetup locations/spaces, local guides, photography, etcetera. We can also make your contribution known to the community if you would like. If you are an enthusiastic community member and are willing to contribute to our community, please send an email to [contact@nebulas.io](mailto:contact@nebulas.io) for more details.
diff --git a/docs/index.md b/docs/index.md
@@ -0,0 +1,26 @@
+# Overview
+
+## Welcome to the open-source Nebulas wiki!
+
+
+Nebulas is the next-generation public blockchain, aiming for a continuously improving ecosystem. Based on its blockchain valuation mechanism, Nebulas proposes future-oriented incentive and consensus systems, and the ability to self-evolve without forking.
+
+Nebulas community is open and everyone can be a contributor and build a decentralized world with us.
+
+The Nebulas wiki is a collaboration tool for the community to publish various documents in a collaborative manner. Include using guides, developing guides, learning resources, and other useful documents. 
+
+
+
+## Use Wiki
+
+
+#### [Mainnet](go-nebulas/readme.rst) 
+
+#### [Dapps](dapp-development/README.rst)
+
+#### [Ecosystem](community-ecosystem/README.rst)
+
+#### [Get Involved](how-to-contribute.md)
+
+
+
diff --git a/docs/index.rst b/docs/index.rst
@@ -9,14 +9,16 @@ Nebulas Wiki
 .. toctree::
     :maxdepth: 2
     :titlesonly:
-    :caption: Table of Contents:
+    :caption: Category:
 
     overview.md
     how-to-contribute.md
-    whats-nebulas/README.rst
+    wiki-using-guide.md
     go-nebulas/README.rst
     dapp-development/README.rst
-    infrastructure/README.rst
+    community-ecosystem/README.rst
+    useful-links.md
+    frequently-asked-questions.md
     licensing/README.rst
 
 

diff --git a/docs/licensing/README.md b/docs/licensing/README.md
@@ -1,5 +1,7 @@
 # Licensing
 
+All contributions to Nebulas wikis are licensed under the (Creative Commons License SA 4.0)[https://creativecommons.org/licenses/by-nc-sa/4.0/].
+
 ## Nebulas Open Source Project License
 
 The preferred license for the Nebulas Open Source Project is the [GNU Lesser General Public License Version 3.0 \(“LGPL v3”\)](https://www.gnu.org/licenses/lgpl-3.0.en.html), which is commercial friendly, and encourage developers or companies modify and publish their changes.

diff --git a/docs/overview.md b/docs/overview.md
@@ -1,28 +1,26 @@
 # Overview
 
-{% hint style="info" %}
-This Guide is in progress. We welcome all to edit it and help more users and developers in the Nebulas ecosystem.
-{% endhint %}
+## Welcome to the open-source Nebulas wiki!
 
-## **Nebulas** is a next-generation public blockchain, aiming for a continuously improving ecosystem. 
 
-## Introduction
+Nebulas is the next-generation public blockchain, aiming for a continuously improving ecosystem. Based on its blockchain valuation mechanism, Nebulas proposes future-oriented incentive and consensus systems, and the ability to self-evolve without forking.
 
-This documentation was created and is maintained by Nebulas fans. We welcome everyone to help us.
+Nebulas community is open and everyone can be a contributor and build a decentralized world with us.
 
-This documentation is divided in three parts:
+The Nebulas wiki is a collaboration tool for the community to publish various documents in a collaborative manner. Include using guides, developing guides, learning resources, and other useful documents. 
 
-#### 1 Introduction. 
+
 
-What's Nebulas? Principles, technology features, history, community, Nebulas Foundations, and many other such things. Everything about Nebulas.
+## Use Wiki
 
-#### 2 Go-Nebulas.
 
-Roadmap, papers.
+#### [Mainnet](go-nebulas/readme.rst) 
 
-#### 3 DApp Development.
+#### [Dapps](dapp-development/README.rst)
 
-How to build a DApp on Nebulas, tutorials.
+#### [Ecosystem](community-ecosystem/README.rst)
+
+#### [Get Involved](how-to-contribute.md)
 
 
 
diff --git a/docs/useful-links.md b/docs/useful-links.md
@@ -0,0 +1,3 @@
+# Useful-links
+
+TBA
diff --git a/docs/wiki-using-guide.md b/docs/wiki-using-guide.md
@@ -0,0 +1,19 @@
+# Wiki Using Guide
+
+
+There will be three parts:
+
+## How to use this wiki
+
+TBA
+
+## Editing pages on github
+
+[How to use Markdown](https://daringfireball.net/projects/markdown/syntax)
+
+TBA
+
+# Tracking changes
+
+TBA
+