Merge pull request #38 from status-im/develop

Minor changes to CONTRIBUTING.md and README.md files

Author: jorge-campo

CONTRIBUTING.md

@@ -78,7 +78,7 @@ To understand how a repository fork works, see [About forks](https://docs.github
 
 1. Update your local `develop` branch with the latest changes from `upstream`:
 
-    `git pull upstream develop`
+    `git pull upstream develop --rebase`
 
     `git push origin develop`
 
@@ -163,7 +163,7 @@ With the Mkdocs live preview server, you can preview your changes as you write y
 
 ### 7. What's next?
 
-1. We may ask for changes to be made before a PR can be merged, either using [suggested changes](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/incorporating-feedback-in-your-pull-request) or pull request comments.
-1. As you update your PR and apply changes, mark each conversation as [resolved](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/commenting-on-a-pull-request#resolving-conversations).
+- We may ask for changes to be made before a PR can be merged, either using [suggested changes](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/incorporating-feedback-in-your-pull-request) or pull request comments.
+- As you update your PR and apply changes, mark each conversation as [resolved](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/commenting-on-a-pull-request#resolving-conversations).
 
 Congratulations on making it this far! The Status team thanks you.

README.md

@@ -2,7 +2,7 @@
 
 ![Status Help illustration](./overrides/assets/images/status-help-image.png)
 
-This repository contains the documentation website code and Markdown source files for [help.status.im](https://help.status.im).
+This repository contains the documentation website code and Markdown files for [help.status.im](https://help.status.im).
 
 We use [Material for MkDocs](https://squidfunk.github.io/mkdocs-material/) to build the user documentation site.
 

config/en/mkdocs.yml

@@ -135,4 +135,27 @@ plugins:
       type: date
       fallback_to_build_date: true
 
-# Page tree (we don't show a page tree)
+# Page tree (for mobile view)
+nav:
+  - Start: index.md
+  - Getting started:
+    - getting-started/index.md
+    - Download Status:
+      - Download Status for Mac: getting-started/download-status-for-mac.md
+      - Download Status for Windows: getting-started/download-status-for-windows.md
+      - Download Status for Linux: getting-started/download-status-for-linux.md
+      - Download Status for mobie: getting-started/download-status-for-mobile.md
+  - Using Status:
+    - using-status/index.md
+  - Communities:
+    - status-communities/index.md
+  - Wallet:
+    - status-wallet/index.md
+  - Your profile:
+    - your-profile/index.md
+  - Settings:
+    - settings/index.md
+  - Tutorials:
+    - tutorials/index.md
+
+

config/style-guide/mkdocs.yml

@@ -135,7 +135,7 @@ plugins:
       type: date
       fallback_to_build_date: true
 
-# Page tree (we don't show a page tree)
+# Page tree (for mobile view)
 nav:
   - Welcome: index.md
   - Style guidelines: style-guidelines.md

docs/en/direct-messages.md

@@ -0,0 +1,6 @@
+---
+hide:
+  - navigation
+---
+
+# Using Status

docs/en/first-steps/using-status.md

@@ -0,0 +1,6 @@
+---
+hide:
+  - navigation
+---
+
+# Download Status for Linux

docs/en/getting-started/download-status-for-linux.md

@@ -0,0 +1,6 @@
+---
+hide:
+  - navigation
+---
+
+# Download Status for <!-- markdownlint-enable MD000 -->