Merge pull request #140 from EOSIO/develop

Procedural `Merge for 2.0.9
EOSIO · Feb 6, 2020 · 03df4b0 · 03df4b0
2 parents 3b12988 + 7362969
commit 03df4b0
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 42 deletions.
diff --git a/docs/02_getting-started/02_development-environment/02_introduction.md b/docs/02_getting-started/02_development-environment/02_introduction.md
@@ -1,6 +1,6 @@
 ---
-content_title: "1.1: Introduction"
-link_text: "1.1: Introduction"
+content_title: "1.1: Prerequisites"
+link_text: "1.1: Prerequisites"
 ---
 
 ## EOSIO versions
@@ -13,25 +13,17 @@ The subsequent tutorials are up to date with the following EOSIO components.
 | eosio.cdt | 1.7.0 |
 | eosio.contracts | 1.9.0 |
 
-## What you'll learn
 
-_Only a sample of what you'll learn_
-- How to quickly spin up a node
-- Manage wallets and keys
-- Create Accounts
-- Write some contracts
-- Compilation and ABI
-- Deploy contracts
 
-## C / C++ Experience
+## Development Experience
 
 EOSIO based blockchains execute user-generated applications and code using WebAssembly (WASM). WASM is an emerging web standard with widespread support from Google, Microsoft, Apple, and industry leading companies.
 
 At the moment the most mature toolchain for building applications that compile to WASM is clang/llvm with their C/C++ compiler. For best compatibility, it is recommended that you use the EOSIO C++ toolchain.
 
 Other toolchains in development by 3rd parties include: Rust, Python, and Solidity. While these other languages may appear simpler, their performance will likely impact the scale of application you can build. We expect that C++ will be the best language for developing high-performance and secure smart contracts and plan to use C++ for the foreseeable future.
 
-## Linux / Mac OS Experience
+## Operating System
 
 The EOSIO software supports the following environments for development and/or deployment:
 
@@ -44,27 +36,38 @@ The EOSIO software supports the following environments for development and/or de
 [[info | Note]]
 | if you are developing on __Windows__, unfortunately we do not provide PowerShell ports and instructions at this time. In the future we may append PowerShell commands. In the mean-time your best bet is to use a VM with Ubuntu, and set up your development environment inside this VM. If you're an advanced Window's developer familiar with porting Linux instructions, you should encounter minimal issues.
 
-## Command Line Knowledge
+### Command Line Knowledge
 
 There are a variety of tools provided along with EOSIO which requires you to have basic command line knowledge in order to interact with.
 
-## C++ Environment Setup
+## Development Tools
 
 We can use any text editor that, preferably, supports C++ syntax highlighting. Some of the popular editors are Sublime Text and Atom. Another option is an IDE, which provides a more sophisticated code completion and more complete development experience. You are welcome to use the software of your personal preference, but if you're unsure what to use we've provided some options for you to explore.
 
-## Potential Editors and IDEs
+### Potential Editors and IDEs
 
-[[info]]
-| The resources listed below are developed, offered, and maintained by third-parties and not by block.one. Providing information, material, or commentaries about such third-party resources does not mean we endorse or recommend any of these resources. We are not responsible, and disclaim any responsibility or liability, for your use of or reliance on any of these resources. Third-party resources may be updated, changed or terminated at any time, so the information below may be out of date or inaccurate. USAGE AND RELIANCE IS ENTIRELY AT YOUR OWN RISK
 - [Sublime Text](https://www.sublimetext.com/)
 - [Atom Editor](https://atom.io/)
 - [CLion](https://www.jetbrains.com/clion/)
 - [Eclipse](http://www.eclipse.org/downloads/packages/release/oxygen/1a/eclipse-ide-cc-developers)
 - [Visual Studio Code](https://code.visualstudio.com/)
 
+[[info]]
+| The resources listed above are developed, offered, and maintained by third-parties and not by block.one. Providing information, material, or commentaries about such third-party resources does not mean we endorse or recommend any of these resources. We are not responsible, and disclaim any responsibility or liability, for your use of or reliance on any of these resources. Third-party resources may be updated, changed or terminated at any time, so the information below may be out of date or inaccurate. USAGE AND RELIANCE IS ENTIRELY AT YOUR OWN RISK
+
 Alternatively, you can try out some community driven IDEs specifically developed for EOSIO:
 
 - [EOS Studio](https://www.eosstudio.io/)
 
+## What you'll learn
+
+_Only a sample of what you'll learn_
+- How to quickly spin up a node
+- Manage wallets and keys
+- Create Accounts
+- Write some contracts
+- Compilation and ABI
+- Deploy contracts
+
 ## What's Next?
 - [Before You Begin](./03_before-you-begin.md): Steps to download and install binaries on your system.
diff --git a/docs/09_get-involved/index.md b/docs/09_get-involved/index.md
@@ -9,7 +9,7 @@ The following are different ways you can get involved with the EOSIO developers
 
 For more information about the contribution guidelines of a particular repository, look for the "Contributing" link in the right-hand sidebar of the documentation.
 
-![Contributing link location](./contributing-link.png)
+![Contributing link location](./contributing-link-1.png)
 
 ### Developers Community Involvement
 

diff --git a/docs/index.md b/docs/index.md
@@ -20,6 +20,6 @@ The transactions recorded on the blockchain form an immutable history of the blo
 `youtube: https://www.youtube.com/watch?v=MqSE5WLusko`
 
 ## What's Next? 
-- [Gettinng Started](../02_getting-started/index.md): Learn how to develop on an EOSIO blockchain
-- [Protocol](../04_protocol/index.md): Understand the protocols that makes up an EOSIO blockchain
-- [Get Involved](../09_get-involved/index.md): Learn how to get involved and contribute to the EOSIO ecosystem.
+- [Getting Started](./02_getting-started/index.md): Learn how to develop on an EOSIO blockchain
+- [Protocol](./04_protocol/index.md): Understand the protocols that makes up an EOSIO blockchain
+- [Get Involved](./09_get-involved/index.md): Learn how to get involved and contribute to the EOSIO ecosystem.
diff --git a/resource-directory.yaml b/resource-directory.yaml
@@ -1,44 +1,61 @@
 sections:
-  - title: Developers
+  - title: EOSIO Developers Community
     listings:
-      - title: EOSIO Github
-        description: The place where all EOSIO open source software can be reviewed, used and/or forked
-        link: https://github.com/EOSIO
-      - title: Elemental Battles
-        description: Learn how to build your first blockchain based game on EOSIO software
-        link: https://battles.eos.io/
       - title: EOSIO StackExchange
         description: A question and answer site for users and developers
-        link: https://eosio.stackexchange.com/
+        link: https://eosio.stackexchange.com/    
       - title: Developers Telegram
         description: For EOSIO development discussion only, all chains welcome. No memes. No prices. No promotion
         link: https://t.me/joinchat/EaEnSUPktgfoI-XPfMYtcQ
-      - title: EOSIO Testnet
-        description: Block.one’s official EOSIO Testnet
-        link: https://testnet.eos.io/
+
+
+  - title: Technical Resources
+    listings:
+      - title: EOSIO Github
+        description: The place where all EOSIO open source software can be reviewed, used and/or forked
+        link: https://github.com/EOSIO
       - title: EOSIO Deprecation Schedule
         description: Table tracking significant deprecations in EOSIO software
         link: https://github.com/EOSIO/eos/issues/7597
       - title: EOSIO White Paper
         description: The EOSIO software introduces a new blockchain architecture designed to enable vertical and horizontal scaling of decentralized applications
         link: https://github.com/EOSIO/Documentation/blob/master/TechnicalWhitePaper.md
-      - title: EOSIO Hackathons
-        description: Past and future Hackathons information and news
-        link: https://hackathon.eos.io/
-      - title: EOSIO Bug Bounty Program
-        description: A Bug Bounty program offering to external individuals to receive compensation for reporting EOSIO bugs
-        link: https://hackerone.com/eosio
+      - title: Elemental Battles
+        description: Learn how to build your first blockchain based game on EOSIO software
+        link: https://battles.eos.io/
+
+  - title: EOSIO Testnet
+    listings:
+      - title: EOSIO Testnet
+        description: Block.one’s official EOSIO Testnet
+        link: https://testnet.eos.io/
+
   - title: News
     listings:
       - title: EOSIO News
-        description: Latest news about EOSIO platform brought to you by block.one organization
+        description: Latest news about EOSIO platform brought to you by block.one
         link: https://eos.io/news/
-  - title: Webinars
-    listings:
+      - title: EOSIO Twitter
+        description: Latest tweets about EOSIO platform brought to you by block.one 
+        link: https://twitter.com/block_one_
+      - title: EOSIO Medium
+        description: Latest articles about EOSIO platform brought to you by block.one
+        link: https://medium.com/eosio
+
+
+    - title: Events
+    listings: 
+      - title: EOSIO Hackathons
+        description: Past and future Hackathons information and news
+        link: https://hackathon.eos.io/   
+      - title: EOSIO Bug Bounty Program
+        description: A Bug Bounty program offering to external individuals to receive compensation for reporting EOSIO bugs
+        link: https://hackerone.com/eosio 
       - title: EOSIO Webinars
         description: Introduction to EOSIO Blockchain Development by Block.one
         link: https://eos.io/webinars/
-  - title: FAQs
+
+  - title: General
     listings:
       - title: EOSIO FAQ
         description: Frequently Asked Questions