Navigation and Readme fixes

README.md

@@ -14,8 +14,8 @@ When setting up your machine for the first time, run:
 # restart terminal or run the following source command:
 source ~/.rvm/scripts/rvm
 # install Ruby 2.7 and the needed dependencies
-rvm install 2.7
+rvm install 2.6
-rvm use 2.1 --default
+rvm use 2.6 --default
 gem install bundler
 # make sure you're in the root of your clone of this repo and run
 bundle install
@@ -35,6 +35,11 @@ Don't want to install a bunch of stuff and don't mind the overhead of using Dock
 
 ```bash
 docker build -t blockdocs .
+```
+
+From then on, you can run:
+
+```bash
 docker run -p 4000:4000 -ti -v "$(pwd)":/usr/src/app blockdocs
 ```
 

_data/navigation.yml

@@ -1,97 +1,51 @@
-- title: Guides
+- title: Get Started
-  docs:
-  - develop/overview_auth
-  - develop/storage
-  - develop/profiles
-
-- title: Tutorials
   docs:
   - browser/hello-blockstack
   - browser/todo-list
   - browser/blockstack_storage
-  - develop/deploy-tips
-  - android/tutorial
-  - ios/tutorial
 
-- title: Blockstack Connect
+- title: Authentication
   docs:
   - develop/connect/overview
   - develop/connect/get-started
-  - develop/connect/use-with-clarity
+  - develop/profiles
-
-- title: Data sharing & collaboration
-  docs:
-  - develop/radiks-intro
-  - develop/radiks-setup
-  - develop/radiks-models
-  - develop/radiks-collaborate
-  - develop/radiks-server-extras
-
-- title: Data portability (Preview)
-  docs:
-  - develop/collections
-  - develop/collection-type
 
-- title: Introduction to Gaia storage
+- title: Data Storage
   docs:
   - storage/overview
+  - develop/storage
   - storage/authentication
   - storage/write-to-read
   - storage/hub-choice
 
-- title: Gaia How to hub
+- title: Data sharing & collaboration
   docs:
-  - storage/hub-operation
+  - develop/radiks-intro
-  - storage/amazon-s3-deploy
+  - develop/radiks-setup
-  - storage/digital-ocean-deploy
+  - develop/radiks-models
-  - storage/hello-hub-choice
+  - develop/radiks-collaborate
-  - storage/gaia-admin
+  - develop/radiks-server-extras
 
-- title: Clarity Getting started
+- title: Smart Contracts
   docs:
   - core/smart/overview
-
-- title: Clarity Tutorials
-  docs:
   - core/smart/tutorial
   - core/smart/tutorial-counter
   - core/smart/tutorial-test
-
+  - develop/connect/use-with-clarity
-- title: Clarity Guides
-  docs:
   - core/smart/principals
-  - core/smart/neon-node
+  - core/smart/testnet-node
   - core/smart/cli-wallet-quickstart
 
-- title: About Blockstack
+- title: Naming Services
-  docs:
-  - org/overview
-  - faqs/allFAQS
-  - org/token
-  - org/whitepaper-blockchain
-- title: About Blockstack Manage Stacks
-  docs:
-  - org/wallet-intro
-  - org/wallet-install
-  - org/wallet-use
-  - org/wallet-troubleshoot
-  - org/tokenholders
-
-- title: Naming Services Guides
   docs:
   - core/naming/introduction
   - core/naming/architecture
   - core/naming/namespaces
   - core/naming/comparison
-
-- title: Naming Service Tutorials
-  docs:
   - core/naming/tutorial_subdomains
   - core/naming/search
   - core/faq_technical
-
-- title: How to use BNS
-  docs:
   - core/naming/pickname
   - core/naming/creationhowto
   - core/naming/resolving
@@ -100,12 +54,37 @@
   - core/naming/subdomains
   - core/naming/forks
 
+- title: Data Portability (Preview)
+  docs:
+  - develop/collections
+  - develop/collection-type
+
+- title: Host a Storage Hub
+  docs:
+  - storage/hub-operation
+  - storage/amazon-s3-deploy
+  - storage/digital-ocean-deploy
+  - storage/hello-hub-choice
+  - storage/gaia-admin
+
 - title: Atlas
   docs:
   - core/atlas/overview
   - core/atlas/howitworks
   - core/atlas/howtouse
 
+- title: Blockstack and Stacks Tokens
+  docs:
+  - org/overview
+  - faqs/allFAQS
+  - org/token
+  - org/whitepaper-blockchain
+  - org/wallet-intro
+  - org/wallet-install
+  - org/wallet-use
+  - org/wallet-troubleshoot
+  - org/tokenholders
+
 - title: References
   docs:
   - core/cmdLineRef
@@ -120,4 +99,5 @@
   - core/wire-format
   - storage/config-schema
   - org/secureref
+  - develop/overview_auth
   - org/terms

_layouts/docs.html

@@ -19,6 +19,7 @@ layout: default
                                   {% for item in site.pages %}
                                       {% if item.url == doc_url %}
                                           {% assign doc_title = item.title %}
+                                          {% break %}
                                       {% else %}
                                       {% comment %}Do nothing{% endcomment %}
                                       {% endif %}

core/smart/testnet-node.md

@@ -1,9 +1,4 @@
 ---
-
-description: "Run a Stacks Testnet Node"
-
-redirect_from:
-  - /core/smart/neon-node.html
 ---
 # Running a Testnet Node
 {:.no_toc}

develop/overview_auth.md

@@ -3,7 +3,7 @@
 
 ---
 
-# Guide to Blockstack Auth
+# Authentication protocol
 {:.no_toc}
 
 Blockstack Auth provides single sign on and authentication without third parties or remote servers. On this page, you'll get an overview of authentication from a developer perspective. The following topics are covered: