From d8bf7f9994121aabd4ee142538fd0f7758284de9 Mon Sep 17 00:00:00 2001 From: Philipp Storz Date: Wed, 2 Oct 2019 08:49:26 +0200 Subject: [PATCH] spelling: fixed the wrong "backuped" to "backed up" We have the word backuped in many places while the correct spelling is "backed up". This commit fixes this. See: https://en.wiktionary.org/wiki/backuped backuped: simple past tense and past participle of backup, Misspelling of backed up. --- core/README.NDMP | 6 +++--- core/src/dird/ndmp_dma_generic.cc | 2 +- core/src/dird/ndmp_dma_restore_NDMP_BAREOS.cc | 2 +- core/src/filed/accurate.cc | 2 +- core/src/filed/fd_plugins.cc | 2 +- core/src/findlib/shadowing.cc | 2 +- core/src/plugins/filed/BareosFdPluginLDAP.py | 2 +- .../bareos-dir.d/fileset/plugin-cephfs.conf.example | 2 +- core/src/plugins/filed/python-fd.cc | 2 +- core/src/plugins/filed/python-fd.h | 2 +- docs/manuals/source/Appendix/BackwardCompatibility.rst | 2 +- docs/manuals/source/Appendix/Howtos.rst | 2 +- docs/manuals/source/DeveloperGuide/api.rst | 6 +++--- docs/manuals/source/TasksAndConcepts/CatalogMaintenance.rst | 2 +- .../TasksAndConcepts/FileDeduplicationUsingBaseJobs.rst | 2 +- .../source/TasksAndConcepts/NdmpBackupsWithBareos.rst | 6 +++--- regress/tests/1-example-test | 2 +- regress/tests/2drive-2disk | 2 +- regress/tests/2drive-2job-test | 2 +- regress/tests/2drive-3pool-test | 2 +- regress/tests/2drive-concurrent-test | 2 +- regress/tests/2drive-incremental-2disk | 2 +- regress/tests/2drive-offline-test | 2 +- regress/tests/2drive-swap-test | 2 +- regress/tests/accurate-test | 2 +- regress/tests/acl-xattr-test | 2 +- regress/tests/action-on-purge-test | 2 +- regress/tests/allowcompress-test | 2 +- regress/tests/always-incremental-test | 2 +- regress/tests/ansi-label-tape | 2 +- regress/tests/auto-label-test | 2 +- .../tests/backup-bareos-client-initiated-connection-test | 2 +- regress/tests/backup-bareos-passive-test | 2 +- regress/tests/backup-bareos-tape | 2 +- regress/tests/backup-bareos-test | 2 +- regress/tests/backup-to-null | 2 +- regress/tests/backup-win32-tape | 2 +- regress/tests/bad-label-changer | 2 +- regress/tests/base-job-test | 2 +- regress/tests/bextract-test | 2 +- regress/tests/big-fileset-test | 2 +- regress/tests/big-virtual-changer-test | 2 +- regress/tests/big-vol-test | 2 +- regress/tests/block-size-tape | 2 +- regress/tests/broken-media-bug-2-test | 2 +- regress/tests/broken-media-bug-test | 2 +- regress/tests/bscan-fast-tape | 2 +- regress/tests/bscan-tape | 2 +- regress/tests/bscan-test | 2 +- regress/tests/bsr-opt-test | 2 +- regress/tests/bsr-read-test | 2 +- regress/tests/bug-1227 | 2 +- regress/tests/bug-897 | 2 +- regress/tests/bvfs-test | 2 +- regress/tests/comment-test | 2 +- regress/tests/compress-encrypt-test | 2 +- regress/tests/compressed-test | 2 +- regress/tests/copy-job-test | 2 +- regress/tests/copy-jobspan-test | 2 +- regress/tests/copy-time-test | 2 +- regress/tests/copy-uncopied-test | 2 +- regress/tests/copy-upgrade-test | 2 +- regress/tests/copy-volume-test | 2 +- regress/tests/data-encrypt-aes256-test | 2 +- regress/tests/data-encrypt-blowfish-test | 2 +- regress/tests/data-encrypt-camellia256-test | 2 +- regress/tests/data-encrypt-test | 2 +- regress/tests/dbcheck-test | 2 +- regress/tests/debug-test | 2 +- regress/tests/delete-test | 2 +- regress/tests/differential-test | 2 +- regress/tests/duplicate-job-test | 2 +- regress/tests/eighty-simultaneous-jobs-tape | 2 +- regress/tests/eot-fail-tape | 2 +- regress/tests/errors-test | 2 +- regress/tests/estimate-test | 2 +- regress/tests/exclude-dir-test | 2 +- regress/tests/fast-two-pool-test | 2 +- regress/tests/fileregexp-test | 2 +- regress/tests/fileset-multiple-include-blocks | 2 +- regress/tests/fileset-multiple-options-blocks | 2 +- regress/tests/fixed-block-size-tape | 2 +- regress/tests/four-concurrent-jobs-tape | 2 +- regress/tests/four-concurrent-jobs-test | 2 +- regress/tests/four-jobs-tape | 2 +- regress/tests/four-jobs-test | 2 +- regress/tests/incremental-2disk | 2 +- regress/tests/incremental-2media | 2 +- regress/tests/incremental-2media-tape | 2 +- regress/tests/incremental-changer | 2 +- regress/tests/incremental-tape | 2 +- regress/tests/incremental-test | 2 +- regress/tests/lan-addr-test | 2 +- regress/tests/lan-addr-test-passive | 2 +- regress/tests/lz4-encrypt-test | 2 +- regress/tests/lz4-test | 2 +- regress/tests/lz4hc-encrypt-test | 2 +- regress/tests/lz4hc-test | 2 +- regress/tests/lzfast-encrypt-test | 2 +- regress/tests/lzfast-test | 2 +- regress/tests/lzo-encrypt-test | 2 +- regress/tests/lzo-test | 2 +- regress/tests/manual-two-vol-tape | 2 +- regress/tests/maxbytes-test | 2 +- regress/tests/maxruntime-test | 2 +- regress/tests/maxtime-test | 2 +- regress/tests/maxuseduration-test | 2 +- regress/tests/maxvol-test | 2 +- regress/tests/maxvol2-test | 2 +- regress/tests/memory-bug-tape | 2 +- regress/tests/messages-test | 2 +- regress/tests/migration-job-purge-test | 2 +- regress/tests/migration-job-test | 2 +- regress/tests/migration-jobspan-test | 2 +- regress/tests/migration-occupancy-test | 2 +- regress/tests/migration-time-test | 2 +- regress/tests/migration-volume-sd-sd-test | 2 +- regress/tests/migration-volume-test | 2 +- regress/tests/multi-drive-group-test | 2 +- regress/tests/multi-drive-test | 2 +- regress/tests/multi-drive1-test | 2 +- regress/tests/multi-storage-test | 2 +- regress/tests/multi2-storage-test | 2 +- regress/tests/prune-base-job-test | 2 +- regress/tests/prune-config-test | 2 +- regress/tests/prune-copy-test | 2 +- regress/tests/prune-migration-test | 2 +- regress/tests/prune-test | 2 +- regress/tests/query-test | 2 +- regress/tests/recycle-test | 2 +- regress/tests/relabel-tape | 2 +- regress/tests/rerun-test | 2 +- regress/tests/restart-accurate-job-test | 2 +- regress/tests/restart-base-job-test | 2 +- regress/tests/restart-job-test | 2 +- regress/tests/restore-by-file-tape | 2 +- regress/tests/restore-by-file-test | 2 +- regress/tests/restore-disk-seek-test | 4 ++-- regress/tests/restore-seek-tape | 4 ++-- regress/tests/restore2-by-file-test | 2 +- regress/tests/runscript-test | 2 +- regress/tests/scratch-pool-test | 2 +- regress/tests/scratchpool-pool-test | 2 +- regress/tests/scsi-crypto-test | 2 +- regress/tests/short-incremental-test | 2 +- regress/tests/small-file-size-tape | 2 +- regress/tests/source-addr-test | 2 +- regress/tests/span-vol-test | 2 +- regress/tests/sparse-autoxflate-test | 2 +- regress/tests/sparse-compressed-test | 2 +- regress/tests/sparse-encrypt-test | 2 +- regress/tests/sparse-file-test | 2 +- regress/tests/sparse-lzo-test | 2 +- regress/tests/sparse-test | 2 +- regress/tests/status-schedule-test | 2 +- regress/tests/strip-test | 2 +- regress/tests/subscription-test | 2 +- regress/tests/test-plugin-test | 2 +- regress/tests/three-pool-recycle-test | 2 +- regress/tests/three-pool-test | 2 +- regress/tests/tls-client-initiated-connection-backup-test | 2 +- regress/tests/tls-duplicate-job-test | 2 +- regress/tests/tls-passive-test | 2 +- regress/tests/tls-test | 2 +- regress/tests/truncate-bug-tape | 2 +- regress/tests/truncate-command-test | 2 +- regress/tests/two-jobs-test | 2 +- regress/tests/two-pool-changer | 2 +- regress/tests/two-pool-test | 2 +- regress/tests/two-vol-test | 2 +- regress/tests/two-volume-changer | 2 +- regress/tests/two-volume-test | 2 +- regress/tests/verify-cat-test | 2 +- regress/tests/verify-vol-tape | 2 +- regress/tests/verify-vol-test | 2 +- regress/tests/verify-voltocat-test | 2 +- regress/tests/virtual-backup-test | 2 +- regress/tests/virtual-backup2-test | 2 +- regress/tests/virtual-changer-test | 2 +- regress/tests/virtualfull-extreme-concurrency-bug-test | 2 +- regress/tests/vol-duration-changer | 2 +- regress/tests/win32-backup-tape | 2 +- regress/tests/win32-to-linux-tape | 2 +- systemtests/tests/backup-bareos-passive-test/testrunner | 2 +- systemtests/tests/backup-bareos-test/testrunner | 2 +- systemtests/tests/backup-bscan/testrunner | 2 +- systemtests/tests/bconsole-pam/testrunner | 2 +- systemtests/tests/copy-bscan/testrunner | 2 +- systemtests/tests/copy-remote-bscan/testrunner | 2 +- systemtests/tests/multiplied-device-test/testrunner | 2 +- systemtests/tests/python-bareos-test/testrunner | 2 +- .../tests/python-fd-plugin-local-fileset-test/testrunner | 2 +- systemtests/tests/virtualfull-bscan/testrunner | 2 +- systemtests/tests/virtualfull/testrunner | 2 +- systemtests/tests/webui-selenium/testrunner.in | 2 +- 195 files changed, 203 insertions(+), 203 deletions(-) diff --git a/core/README.NDMP b/core/README.NDMP index 4fbb7e1c148..873a49776e0 100644 --- a/core/README.NDMP +++ b/core/README.NDMP @@ -31,7 +31,7 @@ The core fileindex handling code is rewritten to use callback functions for doing the real work. This way we can hook in internal functions into the core file indexing process which happens after a backup and before a restore to fill the -files which have been backuped or restored. +files which have been backed up or restored. Some missing initialization, commission and decommission is added although it is empty it is better to have a consistent @@ -280,8 +280,8 @@ Client { Port = 10000 Protocol = NDMPv4 # Need to specify protocol before password as protocol determines password encoding used. Auth Type = Clear # Clear == Clear Text, MD5 == Challenge protocol - Username = "ndmp" # username of the NDMP user on the DATA AGENT e.g. storage box being backuped. - Password = "test" # password of the NDMP user on the DATA AGENT e.g. storage box being backuped. + Username = "ndmp" # username of the NDMP user on the DATA AGENT e.g. storage box being backed up. + Password = "test" # password of the NDMP user on the DATA AGENT e.g. storage box being backed up. } # diff --git a/core/src/dird/ndmp_dma_generic.cc b/core/src/dird/ndmp_dma_generic.cc index 0a39d2df62c..0c8ca56970a 100644 --- a/core/src/dird/ndmp_dma_generic.cc +++ b/core/src/dird/ndmp_dma_generic.cc @@ -336,7 +336,7 @@ bool NdmpBuildClientJob(JobControlRecord* jcr, } /* - * The data_agent is the client being backuped or restored using NDMP. + * The data_agent is the client being backed up or restored using NDMP. */ ASSERT(client->password_.encoding == p_encoding_clear); if (!fill_ndmp_agent_config(jcr, &job->data_agent, client->Protocol, diff --git a/core/src/dird/ndmp_dma_restore_NDMP_BAREOS.cc b/core/src/dird/ndmp_dma_restore_NDMP_BAREOS.cc index 617e20a24a3..3321744a801 100644 --- a/core/src/dird/ndmp_dma_restore_NDMP_BAREOS.cc +++ b/core/src/dird/ndmp_dma_restore_NDMP_BAREOS.cc @@ -241,7 +241,7 @@ static inline bool fill_restore_environment(JobControlRecord* jcr, } /* - * Tell the data engine what was backuped. + * Tell the data engine what was backed up. */ pv.name = ndmp_env_keywords[NDMP_ENV_KW_FILESYSTEM]; pv.value = ndmp_filesystem; diff --git a/core/src/filed/accurate.cc b/core/src/filed/accurate.cc index 2810955ce27..084649e5c05 100644 --- a/core/src/filed/accurate.cc +++ b/core/src/filed/accurate.cc @@ -138,7 +138,7 @@ bool AccurateFinish(JobControlRecord* jcr) /** * This function is called for each file seen in fileset. - * We check in file_list hash if fname have been backuped + * We check in file_list hash if fname have been backed up * the last time. After we can compare Lstat field. * Full Lstat usage have been removed on 6612 * diff --git a/core/src/filed/fd_plugins.cc b/core/src/filed/fd_plugins.cc index 86b554730e9..141579bebdc 100644 --- a/core/src/filed/fd_plugins.cc +++ b/core/src/filed/fd_plugins.cc @@ -2472,7 +2472,7 @@ static bRC bareosNewPreInclude(bpContext* ctx) } /** - * Check if a file have to be backuped using Accurate code + * Check if a file have to be backed up using Accurate code */ static bRC bareosCheckChanges(bpContext* ctx, struct save_pkt* sp) { diff --git a/core/src/findlib/shadowing.cc b/core/src/findlib/shadowing.cc index 658c12430d8..94a4298512f 100644 --- a/core/src/findlib/shadowing.cc +++ b/core/src/findlib/shadowing.cc @@ -26,7 +26,7 @@ /** * @file * Detect fileset shadowing e.g. when an include entry pulls in data - * which is already being backuped by another include pattern. Currently + * which is already being backed up by another include pattern. Currently * we support both local and global shadowing. Where local shadowing is * when the shadowing occurs within one include block and global when * between multiple include blocks. diff --git a/core/src/plugins/filed/BareosFdPluginLDAP.py b/core/src/plugins/filed/BareosFdPluginLDAP.py index 5dbf01a60bf..c025593c759 100644 --- a/core/src/plugins/filed/BareosFdPluginLDAP.py +++ b/core/src/plugins/filed/BareosFdPluginLDAP.py @@ -313,7 +313,7 @@ def to_unix_timestamp(self, context, timestamp): def get_next_file_to_backup(self, context, savepkt): ''' - Find out the next file that should be backuped + Find out the next file that should be backed up ''' # When file_to_backup is not None we should return the LDIF. if self.file_to_backup: diff --git a/core/src/plugins/filed/cephfs-conf.d/bareos-dir.d/fileset/plugin-cephfs.conf.example b/core/src/plugins/filed/cephfs-conf.d/bareos-dir.d/fileset/plugin-cephfs.conf.example index 858b77d9b18..7ef1ca61854 100644 --- a/core/src/plugins/filed/cephfs-conf.d/bareos-dir.d/fileset/plugin-cephfs.conf.example +++ b/core/src/plugins/filed/cephfs-conf.d/bareos-dir.d/fileset/plugin-cephfs.conf.example @@ -7,7 +7,7 @@ FileSet { xattrsupport = yes } # adapt this to your environment - # basedir: optional, othewrwise all data will be backuped + # basedir: optional, othewrwise all data will be backed up Plugin = "cephfs:conffile=:basedir=:" } } diff --git a/core/src/plugins/filed/python-fd.cc b/core/src/plugins/filed/python-fd.cc index be0e73cbf35..6a7e0afc843 100644 --- a/core/src/plugins/filed/python-fd.cc +++ b/core/src/plugins/filed/python-fd.cc @@ -2943,7 +2943,7 @@ static PyObject* PyBareosNewPreInclude(PyObject* self, PyObject* args) /** * Callback function which is exposed as a part of the additional methods which - * allow a Python plugin to issue a check if a file have to be backuped using + * allow a Python plugin to issue a check if a file have to be backed up using * Accurate code. */ static PyObject* PyBareosCheckChanges(PyObject* self, PyObject* args) diff --git a/core/src/plugins/filed/python-fd.h b/core/src/plugins/filed/python-fd.h index 18fbabf8ce5..379a7d9ba2d 100644 --- a/core/src/plugins/filed/python-fd.h +++ b/core/src/plugins/filed/python-fd.h @@ -732,7 +732,7 @@ static PyMethodDef BareosFDMethods[] = { {"NewPreInclude", PyBareosNewPreInclude, METH_VARARGS, "Add new pre include block"}, {"CheckChanges", PyBareosCheckChanges, METH_VARARGS, - "Check if a file have to be backuped using Accurate code"}, + "Check if a file have to be backed up using Accurate code"}, {"AcceptFile", PyBareosAcceptFile, METH_VARARGS, "Check if a file would be saved using current Include/Exclude code"}, {"SetSeenBitmap", PyBareosSetSeenBitmap, METH_VARARGS, diff --git a/docs/manuals/source/Appendix/BackwardCompatibility.rst b/docs/manuals/source/Appendix/BackwardCompatibility.rst index d34bfa96662..01cd02655b5 100644 --- a/docs/manuals/source/Appendix/BackwardCompatibility.rst +++ b/docs/manuals/source/Appendix/BackwardCompatibility.rst @@ -127,7 +127,7 @@ Proceed with the following steps: /usr/lib/bareos/create_bareos_database -- Insert backuped db into new database: +- Insert backed up db into new database: .. code-block:: shell-session diff --git a/docs/manuals/source/Appendix/Howtos.rst b/docs/manuals/source/Appendix/Howtos.rst index 66101db6561..cc4d681b1bb 100644 --- a/docs/manuals/source/Appendix/Howtos.rst +++ b/docs/manuals/source/Appendix/Howtos.rst @@ -186,7 +186,7 @@ instance Defines the instance within the database server. database - Defines the database that should get backuped. + Defines the database that should get backed up. username and password Username and Password are required, when the connection is done using a MSSQL user. If the systemaccount the bareos-fd runs with has succifient permissions, this is not required. diff --git a/docs/manuals/source/DeveloperGuide/api.rst b/docs/manuals/source/DeveloperGuide/api.rst index 869de33e2a4..67768b9c1d0 100644 --- a/docs/manuals/source/DeveloperGuide/api.rst +++ b/docs/manuals/source/DeveloperGuide/api.rst @@ -482,7 +482,7 @@ Bvfs API -------- The BVFS (Bareos Virtual File System) do provide a API for browsing the -backuped files in the catalog and select files for restoring. +backed up files in the catalog and select files for restoring. The Bvfs module works correctly with BaseJobs, Copy and Migration jobs. @@ -822,7 +822,7 @@ Example for directory browsing using bvfs 130 0 0 A A A A A A A A A A A A A A .. 1 23 123 z GiuU EH9 C GHH GHH A BAA BAA I BWA5Px BaIDUN BaIDUN A A C sbin/ - # the first really backuped path is /sbin/ (pathid=1) + # the first really backed up path is /sbin/ (pathid=1) # as it has values other than 0 for FileId, JobId and LStat. # Now we check, if it has futher subdirectories. *.bvfs_lsdir jobid=1 pathid=1 @@ -843,4 +843,4 @@ Example for directory browsing using bvfs 1 18 123 z Gli+ IHo B GHH GHH A NVkY BAA BrA BaIDUJ BaIDUJ BaIDUJ A A C 928EB+EJGFtWD7wQ8bVjew Full-0001 0 1 1067 127 z Glnc IHo B GHH GHH A NVkY BAA BrA BaKDT2 BaKDT2 BaKDT2 A A C 928EB+EJGFtWD7wQ8bVjew Incremental-0007 0 - # multiple versions of the file bareos-dir have been backuped. + # multiple versions of the file bareos-dir have been backed up. diff --git a/docs/manuals/source/TasksAndConcepts/CatalogMaintenance.rst b/docs/manuals/source/TasksAndConcepts/CatalogMaintenance.rst index 252325b2655..e47085b119b 100644 --- a/docs/manuals/source/TasksAndConcepts/CatalogMaintenance.rst +++ b/docs/manuals/source/TasksAndConcepts/CatalogMaintenance.rst @@ -604,7 +604,7 @@ Job Retention = :index:`\ `\ :index:`\ `\ The Job Retention record defines the length of time that Bareos will keep Job records in the Catalog database. When this time period expires, and if AutoPrune is set to yes Bareos will prune (remove) Job records that are older than the specified Job Retention period. Note, if a Job record is selected for pruning, all associated File and JobMedia records will also be pruned regardless of the File Retention period set. As a consequence, you normally will set the File retention period to be less than the Job retention period. - As mentioned above, once the File records are removed from the database, you will no longer be able to restore individual files from the Job. However, as long as the Job record remains in the database, you will be able to restore all the files backuped for the Job. As a consequence, it is generally a good idea to retain the Job records much longer than the File records. + As mentioned above, once the File records are removed from the database, you will no longer be able to restore individual files from the Job. However, as long as the Job record remains in the database, you will be able to restore all the files backed up for the Job. As a consequence, it is generally a good idea to retain the Job records much longer than the File records. The retention period is specified in seconds, but as a convenience, there are a number of modifiers that permit easy specification in terms of minutes, hours, days, weeks, months, quarters, or years. See the :ref:`Configuration chapter