diff options
| -rw-r--r-- | NEWS | 16 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/copyright | 2 | ||||
| -rw-r--r-- | manual/de/160-tuning.mdwn | 2 | ||||
| -rw-r--r-- | manual/en/140-troubleshooting.mdwn | 2 | ||||
| -rw-r--r-- | manual/en/160-tuning.mdwn | 2 | ||||
| -rw-r--r-- | manual/fr/140-troubleshooting.mdwn | 2 | ||||
| -rw-r--r-- | manual/fr/160-tuning.mdwn | 2 | ||||
| -rw-r--r-- | obnamlib/fmt_6/clientmetadatatree.py | 2 | ||||
| -rw-r--r-- | obnamlib/fmt_ga/dirobj_tests.py | 2 | ||||
| -rw-r--r-- | obnamlib/plugins/backup_plugin.py | 2 | ||||
| -rw-r--r-- | obnamlib/plugins/fsck_plugin.py | 2 | ||||
| -rw-r--r-- | obnamlib/plugins/gaconfig_plugin.py | 2 | ||||
| -rw-r--r-- | obnamlib/repo_interface.py | 2 | ||||
| -rw-r--r-- | obnamlib/whole_file_checksummer.py | 2 | ||||
| -rw-r--r-- | yarns/0030-basics.yarn | 2 | ||||
| -rw-r--r-- | yarns/0080-verify.yarn | 2 | ||||
| -rw-r--r-- | yarns/9000-implements.yarn | 6 |
18 files changed, 30 insertions, 28 deletions
@@ -32,6 +32,8 @@ Bug fixes: * The manual and manual page used to claim you could break only the locks for one client. This was not true. The manuals has been fixed. +* A whole bunch of typo fixes, from Andrea Gelmini. + Version 1.19.1, released 2016-01-30 --------------------------------- @@ -78,7 +80,7 @@ Version 1.18.2, released 2015-11-15 Bug fixes: -* The `--exclude-caches` option now works correctly again. Prevoiusly +* The `--exclude-caches` option now works correctly again. Previously it would exclude a cache directory, but would scan through and back up the contents of the cache directory. As a result, the backup generation would be much bigger, but have hidden files, not visible @@ -103,7 +105,7 @@ Bug fixes: * William Boughton fixed parsing for sftp URLs with IPv6 addresses. Previously, `sftp://[::1]` would be interpreted by Obnam as an address `[` followed by the port `:1]`, but now it is correctly - interpreted as the adddress `::1` and no explicit port. + interpreted as the address `::1` and no explicit port. * Ian Campbell fixed a bug in the kdirstat plugin, improving the handling of unknown file types. @@ -148,7 +150,7 @@ Version 1.16, released 2015-09-06 gets run automatically by the test suite. This includes a fix in `exclude_pathnames_plugin.py` to add a missing - import and fix variable namaes, by Diane Trout. A similar fix was + import and fix variable names, by Diane Trout. A similar fix was also contributed by Mesar Hameed. * Lukáš Poláček fixed an unlocking problem when GnuPG fails during an @@ -572,7 +574,7 @@ Bug fixes: extra files, such as "lock" (left there by a previous, crashed Obnam run). It no longer does. Fix by Lars Kruse. -* The SFTP plugin now handles another error code (EACCESS) when writing +* The SFTP plugin now handles another error code (EACCES) when writing a file and the directory it should go into not existing. Patch by Armin Größlinger. @@ -649,7 +651,7 @@ Bug fixes: `add-key` and `remove-key` subcommands. Reported by Lars Kruse. * Restoring symlinks as root would fail. Reported and fixed by David Fries. -* Only set ssh user/port if explicitily requested, otherwise let ssh +* Only set ssh user/port if explicitly requested, otherwise let ssh select them. Reported by Michael Goetze, fixed by David Fries. * Fix problem with old version of paramiko and chdir. Fixed by Nick Altmann. * Fix problems with signed vs unsigned values for struct stat fields. @@ -731,7 +733,7 @@ Bug fixes: with `/~/` which already exist without crashing. * Character and block device nodes are now restored correctly. Thanks to Martin Dummer for the bug report. -* The symmteric key for a toplevel repository directory is re-encrypted +* The symmetric key for a toplevel repository directory is re-encrypted when a public key is added or removed to the toplevel using the `add-key` or `remove-key` subcommands. * Manual page typo fix. Thanks, Steve Kemp. @@ -963,7 +965,7 @@ INTERNAL CHANGES: * Got rid of terminal status plugin. Now, the `Application` class provides a `ttystatus.TerminalStatus` instance instead, in the `ts` attribute. - Other plugings are supposed to use that for progress reporting and + Other plugins are supposed to use that for progress reporting and messaging to the user. * The `posix_fadvise` system call is used only if available. This should improve Obnam's portability a bit. diff --git a/debian/changelog b/debian/changelog index f87b5889..fbbdb47b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -135,7 +135,7 @@ obnam (1.7.2-1) unstable; urgency=low * Drop dependency on python-yaml, since yaml is no longer used. * Drop python-coverage-test-runner build-dependency to 0.8, which is in Debian. Newer upstream versions have no functional changes, so - are not uploaded to Debian. This should allow Debian buildds to + are not uploaded to Debian. This should allow Debian builds to build the package. * debian/control: Update format and source URLs. @@ -193,7 +193,7 @@ obnam (1.4-1) unstable; urgency=low * New upstream release. * Bump python-larch, python-ttystatus, python-cliapp, summain, - and cmdtest depenencies to current versions. + and cmdtest dependencies to current versions. -- Lars Wirzenius <liw@liw.fi> Sat, 16 Mar 2013 11:29:12 +0000 @@ -363,7 +363,7 @@ obnam (0.22-2) unstable; urgency=low obnam (0.22-1) unstable; urgency=low * New upstream release. - * debian/control: Update versioned depedendency on python-cliapp. Upstream + * debian/control: Update versioned dependency on python-cliapp. Upstream now uses the dump_config feature in cliapp 0.18. -- Lars Wirzenius <liw@liw.fi> Thu, 25 Aug 2011 08:31:10 +0100 diff --git a/debian/copyright b/debian/copyright index 71e99882..dcc8a9f4 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,6 +1,6 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: obnam -Upstream-Contect: Lars Wirzenius <liw@liw.fi> +Upstream-Contact: Lars Wirzenius <liw@liw.fi> Source: http://obnam.org/ Files: * diff --git a/manual/de/160-tuning.mdwn b/manual/de/160-tuning.mdwn index f1d03641..30189bb5 100644 --- a/manual/de/160-tuning.mdwn +++ b/manual/de/160-tuning.mdwn @@ -32,7 +32,7 @@ installiert: Wenn Sie den Profiler installiert haben, können Sie Obnam wie folgt starten: - OBNAM_PROFILE=backup.prof obnam bsckup + OBNAM_PROFILE=backup.prof obnam backup So werden die Profiling-Daten in die Daten `backup.prof` geschrieben. Sie können das natürlich mit jedem Obnamm so tun und in ein beliebiges Feil schreiben diff --git a/manual/en/140-troubleshooting.mdwn b/manual/en/140-troubleshooting.mdwn index 02d81889..d3b4a5d5 100644 --- a/manual/en/140-troubleshooting.mdwn +++ b/manual/en/140-troubleshooting.mdwn @@ -37,7 +37,7 @@ do!), including the following information is helpful and makes it easier to figure out what the problem is. * You should report problems to the `obnam-support@obnam.org` mailing - list. This is a publically archived mailing list where various + list. This is a publicly archived mailing list where various people help others use Obnam. * What is the problem? What did you try to achieve? What actually diff --git a/manual/en/160-tuning.mdwn b/manual/en/160-tuning.mdwn index 160caab7..1fe21732 100644 --- a/manual/en/160-tuning.mdwn +++ b/manual/en/160-tuning.mdwn @@ -30,7 +30,7 @@ the following, you have not got the profiler installed: Once you have the profiler installed, run Obnam like this: - OBNAM_PROFILE=backup.prof obnam bsckup + OBNAM_PROFILE=backup.prof obnam backup This will cause the profiling data to be written to the file `backup.prof`. You can do this for any Obnam command, and write it to diff --git a/manual/fr/140-troubleshooting.mdwn b/manual/fr/140-troubleshooting.mdwn index 02d81889..d3b4a5d5 100644 --- a/manual/fr/140-troubleshooting.mdwn +++ b/manual/fr/140-troubleshooting.mdwn @@ -37,7 +37,7 @@ do!), including the following information is helpful and makes it easier to figure out what the problem is. * You should report problems to the `obnam-support@obnam.org` mailing - list. This is a publically archived mailing list where various + list. This is a publicly archived mailing list where various people help others use Obnam. * What is the problem? What did you try to achieve? What actually diff --git a/manual/fr/160-tuning.mdwn b/manual/fr/160-tuning.mdwn index 160caab7..1fe21732 100644 --- a/manual/fr/160-tuning.mdwn +++ b/manual/fr/160-tuning.mdwn @@ -30,7 +30,7 @@ the following, you have not got the profiler installed: Once you have the profiler installed, run Obnam like this: - OBNAM_PROFILE=backup.prof obnam bsckup + OBNAM_PROFILE=backup.prof obnam backup This will cause the profiling data to be written to the file `backup.prof`. You can do this for any Obnam command, and write it to diff --git a/obnamlib/fmt_6/clientmetadatatree.py b/obnamlib/fmt_6/clientmetadatatree.py index 4417d2d8..f4fa96d6 100644 --- a/obnamlib/fmt_6/clientmetadatatree.py +++ b/obnamlib/fmt_6/clientmetadatatree.py @@ -109,7 +109,7 @@ class ClientMetadataTree(obnamlib.RepositoryTree): * the subkey type (8 bits) * type subkey (64 bits) - These are catenated. + These are concatenated. mainhash must be a string of 8 bytes. diff --git a/obnamlib/fmt_ga/dirobj_tests.py b/obnamlib/fmt_ga/dirobj_tests.py index 7c223e3d..648f8a50 100644 --- a/obnamlib/fmt_ga/dirobj_tests.py +++ b/obnamlib/fmt_ga/dirobj_tests.py @@ -95,7 +95,7 @@ class GADirectoryTests(unittest.TestCase): dir_obj.get_file_key('README', obnamlib.REPO_FILE_MODE), 0123) - def test_raises_error_if_muutable_and_file_key_is_set(self): + def test_raises_error_if_mutable_and_file_key_is_set(self): dir_obj = obnamlib.GADirectory() dir_obj.add_file('README') dir_obj.set_immutable() diff --git a/obnamlib/plugins/backup_plugin.py b/obnamlib/plugins/backup_plugin.py index 13334432..97d2673f 100644 --- a/obnamlib/plugins/backup_plugin.py +++ b/obnamlib/plugins/backup_plugin.py @@ -290,7 +290,7 @@ class BackupPlugin(obnamlib.ObnamPlugin): self.repo.commit_client(self.client_name) self.repo.unlock_client(self.client_name) - self.progress.what(prefix + ': commiting shared chunk indexes') + self.progress.what(prefix + ': committing shared chunk indexes') self.repo.commit_chunk_indexes() self.progress.what(prefix + ': removing unused chunks') diff --git a/obnamlib/plugins/fsck_plugin.py b/obnamlib/plugins/fsck_plugin.py index d8e15cf7..f3980cc7 100644 --- a/obnamlib/plugins/fsck_plugin.py +++ b/obnamlib/plugins/fsck_plugin.py @@ -259,7 +259,7 @@ class FsckPlugin(obnamlib.ObnamPlugin): self.app.settings.string_list( ['fsck-ignore-client'], - 'do not check repository data for cient NAME', + 'do not check repository data for client NAME', metavar='NAME', group=group) diff --git a/obnamlib/plugins/gaconfig_plugin.py b/obnamlib/plugins/gaconfig_plugin.py index 251cfce7..06839864 100644 --- a/obnamlib/plugins/gaconfig_plugin.py +++ b/obnamlib/plugins/gaconfig_plugin.py @@ -34,7 +34,7 @@ class FormatGreenAlbatrossConfigPlugin(obnamlib.ObnamPlugin): self.app.settings.bytesize( ['dir-bag-size'], - 'approximage maximum size of bags combining many DIR objects', + 'approximate maximum size of bags combining many DIR objects', metavar='SIZE', default=obnamlib.DEFAULT_DIR_BAG_BYTES, group=ga_group) diff --git a/obnamlib/repo_interface.py b/obnamlib/repo_interface.py index ab8d6960..94086902 100644 --- a/obnamlib/repo_interface.py +++ b/obnamlib/repo_interface.py @@ -1527,7 +1527,7 @@ class RepositoryInterfaceTests(unittest.TestCase): # pragma: no cover self.repo.get_client_generation_ids('fooclient'), [new_id]) - def test_returns_direcotry_name_for_extra_data(self): + def test_returns_directory_name_for_extra_data(self): self.setup_client() self.assertTrue( type(self.repo.get_client_extra_data_directory('fooclient')), diff --git a/obnamlib/whole_file_checksummer.py b/obnamlib/whole_file_checksummer.py index 78c6d06b..6c4aa5df 100644 --- a/obnamlib/whole_file_checksummer.py +++ b/obnamlib/whole_file_checksummer.py @@ -29,7 +29,7 @@ class WholeFileCheckSummer(object): in the file. For everything else, compute the checksum from (size, checksum) pairs for all the chunks in the file. This convoluted thing is because the latter is necessary for speed, and the former - is necessary for backwards compatibilty. + is necessary for backwards compatibility. ''' diff --git a/yarns/0030-basics.yarn b/yarns/0030-basics.yarn index 147fc13c..226ec2a8 100644 --- a/yarns/0030-basics.yarn +++ b/yarns/0030-basics.yarn @@ -67,7 +67,7 @@ We need to ensure Obnam can handle anything it encounters, on any supported platform. That is the purpose of the scenarios in this section. There are some limitations, though: the test suite is not run as the `root` user, and thus we don't deal with filesystem objects -that require priviledged operations such as device node creation. We +that require privileged operations such as device node creation. We also don't, in these scenarios, handle multiple filesystem types: the test suite should, instead, be run multiple types, with `TMPDIR` set to point at a different filesystem type each time: we leave that to diff --git a/yarns/0080-verify.yarn b/yarns/0080-verify.yarn index 1859abe4..1d33cf15 100644 --- a/yarns/0080-verify.yarn +++ b/yarns/0080-verify.yarn @@ -42,7 +42,7 @@ Verify notices when live data file has been appended to ------------------------------------------------------- In March, 2015, Thomas Waldemann noticed that `obnam verify` would -fail to notice if the live data file had been appened to. This +fail to notice if the live data file had been appended to. This regression test catches the problem. SCENARIO verify file that has been appended to diff --git a/yarns/9000-implements.yarn b/yarns/9000-implements.yarn index a1f313bf..1ae52444 100644 --- a/yarns/9000-implements.yarn +++ b/yarns/9000-implements.yarn @@ -258,7 +258,7 @@ Scenarios involving encryption may also use a private keyring directory. add_to_config "$MATCH_1" encrypt-with "$MATCH_2" -Encryption scenarions, at least, also need users that pretend to be +Encryption scenarios, at least, also need users that pretend to be someone else. IMPLEMENTS GIVEN a user (\S+) calling themselves (\S+) @@ -433,7 +433,7 @@ Check that there are no checkpoint generations. IMPLEMENTS THEN user (\S+) sees no checkpoint generations in repository (\S+) run_obnam "$MATCH_1" generations -r "$DATADIR/$MATCH_2" \ > "$DATADIR/generation.list" - if grep checkoint "$DATADIR/generation.list" + if grep checkpoint "$DATADIR/generation.list" then echo "Can see checkpoint generations!" 1>&2 exit 1 @@ -671,7 +671,7 @@ Some tests won't work correctly when `root` is running them. test "$(id -u)" != 0 For testing FUSE stuff, we need to check that the relevant stuff is -avaialble. Previously, we did this by checking that the user running +available. Previously, we did this by checking that the user running the test suite was in the group `fuse`, but that turns out to have been a Debianism (removed in the Debian `jessie` release). A better check is to check that the `fusermount` command is available. |