aragon · 0xGabi · May 17, 2019 · Apr 16, 2019 · Apr 16, 2019 · Apr 17, 2019
diff --git a/docs/assets/centralized-vs-decentralized-stack-2.png b/docs/assets/centralized-vs-decentralized-stack-2.png
diff --git a/docs/assets/centralized-vs-decentralized-stack.png b/docs/assets/centralized-vs-decentralized-stack.png
diff --git a/docs/assets/getting-started-dao-0.png b/docs/assets/getting-started-dao-0.png
diff --git a/docs/assets/getting-started-dao-1.png b/docs/assets/getting-started-dao-1.png
diff --git a/docs/assets/getting-started-dao-2.png b/docs/assets/getting-started-dao-2.png
diff --git a/docs/assets/github-guide/gh-0.png b/docs/assets/github-guide/gh-0.png
diff --git a/docs/assets/github-guide/gh-1.png b/docs/assets/github-guide/gh-1.png
diff --git a/docs/assets/github-guide/gh-10.png b/docs/assets/github-guide/gh-10.png
diff --git a/docs/assets/github-guide/gh-11.png b/docs/assets/github-guide/gh-11.png
diff --git a/docs/assets/github-guide/gh-12.png b/docs/assets/github-guide/gh-12.png
diff --git a/docs/assets/github-guide/gh-13.png b/docs/assets/github-guide/gh-13.png
diff --git a/docs/assets/github-guide/gh-14.png b/docs/assets/github-guide/gh-14.png
diff --git a/docs/assets/github-guide/gh-15.png b/docs/assets/github-guide/gh-15.png
diff --git a/docs/assets/github-guide/gh-16.png b/docs/assets/github-guide/gh-16.png
diff --git a/docs/assets/github-guide/gh-17.png b/docs/assets/github-guide/gh-17.png
diff --git a/docs/assets/github-guide/gh-18.png b/docs/assets/github-guide/gh-18.png
diff --git a/docs/assets/github-guide/gh-19.png b/docs/assets/github-guide/gh-19.png
diff --git a/docs/assets/github-guide/gh-2.png b/docs/assets/github-guide/gh-2.png
diff --git a/docs/assets/github-guide/gh-20.png b/docs/assets/github-guide/gh-20.png
diff --git a/docs/assets/github-guide/gh-3.png b/docs/assets/github-guide/gh-3.png
diff --git a/docs/assets/github-guide/gh-4.png b/docs/assets/github-guide/gh-4.png
diff --git a/docs/assets/github-guide/gh-5.png b/docs/assets/github-guide/gh-5.png
diff --git a/docs/assets/github-guide/gh-6.png b/docs/assets/github-guide/gh-6.png
diff --git a/docs/assets/github-guide/gh-7.png b/docs/assets/github-guide/gh-7.png
diff --git a/docs/assets/github-guide/gh-8.png b/docs/assets/github-guide/gh-8.png
diff --git a/docs/assets/github-guide/gh-9.png b/docs/assets/github-guide/gh-9.png
diff --git a/docs/assets/metamask-1.png b/docs/assets/metamask-1.png
diff --git a/docs/assets/metamask-4.png b/docs/assets/metamask-4.png
diff --git a/docs/assets/metamask-5.png b/docs/assets/metamask-5.png
diff --git a/docs/assets/metamask-6.png b/docs/assets/metamask-6.png
diff --git a/docs/assets/metamask-7.png b/docs/assets/metamask-7.png
diff --git a/docs/assets/metamask-guide/m-0.png b/docs/assets/metamask-guide/m-0.png
diff --git a/docs/assets/metamask-guide/m-1.png b/docs/assets/metamask-guide/m-1.png
diff --git a/docs/assets/metamask-guide/m-10.png b/docs/assets/metamask-guide/m-10.png
diff --git a/docs/assets/metamask-guide/m-11.png b/docs/assets/metamask-guide/m-11.png
diff --git a/docs/assets/metamask-guide/m-12.png b/docs/assets/metamask-guide/m-12.png
diff --git a/docs/assets/metamask-guide/m-13.png b/docs/assets/metamask-guide/m-13.png
diff --git a/docs/assets/metamask-guide/m-14.png b/docs/assets/metamask-guide/m-14.png
diff --git a/docs/assets/metamask-guide/m-15.png b/docs/assets/metamask-guide/m-15.png
diff --git a/docs/assets/metamask-guide/m-16.png b/docs/assets/metamask-guide/m-16.png
diff --git a/docs/assets/metamask-guide/m-17.png b/docs/assets/metamask-guide/m-17.png
diff --git a/docs/assets/metamask-guide/m-18.png b/docs/assets/metamask-guide/m-18.png
diff --git a/docs/assets/metamask-guide/m-19.png b/docs/assets/metamask-guide/m-19.png
diff --git a/docs/assets/metamask-guide/m-2.png b/docs/assets/metamask-guide/m-2.png
diff --git a/docs/assets/metamask-guide/m-20.png b/docs/assets/metamask-guide/m-20.png
diff --git a/docs/assets/metamask-guide/m-21.png b/docs/assets/metamask-guide/m-21.png
diff --git a/docs/assets/metamask-guide/m-22.png b/docs/assets/metamask-guide/m-22.png
diff --git a/docs/assets/metamask-guide/m-23.png b/docs/assets/metamask-guide/m-23.png
diff --git a/docs/assets/metamask-guide/m-3.png b/docs/assets/metamask-guide/m-3.png
diff --git a/docs/assets/metamask-guide/m-4.png b/docs/assets/metamask-guide/m-4.png
diff --git a/docs/assets/metamask-guide/m-5.png b/docs/assets/metamask-guide/m-5.png
diff --git a/docs/assets/metamask-guide/m-6.png b/docs/assets/metamask-guide/m-6.png
diff --git a/docs/assets/metamask-guide/m-7.png b/docs/assets/metamask-guide/m-7.png
diff --git a/docs/assets/metamask-guide/m-8.png b/docs/assets/metamask-guide/m-8.png
diff --git a/docs/assets/metamask-guide/m-9.png b/docs/assets/metamask-guide/m-9.png
diff --git a/docs/getting-started.md b/docs/getting-started.md
diff --git a/docs/github-guide.md b/docs/github-guide.md
@@ -0,0 +1,239 @@
+---
+id: github-guide
+title: GitHub Guide
+sidebar_label: GitHub Guide
+---
+
+# An introduction to Git and GitHub ?
+
+Git is a system that enables thousands of people to work together on projects without central coordination.
+
+Because of how useful this is, Git has a whole ecosystem built around it. You can think of Git as a tree trunk, and the services built around it as branches. One of these services is **GitHub**.
+
+GitHub is a site optimized for hosting and sharing Git repositories (repositories are just a fancy name for projects). And while you don't strictly need GitHub to use Git, you'll find that it makes your life considerably easier.
+
+At Aragon we choose to put a copy of our Git repository on GitHub for three reasons:
+1. It's a full backup of our code (including the full history of changes).
+
+1. It has an excellent User Interface that makes future collaboration easy.
+
+1. It offers convenient ways to browse and search through our codebase.
+
+# Editing a document on GitHub
+
+Now that you have a high-level overview of both Git and GitHub, we're ready to cover how to edit a document.
+
+If you don't have a GitHub account already, the first thing you should do is [sign up for one](https://github.com/join). Follow the instructions to create your account. It shouldn't take more than a couple of minutes.
+
+The next step is to open the [Getting Started page](https://hack.aragon.org/docs/getting-started) of the hack Aragon docs.
+
+You should find that there is a light blue **EDIT** button in the top-right corner the page. This button is available on every page of the Aragon docs.
+
+![](/docs/assets/github-guide/gh-0.png)
+
+Click on it. You'll be taken to a GitHub copy of the page.
+
+![](/docs/assets/github-guide/gh-1.png)
+
+You should see a small pencil icon on the right. When you hover over it, it will turn blue, and you'll see a small tooltip appear above it with the words:
+
+>Edit the file in your fork of this project
+
+![](/docs/assets/github-guide/gh-2.png)
+
+[A fork](https://help.github.com/en/articles/fork-a-repo) is just GitHub's term for a copy of a project. In other words, clicking on the pencil icon tells GitHub to:
+
+1. Create a copy (fork) of the project under your account.
+
+1. Open up your copy of the Getting Started page for editing
+
+Why do we need to fork? Why not just make changes directly in the original project?
+
+Forking a project allows us to freely experiment with changes without affecting the original project. Put another way, a fork allows us to test out changes without messing up the work done in the original.
+
+Later on, when we're happy with our changes, we can use our fork to propose changes to the original project.
+
+Click on the pencil icon. You should be directed to a page with a built-in document editor.
+
+![](/docs/assets/github-guide/gh-3.png)
+
+At the top you should see a message highlighted in a blue box. Don't worry about understanding what it means at this stage.
+
+Right below this blue box you should see a line that reads:
+
+> hack / docs / getting-started.md
+
+![](/docs/assets/github-guide/gh-4.png)
+
+This line gives us the location as well as the name of the document we are currently editing. In this case **getting-started.md** is the name of the document, and it's located in the **hack/docs** folder of our GitHub repository.
+
+The **.md** file extension stands for **Markdown**. In GitHub's words:
+
+> Markdown is a lightweight and easy-to-use syntax for styling all forms of writing on the GitHub platform.
+
+If you're new to it, we recommend reading through this quick [Markdown guide](https://guides.github.com/features/mastering-markdown/) before moving on.
+
+Really, it'll take you 3 minutes, and will give you a much better understanding of the structure of the document we are about to edit.
+
+# Your first edit
+
+Suppose you've read the [Getting Started page](https://hack.aragon.org/docs/getting-started) and you have an idea for how to explain things more clearly.
+
+In particular, you want to add a paragraph to the *What is Aragon and what does it do* section. Something along the lines of:
+
+>If you're new to this ecosystem, don't worry if some (or all) of that sounded a little abstract to you. You can think of Aragon as providing the lego pieces to allow people (like you) to build the next generation of human organizations. Organizations that can be spun up instantly, that can't be shut down by governments, that are resistant to internet censorship, and that allow small groups of people to collaborate effectively.
+
+The process couldn't be simpler. Just start writing directly in the document editor provided!
+
+![](/docs/assets/github-guide/gh-5.png)
+
+When you're happy with the changes you've made, click on the **Preview changes** button at the top of the document editor.
+
+![](/docs/assets/github-guide/gh-6.png)
+
+If you're happy with how your change looks, you're ready to officially propose the file change.
+
+Note that if you're unhappy with the result, you can click on the **Edit file** button to continue making changes.
+
+# Proposing the file change
+
+Scroll down to the bottom of the page You should see a box with the heading **Propose file change**.
+
+![](/docs/assets/github-guide/gh-7.png)
+
+This is where the description of your proposed file change goes- known in Git as a **commit message**.
+
+ou can think of a commit message as a short email explaining your proposal: the first text box is the subject line, and the second is the text body.
+
+The [convention](https://github.blog/2011-09-06-shiny-new-commit-styles/) is to write your commit message in the present tense. For example, if you fixed a bug, you would write *Fix bug* and not *Fixed bug*.
+
+In the first box we'll write: 
+
+>Update getting-started.md
+
+And in the second we'll write a brief description:
+
+>Add paragraph to 'What is Aragon and what does it do' subsection.
+
+![](/docs/assets/github-guide/gh-8.png)
+
+When you're ready, click on the green **Propose file change** button.
+
+# Comparing changes
+
+If you've followed the above steps correctly, you should be looking a page that looks like this.
+
+![](/docs/assets/github-guide/gh-9.png)
+
+Under the header, you should see a line that says:
+
+>Choose two **branches** to see what's changed or to start a new **pull request**. If you need to, you can also compare across **forks**.
+
+Before we move on, it's time to explain what these terms mean.
+
+We've already explained the term [fork](https://help.github.com/en/articles/fork-a-repo) : remember it's just GitHub's term for a copy of a project.
+
+We mentioned that when you click on the pencil icon to edit the document, GitHub creates a complete copy (fork) of the project under your account (we need a copy because we don't have the permissions required to directly edit the original project).
+
+What we didn't cover is that clicking on this icon also creates what Git calls a new branch.
+
+The ability to create branches is one of the most powerful features of Git: Branches are essentially self-contained copies of the project code.
+
+A GitHub project always starts with one branch (the master branch). However, the usual Git workflow is to create a new branch every time you begin working on a new feature or bug fix.
+
+Why is it good practice to create a new branch for every new feature? Why not just make changes directly to the master branch?
+
+The problems with making changes directly to the master branch is that there may be others working on implementing new features   at the same time as you.
+
+If you're implementing your feature at the same time as someone else is implementing theirs, you might overwrite each others changes by mistake. This can get messy. So we try to avoid this.
+
+The idea is that once we've implemented our changes in our branch, we can request to **merge** our branch into the original branch: which is basically a request to update the original branch with our changes. This is usually done using a **pull request**.
+
+# Your first pull request
+
+![](/docs/assets/github-guide/gh-10.png)
+
+[Pull requests](https://help.github.com/en/articles/about-pull-requests) let you tell others about changes you've pushed to a branch in a repository. Once a pull request is created, you can discuss and review the potential changes with collaborators (in this case the Aragon One team) before your changes are merged into the original (base) branch.
+
+By now you should understand the gist of this page. So let's go ahead and click on **Create pull request**.
+
+![](/docs/assets/github-guide/gh-11.png)
+
+You should see both a subject and a body field. In our case they have been automatically filled with our previous commit message.
+
+At this stage you should add any issues you think exist with the pull request to the body, as well as any questions you may have for the Aragon team.
+
+If you haven't already, this is a good time to familiarize yourself with Aragon's [contribution guidelines](https://github.com/aragon/hack/blob/master/CONTRIBUTING.md).
+
+Once you're confident you've satisfied the contribution guidelines, click on **Create pull request** again.
+
+![](/docs/assets/github-guide/gh-12.png)
+
+Congratulations! 🎉 You've just opened your first pull request.
+
+Now you just need to wait for the pull request to be reviewed by a maintainer.
+
+Don't worry if it isn't perfect (no pull request is). Your reviewer will help you improve it and fix any problems!
+
+# Adjusting your pull request
+
+After making a pull request, you may want to make an adjustment or an addition.
+
+Making an adjustment is as simple as editing the relevant file(s) in your branch and committing the change.
+
+GitHub ensures your pull request automatically tracks the changes in your branch and updates accordingly.
+
+Let's go through an example.
+
+Under the *Update getting-started.md* header you should see a line that reads:
+
+>*username* wants to merge 1 commit into aragon:master from *username:branchname*
+
+Note that, in the text above, *username* and *branchname* are just placeholders for your user and branch names.
+
+In my case, my username is *sysl91* and the name of the branch I'm working in is *patch-1*, so I would click on *sysl91:patch-1*.
+
+To access your branch, click on your *username:branchname* (it should be highlighted in blue).
+
+![](/docs/assets/github-guide/gh-13.png)
+
+This will open up the branch you've created in your fork of the **hack** project.
+
+![](/docs/assets/github-guide/gh-14.png)
+
+Click on the **docs** folder (remember, the getting-started.md page is located in the docs folder).
+
+![](/docs/assets/github-guide/gh-15.png)
+
+Now click on **getting-started.md**.
+
+You should find yourself back at the GitHub copy of the Getting Started page.
+
+![](/docs/assets/github-guide/gh-1.png)
+
+
+![](/docs/assets/github-guide/gh-16.png)
+
+From here on in the workflow is pretty much the same as before.
+
+Click on the pencil icon to start editing.
+
+![](/docs/assets/github-guide/gh-17.png)
+
+Say we want to make a grammatical change to the paragraph we added. Specifically, we want to separate the two clauses below with a colon instead of a full stop.
+
+>You can think of Aragon as providing the lego pieces to allow people (like you) to build the next generation of human **organizations: Organizations** that can be spun up instantly, that can't be shut down by governments, that are resistant to internet censorship, and that allow small groups of people to collaborate effectively.
+
+As before, we can make this change directly in the editor.
+
+![](/docs/assets/github-guide/gh-18.png)
+
+We can then preview it.
+
+![](/docs/assets/github-guide/gh-19.png)
+
+And if we're happy with the result, commit it.
+
+![](/docs/assets/github-guide/gh-20.png)
+
+And voila! That's all there is to it 😊. The changes you just committed will automatically be reflected in your pull request.
diff --git a/docs/guides-faq.md b/docs/guides-faq.md
@@ -6,6 +6,45 @@ sidebar_label: Troubleshooting
 
 #####
 
+## Installing aragonCLI
+
+### Linux considerations
+
+If you're seeing several errors (e.g. `node-gyp rebuild`) it's probably cause you need to run node long term support (LTS) version, currently `10.15.3`.
+
+### Mac considerations
+
+If you're seeing one or more errors that look like:
+
+```sh
+EACCES: permission denied
+```
+
+It's probably because you originally installed Node with root permissions [explain what this means] . Because of this, writing to your npm directory (```npm -i -g```) requires root permissions too.
+
+While it's not a good idea to have Node installed this way, one way to quickly give yourself root permissions is to run the slightly modified command: [maybe not a good idea to show this option]
+
+```sh
+sudo npm i -g --unsafe-perm @aragon/cli
+```
+
+An arguably better way to fix the problem is to follow the steps outlined in this [stackoverflow answer.](https://stackoverflow.com/a/24404451) [should make this more intuitive...]
+
+[i think this whole section needs to be exlained more simply...]
+
+### Windows considerations
+
+You might need to run the shell with administrator rights when installing the aragonCLI, because our `go-ipfs` dependency will need to create a symlink to work correctly. [this needs to be explained better]
+
+If you have problems during the instalation of aragonCLI or any other dependencies. You probably need to install [windows-build-tools](https://www.npmjs.com/package/windows-build-tools) or similar package. 
+
+Again, if you're having trouble fixing things, please reach out to us at the [#dev-help channel on the Aragon Chat](https://aragon.chat/channel/dev-help)
+
+### Note on Git
+
+You might need to have [Git](https://git-scm.com) installed. If you're unsure what Git is, or whether you have it installed, we recommend you follow [this tutorial.](https://www.learnenough.com/git-tutorial/getting_started)
+*[a little startling for the reader... why might? i think we need to elaborate here...]*
+
 ## Resetting the devchain
 
 After upgrading aragonCLI, or if unexpected errors are being experienced, [resetting the devchain](/docs/cli-main-commands.html#aragon-devchain) (by doing `aragon devchain --reset` or `aragon run --reset`) is sometimes useful as it will restart the chain from the snapshot.