Merge lp:~vila/otto/doc-fixes into lp:otto

[Vincent Ladeuil]

Doc fixes.

A couple of simple doc fixes that were taking dust on my drive.

The lxc chmod bits has already striked thrice in ci so it seems more people will encounter it in the future.

[Jean-Baptiste Lallement (jibel)]

Approved

review: Approve

=== modified file 'doc/README'
--- doc/README	2013-10-30 09:26:00 +0000
+++ doc/README	2013-11-25 16:37:05 +0000
@@ -23,6 +23,14 @@
     $ sudo apt-get install bzr --no-install-recommends
     $ sudo apt-get install python3-lxc aufs-tools
 
+    On 14.04 (Trusty Tahr):
+
+    $ sudo chmod 755 /var/cache/lxc
+    $ sudo chmod 755 /var/lib/lxc
+
+    See https://bugs.launchpad.net/ubuntu/+source/lxc/+bug/1244635 for
+    rationale.
+
   * If you don't want to call otto with the full path of the checkout, you
     can put it into $PATH with (running in your otto checkout/branch):
     $ mkdir ~/bin
 
=== modified file 'ottolib/commands.py'
--- ottolib/commands.py	2013-05-30 08:50:31 +0000
+++ ottolib/commands.py	2013-11-25 16:37:05 +0000
@@ -70,7 +70,7 @@
                                   "image will be extracted and used as rootfs")
         pcreate.add_argument("--local-config",
                             default=None,
-                            help="Use a local configuration file. This one will be reuse until you specify --no-local-config")
+                            help="Use a local configuration file. This one will be reused until you specify --no-local-config")
         pcreate.add_argument('-D', '--force-disconnect', action='store_true',
                             default=False,
                             help="Forcibly shutdown lightdm even if a session "
@@ -106,7 +106,7 @@
                             help="Restore a previous the run state from an archive")
         pstart.add_argument("--local-config",
                             default=None,
-                            help="Use a local configuration file. This one will be reuse until you specify --no-local-config")
+                            help="Use a local configuration file. This one will be reused until you specify --no-local-config")
         pstart.add_argument("--no-local-config", action='store_true',
                             default=None,
                             help="Remove previously used local configuration file.")