Merge branch 'master' of https://github.com/nebulasio/nebdocs

docs/bounty-program.md

@@ -1,26 +1,21 @@
 # Bounty Program
-
 Nearly all projects are posted on the [Nebulas Project Page](go.nebulas.io) along with their corresponding bounties, and users are expected to apply in order to claim a project or parts of it. This process applies to the wiki and to the NAT Bug Bounty Program. For now, the Nebulas Bug Bounty Program only requires you to submit a [form](https://docs.google.com/forms/d/e/1FAIpQLScaCeODU26maPJIuyCkX6Lsa0A5Xi2AZ_z-mvKlHmd89_CaXQ/viewform) with the relevant information.
 
 Below you will find in-depth information about all the Bounty Programs so you can get started on contributing to the flourishing Nebulas ecossystem and get rewarded for it!
 
 ## The Nebulas Wiki Bounty Program
-
 Previously users who created or modified content on the Nebulas Wiki were entitled to potentially win a bounty in the form of NAS. Nowadays, the process is quite different.
 
 To qualify for the wiki bounty, go to the aforementioned project page and search for "wiki," or simply click [here](https://go.nebulas.io/search?q=wiki) to see all the available listings.
 
 
 ## The Nebulas Bug Bounty Program
-
 The Nebulas Bug Bounty aims to improve the security of Nebulas Ecosystem, ensuring the establishment of a benign Nebulas ecosystem. The Nebulas Bug Bounty Program provides bounties for the discovered vulnerabilities. This bounty program was initiated and implemented by the Nebulas Technical Committee (NTC), in conjunction with the Nebulas technical team, and community members. NTC encourages the community to disclose security vulnerabilities via the process described below, and play a role in building the Nebulas ecosystem, thereby receiving bounties, and partaking in the evolution of the Nebulas ecosystem.
 
 ### Bug Category
-
 The Bug Bounty Program divides the bug bounties into 2 categories, common bug bounty and special bug bounty. The common bugs include vulnerabilities discovered in Nebulas mainnet, Nebulas testnet, nebPay, Web wallet, neb.js and others, while the special bugs include vulnerabilities found in the inter-contract call function, etcetera.
 
 ### Eligibility 
-
 The Nebulas Technical Committee will evaluate reward sizes according to the severity calculated by [OWASP](https://www.owasp.org/index.php/OWASP_Risk_Rating_Methodology) Risk Rating Method based on **Impact** and **Likelihood**. However, final rewards are determined at the sole discretion of the committee. 
 
 ![Image 1](https://cdn-images-1.medium.com/max/1600/1*rR7P3JTHT2KFAYTDodsilw.jpeg)
@@ -70,9 +65,15 @@ For bugs pertaining the NAT smart contracts, you may go [here](https://go.nebula
 The smart contracts can be updated at any time. They are listed below:
 
 > multisig: n1orrpFGmcQSvGrbKTD7RHweTPe61ut7svw
+
 > NAT NRC20: n1mpgNi6KKdSzr7i5Ma7JsG5yPY9knf9He7
+
 > distribute: n1uBbtFZK3Acs2T6JUMv6bSAvS6U6nnur6j
+
 > pledge_proxy: n1obU14f6Cp4Wv7zANVbtmXKNkpKCqQDgDM
+
 > pledge: n1zmbyLPCt2i8biKm1tNRwgAW3mhyKUtEpW
+
 > vote: n1pADU7jnrvpPzcWusGkaizZoWgUywMRGMY
+
 > NR_DATA: n21KaJxgFw7gTHR9A5VFYHsQrWdL61dCqvK

docs/ecosystem/nas-nano.md

@@ -1,14 +1,20 @@
 # NAS nano
+NAS nano is the official wallet, developed by the Nebulas team. You may download it [here](https://nano.nebulas.io/index_en.html). It has a beautiful, easy-to-use interface, and implements all the features of a robust cryptocurrency wallet, as well as multiple security policies, so that users can easily manage their NAS assets without a steep learning curve.
 
-NAS nano is the official wallet. Please download it [here](https://nano.nebulas.io/index_en.html)
+The NAS nano wallet comes with four main features:
+
+* Quickly and easily create, import, and manage wallets.
+* Check the transaction progress in your wallet at a glance.
+* Provide three kinds of wallet backups, including mnemonic, Keystore, private key backups, to minimize loss and theft of assets.
+* Support NAS, as well as other NRC20 tokens, such as NAT and ATP.
+
+![](/resources/nano_app_capture_en.png)
 
 # Nebulas Web Wallet Tutorial 
-- Part 7 - [Call a Smart Contract on Nebulas Wallet](https://medium.com/nebulasio/call-a-smart-contract-on-nebulas-3522038aec18)
-- Part 6 - [Deploy a Smart Contract](https://medium.com/nebulasio/deploy-a-smart-contract-1e781e13c22e)
-- Part 5 - [Check TX Status](https://medium.com/nebulasio/check-tx-status-8dc7dd9b79de)
-- Part 4 - [View Wallet Information](https://medium.com/nebulasio/view-wallet-information-fcea3ea35d94)
-- Part 3 - [Signing a Transaction Offline](https://medium.com/nebulasio/signing-a-transaction-offline-ae8278f45201)
-- Part 2 - [Sending NAS from your Wallet](https://medium.com/nebulasio/sending-nas-from-your-wallet-be1b958c4e5d)
 - Part 1 - [Creating A NAS Wallet](https://medium.com/nebulasio/creating-a-nas-wallet-9d01b5fa2df6)
-
-# NAS nano Help Document is Coming Soon!
+- Part 2 - [Sending NAS from your Wallet](https://medium.com/nebulasio/sending-nas-from-your-wallet-be1b958c4e5d)
+- Part 3 - [Signing a Transaction Offline](https://medium.com/nebulasio/signing-a-transaction-offline-ae8278f45201)
+- Part 4 - [View Wallet Information](https://medium.com/nebulasio/view-wallet-information-fcea3ea35d94)
+- Part 5 - [Check TX Status](https://medium.com/nebulasio/check-tx-status-8dc7dd9b79de)
+- Part 6 - [Deploy a Smart Contract](https://medium.com/nebulasio/deploy-a-smart-contract-1e781e13c22e)
+- Part 7 - [Call a Smart Contract on Nebulas Wallet](https://medium.com/nebulasio/call-a-smart-contract-on-nebulas-3522038aec18)

docs/frequently-asked-questions.md

@@ -4,7 +4,7 @@ This document will focus on the technology behind the Nebulas platform. For broa
 
 For a better understanding of the Nebulas platform it's highly recommended to read the [Nebulas Technical Whitepaper](https://nebulas.io/docs/NebulasTechnicalWhitepaper.pdf).
 
-Table of Contents
+**Table of Contents**
 
 1. [Nebulas Rank \(NR\)](faq.md#nebulas-rank-nr)
 2. [Nebulas Force \(NF\)](faq.md#nebulas-force-nf)

docs/wiki-usage-guide.md

@@ -1,22 +1,20 @@
 # Wiki Usage Guide
 
 ## How to edit a Wiki page
-[Nebulas Wiki User Guide](https://medium.com/nebulasio/nebulas-wiki-user-guide-5418715c6988)
+A full tutorial on how to edit Wiki pages can be found [here](https://medium.com/nebulasio/nebulas-wiki-user-guide-5418715c6988).
 
 ## Editing Software
-You should use reST to edit .rst files, and Pandoc Markdown for .md files.
+For users who are familiar with git and would like to edit the Wiki locally, reST should be used to edit .rst files, and Pandoc Markdown for .md files.
 
 Click [here](http://www.unexpected-vortices.com/doc-notes/markdown-and-rest-compared.html) to learn about the differences between Pandoc Markdown and reST. 
 
-These are some learning resources:
+Below are some of the learning resources that can be used to further your knowledge of Markdown:
 
 - [How to use Markdown](https://daringfireball.net/projects/markdown/syntax) by John Gruber
 - [Markdown Guide](https://ia.net/writer/support/general/markdown-guide) by iA Writer
 
-When you edit pages on Github, you should click on "Preview changes" to view the result of your labor. You can check the building process [here](https://readthedocs.org/projects/nebdocs/builds/).
-
-## Tracking changes
-
-TBA
+## The aftermath
 
+When you edit pages on Github, you should always click on "Preview changes" to view the result of your labor. 
 
+After your contribution has been merged, you can check the building process [here](https://readthedocs.org/projects/nebdocs/builds/).