Merge pull request #619 from ypid/docs-fixes-2

Docs fixes.

docs/deployment.rst

@@ -69,7 +69,7 @@ forced command and restrictions applied as shown below:
 
 The options which are added to the key will perform the following:
 
-1. Force command on the ssh key and dont allow any other command to run
+1. Force command on the ssh key and don't allow any other command to run
 2. Change working directory
 3. Run ``borg serve`` restricted at the client base path
 4. Restrict ssh and do not allow stuff which imposes a security risk
@@ -111,7 +111,7 @@ Ansible
 
 Ansible takes care of all the system-specific commands to add the user, create the
 folder. Even when the configuration is changed the repository server configuration is
-satisfied and reproducable.
+satisfied and reproducible.
 
 Automate setting up an repository server with the user, group, folders and
 permissions a Ansible playbook could be used. Keep in mind the playbook
@@ -158,7 +158,7 @@ autodetect it runs under SSH by checking the `SSH_ORIGINAL_COMMAND` environment
 variable. This is left open for future improvements.
 
 When extending ssh autodetection in borg no external wrapper script is necessary
-and no other interpreter or apllication has to be deployed.
+and no other interpreter or application has to be deployed.
 
 See also
 --------

docs/usage.rst

@@ -251,7 +251,7 @@ Examples
     # Backup the root filesystem into an archive named "root-YYYY-MM-DD"
     # use zlib compression (good, but slow) - default is no compression
     NAME="root-`date +%Y-%m-%d`"
-    $ borg create -C zlib,6 /mnt/backup::$NAME / --do-not-cross-mountpoints
+    $ borg create -C zlib,6 /mnt/backup::$NAME / --one-file-system
 
     # Make a big effort in fine granular deduplication (big chunk management
     # overhead, needs a lot of RAM and disk space, see formula in internals
@@ -381,7 +381,7 @@ Examples
     Hostname: myhostname
     Username: root
     Time: Fri Aug  2 15:18:17 2013
-    Command line: /usr/bin/borg create --stats -C zlib,6 /mnt/backup::root-2013-08-02 / --do-not-cross-mountpoints
+    Command line: /usr/bin/borg create --stats -C zlib,6 /mnt/backup::root-2013-08-02 / --one-file-system
     Number of files: 147429
     Original size: 5344169493 (4.98 GB)
     Compressed size: 1748189642 (1.63 GB)