Merge branch 'master' into trc21-spec

BuildOnViction · May 19, 2019 · 2a0c067 · 2a0c067
2 parents 6fd8de5 + c7a062b
commit 2a0c067
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 9 deletions.
diff --git a/docs/get-started/voting.md b/docs/get-started/voting.md
@@ -1,6 +1,6 @@
 ## Prerequisites
 
-- Have a wallet connected to the Testnet (See [chapter 1](/get-started/wallet))
+- Have a wallet connected to the Testnet (See [this tutorial](/get-started/wallet))
 
 ## Introduction
 

diff --git a/docs/tomomaster/.gitkeep → docs/products/tomomaster/.gitkeep b/docs/tomomaster/.gitkeep → docs/products/tomomaster/.gitkeep
diff --git a/docs/tomomaster/features.md → docs/products/tomomaster/features.md b/docs/tomomaster/features.md → docs/products/tomomaster/features.md
diff --git a/docs/tomoscan/.gitkeep → docs/products/tomoscan/.gitkeep b/docs/tomoscan/.gitkeep → docs/products/tomoscan/.gitkeep
diff --git a/docs/tomoscan/features.md → docs/products/tomoscan/features.md b/docs/tomoscan/features.md → docs/products/tomoscan/features.md
diff --git a/docs/tomowallet/.gitkeep → docs/products/tomowallet/.gitkeep b/docs/tomowallet/.gitkeep → docs/products/tomowallet/.gitkeep
diff --git a/docs/tomowallet/features.md → docs/products/tomowallet/features.md b/docs/tomowallet/features.md → docs/products/tomowallet/features.md
diff --git a/docs/tomowallet/voting.md → docs/products/tomowallet/voting.md b/docs/tomowallet/voting.md → docs/products/tomowallet/voting.md
diff --git a/mkdocs.yml b/mkdocs.yml
@@ -66,15 +66,13 @@ nav:
     # - TomoChain client:
     #   - Getting started: misc/wip.md
     #   - Contributing: misc/wip.md
-    - TomoMaster:
-      - Features: tomomaster/features.md
+    - Products:
+      - TomoMaster: products/tomomaster/features.md
     #   - Contributing: misc/wip.md
-    - TomoScan:
-      - Features: tomoscan/features.md
-    #   - Contributing: misc/wip.md
-    - TomoWallet:
-      - Features: tomowallet/features.md
-      - How to vote: tomowallet/voting.md
+      - TomoScan: products/tomoscan/features.md
+      - TomoWallet:
+        - Features: products/tomowallet/features.md
+        - Voting with TomoWallet: products/tomowallet/voting.md
     #   - Getting started: misc/wip.md
     #   - Contributing: misc/wip.md
     - Masternode: