Patch 2 consolidation organization

docs/build/_category_.json

@@ -1,6 +1,6 @@
 {
-    "label": "Build",
-    "position": 4,
+    "label": "Build Tezos",
+    "position": 3,
     "collapsed": "true"
 }
 

docs/intro.mdx

@@ -10,28 +10,57 @@ slug: /
 
 ### Getting started
 
-The wiki is separated into five sections:
+The wiki is separated into three sections:
 
-* The welcome section includes this page, the white paper and position paper.
-* Learn - A general knowledgebase of Tezos for anyone and everyone. 
-* Build - Is more for developers, project leaders and those wishing to build and develop on Tezos. 
-* Use - Contains information and resources for users and those wishing to put Tezos into practice.
-* Contribute - Has more resources for assisting with this page. 
+* Learn Tezos - A general knowledgebase of Tezos.
+* Build Tezos - Is more for developers, project leaders and those wishing to build and develop on Tezos. 
+* Use Tezos - Contains information and resources for users and those wishing to put Tezos into practice.
 
-To begin learning enter the [Tezos developer portal](https://tezos.com/developer-portal).
+To begin developing enter the [Tezos developer portal](https://tezos.com/developer-portal).
 
 [See here](https://tezos.gitlab.io/) for developer documentation.
 
 Have technical questions? Check out the [Tezos Stack Exchange](https://tezos.stackexchange.com/).
 
-### Contribute
-
-This wiki aspires to be a living document maintained and supported by the Tezos community that will evolve alongside the Tezos protocol and ecosystem.
-
-To propose a change to the wiki, submit an issue or make a merge request to [this GitHub repository](https://github.com/tezosweb/wiki.tezos.com).
-
 ### Stay Up to Date
 
 * Weekly updates - [Baking Sheet Newsletter](http://bakingsheet.tezoscommons.org).
 * Tezos announcements - [Telegram News Feed](https://t.me/TezosAnnouncements) and [Twitter Feed](https://twitter.com/tezosbulletin).
 * Tezos News - [XTZ News](https://xtz.news).
+
+### Contribute
+
+The Tezos Wiki was started and is maintained by a collaboration of stakeholders including the Tezos Commons Foundation and TQTezos. It is an open-source project and aims to be the most extensive resource of knowledge on Tezos and the Tezos ecosystem. A large part of the material that you will find here currently focuses on Tezos, but it is not opposed to covering informational material for community projects. However, please do not try to pull-request any marketing material as this will be immediately rejected.
+
+Pull requests, discussions, and contributions from the community are highly encouraged. Active community members who demonstrate a record of good contributions may be given write access to the repository. Otherwise, Tezos Commons and TQTezos hold the administrative position and final say on the content that is included.
+
+To propose a change to the wiki, submit an issue or make a merge request to [this GitHub repository](https://github.com/tezosweb/wiki.tezos.com). 
+
+### Rules
+
+We have a few basic rules for contributors, which are designed for quality control:
+
+1. No --force pushes or modifications of Git history in any way. 
+2. Pull requests are preferred to issues, especially for small changes such as typos. Issues should be used for generic or broad-based changes or missing content. 
+3. Only use non-main branches. 
+4. If there are significant modifications, even by contributors, they ought to be subject to a pull request to solicit feedback from other contributors. 
+5. Pull requests to solicit feedback are encouraged for any other non-trivial contribution however they are left to the discretion of the contributor. 
+6. Contributors should attempt to adhere to the prevailing “MarkDown” style, language, and layout. 
+7. Correct grammar should be used at all times. Pull requests with typos will not be merged until fixed. All content contributions must be done in English. 
+8. Care should be taken to remain as objective and informative as possible. There should be no editorializing, nor should there be any external bias.
+
+### Resources
+
+* [Github - Basics](https://guides.github.com/introduction/flow/)
+* [Github - Mastering Issues](https://guides.github.com/features/issues/%20)
+* [Guide to writing in Markdown](https://guides.github.com/features/mastering-markdown/%20)
+* [Check your Markdown in real-time](https://stackedit.io/app#%20)
+* [Markdown Cheatsheet](https://enterprise.github.com/downloads/en/markdown-cheatsheet.pdf)
+
+### Get Rewarded!
+
+Have you or someone you know worked on the Tezos Wiki? [Nominante](https://tezoscommons.org/rewards/) today! You can even nominate yourself! Successful candidates will be rewarded in Tez, typically through a Twitter Kukai wallet.
+
+### Support, Connect, Give Feedback
+
+Please reach out in the [@TezosPlatform](https://t.me/joinchat/BtLGEcc-Ed4xNmMy%20) Telegram, the [Tezos Blockchain](https://discord.gg/ScYMvNpCnu) Discord, or [Email](mailto:hello@tezoscommons.org%20) Tezos Commons.

docs/learn/_category_.json

@@ -1,5 +1,5 @@
 {
-    "label": "Learn",
-    "position": 3
+    "label": "Learn Tezos",
+    "position": 2
 }
 

docs/learn/baking/_category_.json

@@ -1,6 +1,6 @@
 {
     "label": "Baking",
-    "position": 4,
+    "position": 2,
     "collapsed": true
 }
 

docs/learn/educational-resources/_category_.json

@@ -0,0 +1,5 @@
+{
+    "label": "Educational Resources",
+    "position": 1
+}
+

docs/learn/educational-resources/resources.md

@@ -0,0 +1,56 @@
+---
+sidebar_position: 1
+hide_table_of_contents: true
+title: "Create a Wallet"
+hide_title: true
+---
+
+## What is a Tezos Wallet
+
+It's basically just a safe place to store Tez and tokens such as NFTs. 
+The wallet holds the secret data needed to send your coins; it's similar to your bank account, but instead of relying on the bank to hold dollars, you rely on your ability to recall or find passwords, and hold tez.
+
+When you log in to your wallet, you can see any previous transactions, the account number (or wallet address), which begins with the letters 'tz' and you can send those funds to other Tezos accounts. You can (and should) also choose a delegate to earn regular rewards from a baker.
+
+When setting up a new Tezos wallet with Kukai for example, there are three different ways.
+
+**Easiest method**
+Sign in with a social media account.
+If you're not a passphrase kind of person, you may prefer to start an account that links to your social media account. 
+There is no need to keep track of a backup or passphrase. Your wallet access depends on keeping your social media account. Make sure your social media account has two-factor authentication turned on.
+
+**Normal method**
+Create a new wallet and keep the backup phrase safe and away from electronic devices and other people.
+
+**Expert method**
+Use a Ledger Nano S or Nano X and connect Kukai to your Ledger. Your backup phrase will be generated on the Ledger and you can use multiple Tezos accounts by using custom derivation paths. Just make sure to keep track of the paths. For example, 44'/1729'/0'/0'/0' = Rainy day fund
+44'/1729'/0'/0'/1' = Travel fund
+44'/1729'/0'/0'/2' = Parent's account
+
+### Create a Wallet
+
+Creating a wallet is simple and secure with [Kukai](https://wallet.kukai.app/), a mobile friendly wallet that you can take anywhere. Creating one is as easy as having a Twitter, Facebook, Google, or Reddit account. 
+
+### Add Tez to your wallet
+You can add Tezos into your wallet from either a centralized exchange (where you can buy and sell cryptocurrencies with fiat, the national currency you use every day) or by transfering Tez from another Tezos wallet. When transferring Tez or other tokens such as NFTs there will be a network fee and a storage fee when transfering NFTs.
+
+### Wallet Security
+
+* Never share your passphrase
+* *If* you create a wallet with a social media account and lose access (banned or lose your password) from that account, you will lose access to your wallet. (Typically used to only hold small amounts of Tez)
+* A downloadable file which contains a version of your backup phrase encrypted with your strong passphrase is available with Kukai. It's worth storing this on a USB stick in case you lose your backup phrase. 
+* Always double check you are using the correct website - wallet.kukai.app - and check any tz address matches after copy/paste
+* You can improve your security by using an additional passphrase on a Ledger which will ensure anyone who steals the physical backup phrase would not have access to the funds without the passphrase too.
+* Store your passphrase in a safe physical locations of both the Kukai backup phrase and the Ledger passphrase.
+
+**Always remember:** If you do not control your private keys, you do not control your tokens. Every user should make sure to exercise extreme care and take all available safety precautions when entering private key information anywhere. Any party or software, such as a wallet, that gains knowledge of private key information will have access to the tez controlled by the corresponding public key hash.
+
+### Learn More
+
+Kukai is one of many wallets on Tezos, [learn more](https://tezos.com/learn/store-and-use/) on the official Tezos "Store and Use" page!
+
+### Video Resources
+
+<iframe width="560" height="315" src="https://www.youtube.com/embed/ql2FR4NkY6M" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+
+

docs/learn/futuredevelopments/_category_.json → docs/learn/future-developments/_category_.json

@@ -1,5 +1,5 @@
 {
     "label": "In Development",
-    "position": 9
+    "position": 6
 }
 

docs/learn/governance/_category_.json

@@ -1,5 +1,5 @@
 {
-    "label": "Tezos Governance",
-    "position": 5
+    "label": "Governance",
+    "position": 4
 }
 

docs/learn/introduction/_category_.json

@@ -0,0 +1,5 @@
+{
+    "label": "Introduction",
+    "position": 1
+}
+

docs/learn/basics/nomenclature.md → docs/learn/introduction/nomenclature.md

@@ -1,4 +1,5 @@
 ---
+sidebar_position: 5
 hide_table_of_contents: true
 title: "Tezos Nomenclature"
 hide_title: true

docs/learn/positionpaper.md → docs/learn/introduction/positionpaper.md

@@ -1,5 +1,5 @@
 ---
-sidebar_position: 2
+sidebar_position: 3
 hide_table_of_contents: true
 title: "Tezos Position Paper"
 hide_title: true

docs/learn/tezos-and-functional-programming.md → docs/learn/introduction/tezos-and-functional-programming.md

@@ -1,11 +1,11 @@
 ---
-sidebar_position: 7
+sidebar_position: 4
 hide_table_of_contents: true
-title: "Tezos and Functional Programming"
+title: "Tezos Language"
 hide_title: true
 ---
 
-## Tezos and Functional Programming
+## Tezos Language and Functional Programming
 
 #### OCaml, the language of the Tezos protocol
 
@@ -25,5 +25,5 @@ It is a declarative programming paradigm, which means programming is done with e
 
 Here is a diagram that shows the high-level differences between the EVM \(Ethereum Virtual Machine\), WASM \(Web Assembly\) and Michelson:
 
-![](../assets/languages.png)
+![](../../assets/languages.png)
 

docs/learn/basics/intro.md → docs/learn/introduction/what-is-tezos.md

@@ -1,14 +1,13 @@
 ---
+sidebar_position: 1
 hide_table_of_contents: true
-title: "Intro to Tezos"
+title: "Tezos Introduction"
 hide_title: true
 slug: /learn/basics/
-sidebar_label: "Introduction"
+sidebar_label: "Tezos - What is it?"
 ---
 
-## Intro to Tezos
-
-### What is Tezos? <a id="xtz"></a>
+## What is Tezos? <a id="xtz"></a>
 
 Tezos is an open-source, community-governed, blockchain network capable of running complex smart contracts for asset settlement and decentralized applications \(dApps\) which benefit from censorship resistance, decentralization, and user-control.
 

docs/learn/whitepaper.md → docs/learn/introduction/whitepaper.md

@@ -1,5 +1,5 @@
 ---
-sidebar_position: 1
+sidebar_position: 2
 hide_table_of_contents: true
 title: "Tezos White Paper"
 hide_title: true
@@ -261,7 +261,7 @@ The protocol unfolds in cycles of 4,096 blocks. At the beginning of each cycle,
 
 _Four cycles of the proof-of-stake mechanism:_ 
 
-![](./assets/pos.png)
+![](./../assets/pos.png)
 
 ##### Clock
 

docs/learn/uses-of-tezos/_category_.json

@@ -1,5 +1,5 @@
 {
-    "label": "Uses of Tezos",
-    "position": 8
+    "label": "Use Cases",
+    "position": 5
 }
 

docs/learn/uses-of-tezos/nft.md

@@ -25,7 +25,8 @@ Recently, NFTs have been a powerful primitive demonstrating usefulness in the cr
 * [TZIP-021](https://gitlab.com/tzip/tzip/-/blob/tzip-21-spec/proposals/tzip-21/tzip-21.md) - an emerging contract multimedia metadata standard. 
 
 ### NFT Marketplaces 
-* [Arago] (https://arago.studio/)
+* [Arago](https://arago.studio/)
+* [Dogami](https://dogami.com/)
 * [Emergents TCG](https://emergentstcg.com/) - The trading card game where you own your cards
 * [FX(hash)](https://www.fxhash.xyz/)
 * [Hic Et Nunc](https://hicetnunc.art/) - The site hicetnunc.xyz was discontinued, and replaced by the community with hicetnunc.art
@@ -42,7 +43,7 @@ Recently, NFTs have been a powerful primitive demonstrating usefulness in the cr
 * [Tezos Domains](https://tezos.domains/) - Tezos domain names are FA2-compliant NFTs names that are stored on the Tezos blockchain.
 * [Tezos Profiles](https://tzprofiles.com/) - Tezos Profiles enable you to associate your online identity with your Tezos account.
 * [Teztopia](https://app.tezotopia.com/)
-* [Truesy](https://www.truesy.com/) 
+* [Truesy](https://www.truesy.com/)
 * [tzcolors](https://www.tzcolors.io)
 * [Ubisoft Quartz](https://quartz.ubisoft.com/welcome/)
 * [Versum](https://versum.xyz/)

docs/use/_category_.json

@@ -1,5 +1,5 @@
 {
-    "label": "Use",
-    "position": 6
+    "label": "Use Tezos",
+    "position": 4
 }
 

docs/use/baking/_category_.json

@@ -1,5 +1,5 @@
 {
     "label": "Baking",
-    "position": 2
+    "position": 3
 }
 

docs/use/resources/blockexplorer.md

@@ -6,12 +6,11 @@ hide_title: true
 ---
 ## Block Explorers
 
-* [TZKT](https://tzkt.io)
-* [Better Call Dev - "Michelson Contract Explorer"](https://better-call.dev/)
-* [TZStats](https://tzstats.com/)
 * [Arronax](https://arronax.io/tezos/mainnet/blocks)
+* [Better Call Dev - "Michelson Contract Explorer"](https://better-call.dev/)
 * [Tezblock](https://tezblock.io/)
-* [TezTracker](https://teztracker.com/en/mainnet) \(Does not appear to be maintained\)
+* [TZKT](https://tzkt.io)
+* [TZStats](https://tzstats.com/)
 
 An interesting real-time transaction monitor: