diff options
author | Thomas Waldmann <tw@waldmann-edv.de> | 2016-07-11 01:23:27 +0200 |
---|---|---|
committer | Thomas Waldmann <tw@waldmann-edv.de> | 2016-07-11 01:23:27 +0200 |
commit | 3baa8a3728e3a94c8531edc83ae2a7e1d16e64bc (patch) | |
tree | 01f6de438c3d663bbedf3b5a982e70615faf9555 /setup.py | |
parent | f0930b89cee2e389eb33a28184e543511ccbe78e (diff) | |
parent | b8198c4ff1f1c61422ffcf32e48e15d600e5ea8a (diff) |
Merge branch '1.0-maint'
# Conflicts:
# docs/changes.rst
# docs/usage/mount.rst.inc
# src/borg/archive.py
# src/borg/archiver.py
# src/borg/fuse.py
# src/borg/testsuite/archiver.py
Diffstat (limited to 'setup.py')
-rw-r--r-- | setup.py | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -187,7 +187,7 @@ class build_usage(Command): params = {"topic": topic, "underline": '~' * len('borg help ' + topic)} doc.write(".. _borg_{topic}:\n\n".format(**params)) - doc.write("borg help {topic}\n{underline}\n::\n\n".format(**params)) + doc.write("borg help {topic}\n{underline}\n\n".format(**params)) doc.write(Archiver.helptext[topic]) else: params = {"command": command, |