summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Fries <David@Fries.net>2014-08-19 12:48:18 -0500
committerLars Wirzenius <liw@liw.fi>2014-09-02 18:16:59 +0100
commitbc4be83936614631ab55f40ffeba10001f38ea77 (patch)
tree222a1f3660e8ce8ebe11766376c31672c6212751
parentc1b5b4e681a273dadd406c6b33bbe0226b7cf1ca (diff)
downloadobnam-bc4be83936614631ab55f40ffeba10001f38ea77.tar.gz
update README now that --fast has been removed
`chmod -x setup.py` it already had the required #!/usr/bin/env python
-rw-r--r--README9
-rw-r--r--manual/en/020-concepts.mdwn2
-rwxr-xr-x[-rw-r--r--]setup.py0
3 files changed, 6 insertions, 5 deletions
diff --git a/README b/README
index 192d783b..647d87b3 100644
--- a/README
+++ b/README
@@ -45,9 +45,10 @@ above list is maintained manually and may get out of date from time
to time.)
If you want to run obnam from the repository directory (rather than installing
-it), you need to do some setup. Run `./check --fast`. You'll need dev files
-for python and the Coverage Test Runner python module (on Debian, those are the
-python-dev and python-coverage-test-runner packages).
+it), you need to do some setup. Run `./check --unit-tests` for setup and
+to verify with unit tests or `./check --help` to setup without any tests.
+You'll need dev files for python and the Coverage Test Runner python module (on
+Debian, those are the python-dev and python-coverage-test-runner packages).
Use
---
@@ -80,7 +81,7 @@ to master when the changes are done and considered good.
To build and run automatic tests:
./check
- ./check --fast # unit tests only, no black box tests
+ ./check --unit-tests # unit tests only, no black box tests
./check --network # requires ssh access to localhost
`check` is a wrapper around `python setup.py`, but since using that
diff --git a/manual/en/020-concepts.mdwn b/manual/en/020-concepts.mdwn
index 46cb5d5e..c367bc16 100644
--- a/manual/en/020-concepts.mdwn
+++ b/manual/en/020-concepts.mdwn
@@ -277,7 +277,7 @@ Glossary
* **off-site backup**: a backup repository stored physically far away
from the live data
* **precious data**: all the data you care about; cf. live data
-* **repository**: the location where are backups are stored
+* **repository**: the location where backup data is stored
* **restore**: retrieving data from a backup repository
* **root**, **backup root**: a directory that is to be backed up,
including all files in it, and all its subdirectories
diff --git a/setup.py b/setup.py
index f9a8dd4d..f9a8dd4d 100644..100755
--- a/setup.py
+++ b/setup.py