Merge pull request #266 from EOSIO/develop

develop -> master
EOSIO · Aug 5, 2020 · f7d6aff · f7d6aff
2 parents e34ece4 + ca50579
commit f7d6aff
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 3 deletions.
diff --git a/IMPORTANT.md b/IMPORTANT.md
@@ -7,6 +7,7 @@ publications, documents or other material (collectively, Material) is your accep
 terms of this important notice.
 
 ## Software
+
 We are not responsible for ensuring the overall performance of Software or any related
 applications. Any test results or performance figures are indicative and will not reflect
 performance under all conditions. Software may contain components that are open
@@ -43,18 +44,21 @@ services to third parties shall advise such third parties of this important noti
 limitations, restrictions and exclusions of liability.
 
 ## Trademarks
+
 Block.one, EOSIO, EOS, the heptahedron and associated logos and related marks are our
 trademarks. Other trademarks referenced in Material are the property of their respective
 owners.
 
 ## Third parties
+
 Any reference in Material to any third party or third-party product, resource or service is not
 an endorsement or recommendation by Block.one. We are not responsible for, and
 disclaim any and all responsibility and 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
 information in Material may be out of date or inaccurate.
 
 ## Forward-looking statements
+
 Please note that in making statements expressing Block.one’s vision, we do not guarantee
 anything, and all aspects of our vision are subject to change at any time and in all respects at
 Block.one’s sole discretion, with or without notice. We call these “forward-looking

diff --git a/README.md b/README.md
@@ -0,0 +1,8 @@
+# Welcome
+
+This repository is the home for the content of [EOSIO developers documentation site](https://developers.eos.io/welcome).
+
+Interested in contributing? That's awesome!
+[Here are some guidelines to get started quickly and easily](https://github.com/EOSIO/welcome/blob/master/CONTRIBUTING.md).
+
+[MIT License](https://github.com/EOSIO/welcome/blob/master/LICENSE)
diff --git a/docs/03_tutorials/20_tic-tac-toe-game-contract.md b/docs/03_tutorials/20_tic-tac-toe-game-contract.md
@@ -43,7 +43,7 @@ cleos create account eosio tic.tac.toe YOUR_PUBLIC_KEY
 Ensure that you have your wallet unlocked and the creator's private active key in the wallet imported, otherwise the above command will fail.
 
 [[info | Wallet Unlocking]]
-| For instructions on wallet unlocking and keys importing, see section [Create Development Wallet](../02_development-environment/05_create-development-wallet.md). 
+| For instructions on wallet unlocking and keys importing, see section [Create Development Wallet](../02_getting-started/02_development-environment/05_create-development-wallet.md). 
 
 In the above step, if you see `YOUR_PUBLIC_KEY` instead of the public key value, you can either go back to section **1.4 Create Development Wallet** and persist the value or replace `YOUR_PUBLIC_KEY` with the public key value manually.
 
@@ -652,7 +652,7 @@ Ensure that your wallet is unlocked and you have `tic.tac.toe` key imported.
 After the deployment and the transaction is confirmed, the contract is already available in the blockchain. You can play with it now!
 
 [[info | Test Account]]
-| If you have not created these accounts already, refer to this article for creating test accounts [Create Test Accounts](../02_development-environment/07_create-test-accounts.md)
+| If you have not created these accounts already, refer to this article for creating test accounts [Create Test Accounts](../02_getting-started/02_development-environment/07_create-test-accounts.md)
 
 ### Create a Game
 

diff --git a/docs/get-involved/LICENSE b/docs/get-involved/LICENSE
@@ -0,0 +1,21 @@
+Copyright (c) 2017-2020 block.one and its contributors.  All rights reserved.
+
+The MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/docs/get-involved/index.md b/docs/get-involved/index.md
@@ -5,7 +5,7 @@ We appreciate your interest in contributing to the EOSIO platform! We always wel
 
 ## Get Involved with EOSIO Community and Code
 
-The following are different ways you can get involved with the EOSIO developers community and EOSIO repositories. You can find repositories to contribut to in [software manuals](../manuals) and on the [EOSIO Organization](https://github.com/EOSIO) on GitHub.
+The following are different ways you can get involved with the EOSIO developers community and EOSIO repositories. You can find repositories to contribute to in [software manuals](../manuals) and on the [EOSIO Organization](https://github.com/EOSIO) on GitHub.
 
 For more information about the contribution guidelines of a particular repository, look for the "Contributing" link in the right-hand sidebar of the documentation.