Update aragonCLI documentation

docs/apm.md

@@ -47,7 +47,7 @@ It is important to point out that aragonPM acts as the reference to what the las
 
 In order to interact with aragonPM registries, we have built [apm.js](https://github.com/aragon/apm.js) as a standalone JS library to inspect aragonPM repos, get their different versions, and fetch the referenced content. The library also allows interaction with aragonPM contracts for creating new repos or versions.
 
-The [aragonCLI](/docs/cli-usage.html) also uses apm.js to provide a great developer experience for creating and publishing new versions of Aragon apps as aragonPM repos. The CLI's aragonPM commands, accessible through `aragon apm`, are the easiest way to manage aragonPM repos.
+The [aragonCLI](/docs/cli-intro.html) also uses apm.js to provide a great developer experience for creating and publishing new versions of Aragon apps as aragonPM repos. The CLI's aragonPM commands, accessible through `aragon apm`, are the easiest way to manage aragonPM repos.
 
 ![](/docs/assets/apm-publish.png)
 >  Using the aragonCLI to publish a version to an aragonPM repo and inspect it

docs/cli-apm-commands.md

@@ -0,0 +1,62 @@
+---
+id: cli-apm-commands
+title: aragonPM commands
+sidebar_label: aragonPM commands
+---
+
+The `aragon apm` commands are the easiest way to manage aragonPM repositories.
+
+## aragon apm versions
+
+The `aragon apm versions` command shows all the previously published versions of your package (defined in `arapp.json`).
+
+```sh
+aragon apm versions
+```
+
+## aragon apm grant
+
+Grant an address or a group of addresses the permission to create new versions in your package (defined in `arapp.json`), by interacting directly with the ACL, without performing transaction pathing.
+
+```sh
+aragon apm grant [addr1 ... addrN]
+```
+
+- `addresses`: The addresses being granted the permission to publish to the repo. 
+
+## aragon apm publish
+
+The `aragon apm publish` command publishes a new version to the aragonPM repo.
+
+```sh
+aragon apm publish <bump> [contract]
+```
+
+- `bump`: Type of bump (major, minor or patch) or version number.
+- `contract`: (optional) The address or name of the contract to publish in this version. If it isn't provided, it will default to the contract specified in the `arapp.json` file.
+
+> **Note**<br>
+> Changes to the contract can only be published with a major version bump. Minor and patch versions are only for frontend changes.
+
+If a minor or patch version is being published then the command can be run with the `--only-content` flag which will skip compiling the contracts.
+
+You can target a particular directory to publish, using `--files`. We always publish apps with:
+
+```sh
+aragon apm publish <version> --environment <environment> --files app/build
+```
+
+The command has the following parameters:
+
+- `--only-content`: For minor and patch upgrades; whether to skip contract compilation, deployment and contract artifact generation.
+- `--only-artifacts`: Whether just generate artifacts file without publishing.
+- `--provider`: The provider where the files of the package will be published to. Defaults to `ipfs`.
+- `--files`: The path to the files that will be published. Defaults to the current directory.
+- `--ignore`: A gitignore pattern of files to ignore. Specify multiple times to add multiple patterns. Defaults to just the `node_modules` directory.
+- `--publish-dir`: The path to the directory where all the files and generated artifacts will be copied to before publishing. If it is not specified, it will create a temporary directory.
+- `--build`: A flag to specify whether the webapp should be built while publishing, running the script specified in `--build-script`. Defaults to `true`.
+- `--build-script`: The name of the NPM script in your app that will be used for building the webapp.
+- `--http`: The URI for the HTTP server that will be serving your app files (e.g. localhost:1234). See [instructions on running from HTTP](#running-your-app-from-a-development-http-server) for more information.
+- `--http-served-from`: Path to the directory that the HTTP server exposes (e.g. ./dist). Some artifacts are generated and placed in this directory during the publishing process of your app.
+- `--ipfs-check`: Whether to have start IPFS if not started. Defaults to `true`.
+- `--reuse`: Whether to reuse the previous version contract and skip deployment on non-major versions. Defaults to `false`.

docs/cli-dao-commands.md

@@ -0,0 +1,212 @@
+---
+id: cli-dao-commands
+title: DAO commands
+sidebar_label: DAO commands
+---
+
+The `aragon dao` commands can be used for interacting with your DAO directly from the command line. These commands are also available directly using the `dao` alias.
+
+
+## dao new
+
+Uses a DAO Kit to create a new DAO and prints its address.
+
+```sh
+dao new
+```
+
+Options:
+- `--kit`: The aragonPM repo name of the kit that is used to create the DAO. Defaults to `bare-kit.aragonpm.eth`.
+- `--kit-version [version-number|latest]`: The version of the repo that will be used to create the DAO. Defaults to `latest`.
+- `--fn`: The function on the kit that is called to create a new DAO. Defaults to the `newBareInstance` function for `bare-kit.aragonpm.eth`.
+- `--fn-args`: The arguments that the function to create the kit is called with. Defaults to an array of arguments.
+- `--deploy-event`: The name of the event that is emitted when the DAO is created. The DAO address must be a return argument in the event log named `dao`. Defaults to `DeployInstance`.
+- `--ipfs-check`: Whether to have start IPFS if not started. Defaults to `true`.
+
+
+## dao apps
+
+Used to inspect all the installed apps in a DAO.
+
+```sh
+dao apps <dao-addr>
+```
+
+- `dao-addr`: The main address of the DAO (Kernel).
+
+Options:
+- `--all`: To include apps without permissions in the report. 
+
+## dao install
+
+The `dao install` command installs an instance of an app in the DAO.
+
+```sh
+dao install <dao-addr> <app-apm-repo> [repo-version]
+```
+
+- `dao-addr`: The main address of the DAO (Kernel).
+- `app-apm-repo`: The repo name of the app being installed (e.g. `voting` or `voting.aragonpm.eth`).
+- `repo-version`: (optional) Version of the repo that will be installed; can be a version number or `latest` for the newest published version. Defaults to `latest`.
+
+In [aragonOS](/docs/aragonos-ref.html#app-installation) an app is considered to be installed in a DAO if it uses the DAO Kernel as its Kernel and there are references to the app in the ACL of the DAO.
+
+The `dao install` command will create an instance of the app and assign permissions to the main account to perform all the protected actions in the app.
+
+Options:
+- `--app-init`: Name of the function that will be called to initialize an app. If you want to skip app initialization (which is not generally recommended), you can do it by set it to `none`. By default it will initialize the app using `initialize` function.
+- `--app-init-args`: Arguments for calling the app init function.
+- `--set-permissions`: Whether to set permissions in the app. Set it to `open` to allow `ANY_ENTITY` on all roles.
+
+> **Note**<br>
+> All app instances of the same app in a DAO must run the same version, so installing an app with a version will effectively upgrade all app instances to this version.
+
+## dao upgrade
+
+The `dao upgrade` command upgrades all instances of an app to a newer version.
+
+```sh
+dao upgrade <dao-addr> <app-apm-repo> [repo-version]
+```
+
+- `dao-addr`: The main address of the DAO (Kernel).
+- `app-apm-repo`: The repo name of the app being upgraded (e.g. `voting` or `voting.aragonpm.eth`).
+- `repo-version`: Version of the repo that the app will be upgraded to; can be a version number or `latest` for the newest published version (defaults to `latest`).
+
+aragonOS protects against having different instances of a particular app running with different versions (e.g. all the Voting app instances run the same version).  Performing a `dao upgrade` will upgrade all instances of the app to the version specified.
+
+
+## dao exec
+
+Performs transactions in your DAO directly from aragonCLI. It supports [transaction pathing](forwarding-intro.md) so if your account cannot perform the action directly it will try to find how to do it (e.g. creating a vote).
+
+```sh
+dao exec <dao-addr> <app-proxy-addr> <method> [argument1 ... argumentN]
+```
+
+- `dao-addr`: The main address of the DAO (Kernel).
+- `app-proxy-addr`: The address of the app where the action is being performed. You can find the proxy address by checking [`dao apps`](#dao-apps).
+- `method`: Name of the method being executed in the app (e.g. `withdrawTokens`).
+- `arguments`: The arguments that the method will be executed with (each separated by a space).
+
+
+## dao act
+
+Provides some syntax sugar over `dao exec` for executing actions using [Agent app](https://blog.aragon.one/aragon-agent-beta-release/) instances in a DAO.
+
+```sh
+dao act <agent-proxy> <target-addr> <method> [argument1 ... argumentN]
+```
+
+- `agent-proxy`: Address of the Agent app proxy.
+- `target-addr`: Address where the action is being executed.
+- `method`: Name of the method being executed in the app (e.g. `transfer`).
+- `arguments`: The arguments that the method will be executed with (each separated by a space).
+
+
+## dao token
+
+Commands used to create and interact with the tokens your DAO will use.
+
+### dao token new
+
+Create a new [MiniMe](https://github.com/Giveth/minime) token.
+
+```sh
+dao token new <token-name> <symbol> [decimal-units] [transfer-enabled]
+```
+- `token-name`: Full name of the new Token.
+- `symbol`: Symbol of the new Token.
+- `decimal-units`: Total decimal units the new token will use. Defaults to `18`.
+- `transfer-enabled`: Whether the new token will have transfers enabled. Defaults to `true`.
+
+
+### dao token change-controller
+
+Change the controller of a MiniMe token.
+
+```sh
+dao token change-controller <token-addr> <new-controller-addr>
+```
+
+- `token-addr`: Address of the token.
+- `new-controller-addr`: Address of the new controller.
+
+## dao acl
+
+Used to inspect the ACL state in a DAO to check its permissions.
+
+```sh
+dao acl <dao-addr>
+```
+- `dao-addr`: The main address of the DAO (Kernel).
+
+
+### dao acl create
+
+Used to create a permission in the ACL. Can only be used if the permission hasn't been created before. The `manager` of the permission can use `dao acl grant` and `dao acl revoke` to manage the permission.
+
+```sh
+dao acl create <dao-addr> <app-proxy-addr> <role> <entity> <manager>
+```
+
+- `dao-addr`: The main address of the DAO (Kernel).
+- `app-proxy-addr`: The address of the app whose permissions are being managed. You can find the proxy address by checking [`dao apps`](#dao-apps).
+- `role`: The identifier for the role. Can be the `bytes32` identifier of the role or its name (e.g. `INCREMENT_ROLE`).
+- `entity`: The address of the entity that is being granted the permission by creating it.
+- `manager`: The address of the entity that will be able to grant that permission or revoke it.
+
+
+### dao acl grant
+
+Used to grant a permission in the ACL.
+
+```sh
+dao acl grant <dao-addr> <app-proxy-addr> <role> <entity>
+```
+
+- `dao-addr`: The main address of the DAO (Kernel).
+- `app-proxy-addr`: The address of the app whose permissions are being managed. You can find the proxy address by checking [`dao apps`](#dao-apps).
+- `role`: The identifier for the role. Can be the `bytes32` identifier of the role or its name (e.g. `INCREMENT_ROLE`).
+- `entity`: The address of entity that is being granted the permission.
+
+
+### dao acl revoke
+
+Used to revoke a permission in the ACL.
+
+```sh
+dao acl revoke <dao-addr> <app-proxy-addr> <role> <entity>
+```
+
+- `dao-addr`: The main address of the DAO (Kernel).
+- `app-proxy-addr`: The address of the app whose permissions are being managed. You can find the proxy address by checking [`dao apps`](#dao-apps).
+- `role`: The identifier for the role. Can be the `bytes32` identifier of the role or its name (e.g. `INCREMENT_ROLE`).
+- `entity`: The address of entity that is being revoked the permission.
+
+
+### dao acl set-manager
+
+Used to change the manager of a permission in the ACL.
+
+```sh
+dao acl set-manager <dao-addr> <app-proxy-addr> <role> <manager>
+```
+
+- `dao-addr`: The main address of the DAO (Kernel).
+- `app-proxy-addr`: The address of the app whose permissions are being managed. You can find the proxy address by checking [`dao apps`](#dao-apps).
+- `role`: The identifier for the role. Can be the `bytes32` identifier of the role or its name (e.g. `INCREMENT_ROLE`).
+- `manager`: The new manager for the permission.
+
+
+### dao acl remove-manager
+
+Used to remove the manager of a permission in the ACL. The permission can be created again after removing its manager.
+
+```sh
+dao acl remove-manager <dao-addr> <app-proxy-addr> <role>
+```
+
+- `dao-addr`: The main address of the DAO (Kernel).
+- `app-proxy-addr`: The address of the app whose permissions are being managed. You can find the proxy address by checking [`dao apps`](#dao-apps).
+- `role`: The identifier for the role. Can be the `bytes32` identifier of the role or its name (e.g. `INCREMENT_ROLE`).

docs/cli-global-confg.md

@@ -0,0 +1,76 @@
+---
+id: cli-global-confg
+title: Global configuration
+sidebar_label: Global configuration
+---
+
+## The arapp.json file
+
+The arapp.json file contains metadata for your app. This are the fields need to be present:
+
+- `roles`: An array of all the roles that your app has. Each role has the following properties:
+  - `id`: The identifier of the role as it is defined in the contract.
+  - `name`: A description of the role in the app.
+  - `params`: The names of any parameters for the role.
+- `environments`: An object containing deploy environment configurations.
+  - `env_name`: An object containing the configuration for a specific environment. `env_name` can be any name you choose.
+    - `appName`: The ENS name of your app where the aragonPM repo can be located.
+    - `network`: The network to use for this environment.
+    - `wsRPC`: (optional) If present is used by aragon.js as its data provider.
+    - `registry`: (optional) The address of the ENS registry for this environment. Defaults to the default ENS registry for this network.
+- `path`: The path to the main contract in your app.
+
+### Example 
+
+This is the arapp.json of the app build in the [tutorial](tutorial.md) configure with rinkeby and mainnet environments.
+
+```json
+{
+  "roles": [
+    {
+      "id": "INCREMENT_ROLE",
+      "name": "Increment the counter",
+      "params": []
+    },
+    {
+      "id": "DECREMENT_ROLE",
+      "name": "Decrement the counter",
+      "params": []
+    }
+  ],
+  "environments": {
+    "default": {
+      "appName": "foo.aragonpm.eth",
+      "network": "development"
+    },
+    "aragon:rinkeby": {
+        "registry": "0x98df287b6c145399aaa709692c8d308357bc085d",
+        "wsRPC": "wss://rinkeby.eth.aragon.network/ws",
+        "network": "rinkeby"
+    },
+    "aragon:mainnet": {
+        "registry": "0x314159265dd8dbb310642f98f50c066173c1259b",
+        "wsRPC": "wss://mainnet.eth.aragon.network/ws",
+        "network": "mainnet"
+    }
+  },
+  "path": "contracts/CounterApp.sol"
+}
+```
+
+### How to use environments
+
+If you want to learn how use environments in practice check the guides to learn [how to publish in diferent environments](guides-publish.md).
+
+
+## The manifest.json file
+
+The manifest.json defines end-user specific configurations:
+
+- `name`: Human-readable name of your app.
+- `description`: Small description of the app.
+- `icons`: (optional) An array of all the icons that your app has. Each icon has the following properties:
+  - `src`: Path to the icon's image.
+  - `sizes`: Size of the icon.
+- `script`: (optional) Background script path.
+- `start_url`: Path to the starting URL.