Merge branch 'master' into 'master'

minor syntax changes

See merge request Obarun/66!55

doc/66-tree.md

@@ -41,19 +41,19 @@ This command handles a directory containing a set of *services*.
 
 - **-n** : creates a new empty *tree*. The new *tree* ***must*** not exist on the system.
 
-- **-a** *user* : allows *user* to deal with the given *tree*. ***Must*** match an existing username on the system. Several users can be allowed by separating their names with a comma. Any *user* not explicitly allowed is automatically denied for the given *tree*. By default the *user* issuing the command is automatically allowed when the tree is created.—This option sets the UID and GID of the service database at compilation time.
+- **-a** *user* : allows *user* to configure the given *tree*. ***Must*** match an existing username on the system. Several users can be allowed by separating their names with a comma. Any *user* not explicitly allowed is automatically denied for configuring the given *tree*. By default the *user* issuing the command is automatically allowed when the tree is created.—This option sets the UID and GID of the service database at compilation time.
 
-- **-d** *user* : denies *user* to deal with the specified *tree*. ***Must*** match an existing username on the system. Several users can be denied by separating their names with a comma.—Useful to revoke access that has been given before with **-a**.
+- **-d** *user* : denies *user* to configure the specified *tree*. ***Must*** match an existing username on the system. Several users can be denied by separating their names with a comma. —Useful in revoking access that has been given before with **-a**.
 
-- **-c** : makes tree the current *tree* to use by default with other *66* tools. The majority of commands in the *66* tools suite have a **-t** option to specify the *tree* to use. By setting *tree* as the current one all other *66* tools will use it by default. You can see which *tree* is the current one with the [66-intree](66-intree.html) tool.
+- **-c** : makes tree the current *tree* to use by default with other *66* tools. The majority of commands in the *66* tools suite have a **-t** option to specify the *tree* to use. By setting *tree* as the current one all other *66* tools will use it by default when a tree is not specified with the use of the -t tag. You can see which *tree* is the current one with the [66-intree](66-intree.html) tool.
 
-- **-S** *after_tree* : Start the *tree* **after** *after_tree*. This tells [66-all](66-all.html) the specific order in which the start process is applied. *after_tree* and *tree* ***must*** be already enabled. You can combine this options directly with the **-E** option at *tree* creation time. **Note**: If *after_tree* and *tree* have the same name, this *tree* will be the very first tree to start.
+- **-S** *after_tree* : Start the *tree* **after** *after_tree*. This tells [66-all](66-all.html) the specific order in which to start *enabled* trees. *after_tree* and *tree* ***must*** already be enabled. You can combine these options directly with the **-E** option at *tree* creation time. **Note**: If *after_tree* and *tree* have the same name, this *tree* will be the very first tree to start.
 
-- **-E** : enables *tree*. This allows the [66-all](66-all.html) tool to know which *tree* needs to be started. If the given *tree* is enabled, all *services* in that *tree* will be started when you use the [66-all](66-all.html) tool.
+- **-E** : enables *tree*. This allows the [66-all](66-all.html) tool to know which *tree* needs to be started. If the given *tree* is enabled, all *services* in that *tree* will be started.
 
-- **-D** : disables *tree*. The exact opposite of the **-E** option.
+- **-D** : disables *tree*. The exact opposite of the **-E** option.  The *tree* remains as is, but can only be started manually with [66-all](66-all.html).
 
-- **-R** : deletes *tree*. ***Can not be undone!*** This will completely remove the given *tree* from the system! You will not be able to retrieve any information of the deleted *tree* after deleting it. Services currently running on tree will be not bringed down before remove it. To do so, use the **-U** option in conjonction e.g. `66-tree -UR tree`.
+- **-R** : deletes *tree*. ***Can not be undone!*** This will completely remove the given *tree* from the system! You will not be able to retrieve any information of the deleted *tree* after deleting it. Services currently running on tree will not be brought down before removing it. To do so, use the **-U** option in conjonction e.g. `66-tree -UR tree`.
 
 - **-C** *clone* : makes a strict copy of *tree* named clone. Clone **must not** exist on the system.
 
@@ -67,7 +67,7 @@ The usefulness of having several trees with different services can be explained
     Tree3 contains xorg, notification-daemon, gvfsd & dbus
 ```
 
-When you boot your machine and want to use it from console only, you don't care about xorg or cups, you only care about a working internet connection. So at the base you only have Tree1 enabled. At every boot this tree and all its services will now be automatically started. Then you need to print something but for this, you also need to start the nfs daemon because your document is on some other server. Normally you would need to start cups then start nfs. Using the concept of trees you start Tree2 and everything is available. When you have finished printing your awesome document instead of stopping the needed services one by one you simply stop the whole Tree2 and all its containing services are stopped automatically. This doesn't stop here. Now you want to see a video, you need a running X server and probably several other services. Tree3 was designed just for that.
+When you boot your machine and want to use it from console only, you don't care about xorg or cups, you only care about a working internet connection. So at the base you only have Tree1 enabled. At every boot this tree and all its services will now be automatically started. Then you need to print something but for this, you also need to start the nfs daemon because your document is on another server. Normally you would need to start cups then star nfs. Using the concept of trees you start Tree2 and everything is available. When you have finished printing your document,  instead of stopping the needed services one by one you simply stop Tree2, and all its containing services are stopped automatically. This doesn't stop here. Now you want to see a video, you need a running X server and probably several other services. Tree3 was designed just for that.
 
 ## Directories and files
 
@@ -90,4 +90,3 @@ As an example for root the resulting files would, by default, be found at `%%sys
 When you ask to start all *services* of the currently enabled tree at once with the [66-all](66-all.html) tool, the directory `%%system_dir%%/system/tree/servicedirs/svc` is opened and the command will start any *service* found inside of that directory.
 
 For *services* of type `bundle`,`module` and `atomic`, instead of opening the directory `%%system_dir%%/system/tree/servicedirs/db/source`, the corresponding compiled database found at `%%system_dir%%/system/tree/servicedirs/db/tree` is used. The database found at this location is the result of an automatic use of the command [s6-rc-compile](https://skarnet.org/software/s6-rc/s6-rc-compile.html) when enabling such a *service*.
-