diff --git a/common b/common index 353b8474e..abb76c593 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 353b8474e2672735d1eee69cf84b2dd5dc248cb6 +Subproject commit abb76c593617353b5e6e298ea6d6e0827b641a36 diff --git a/daemon/btrfs.c b/daemon/btrfs.c index fb569a111..bfd19a845 100644 --- a/daemon/btrfs.c +++ b/daemon/btrfs.c @@ -685,7 +685,7 @@ do_btrfs_device_delete (char *const *devices, const char *fs) * -U UUID change fsid to UUID * -u change fsid, use a random one * since v4.1 - * We could check wheter 'btrfstune' support + * We could check whether 'btrfstune' support * '-u' and '-U UUID' option by checking the output of * 'btrfstune' command. */ @@ -1176,7 +1176,7 @@ do_btrfs_qgroup_destroy (const char *qgroupid, const char *subvolume) /* btrfs qgroup show command change default output to * binary prefix since v3.18.2, such as KiB; * also introduced '--raw' to keep traditional behaviour. - * We could check wheter 'btrfs qgroup show' support '--raw' + * We could check whether 'btrfs qgroup show' support '--raw' * option by checking the output of * 'btrfs qgroup show' support --help' command. */ diff --git a/daemon/device-name-translation.c b/daemon/device-name-translation.c index f91eed070..cfebc6495 100644 --- a/daemon/device-name-translation.c +++ b/daemon/device-name-translation.c @@ -170,7 +170,7 @@ device_name_translation (const char *device) start = &device[5+len+1]; len = strspn (start, "abcdefghijklmnopqrstuvwxyz"); if (len >= sizeof dev - 1) { - fprintf (stderr, "unparseable device name: %s\n", device); + fprintf (stderr, "unparsable device name: %s\n", device); return NULL; } strcpy (dev, start); diff --git a/daemon/file.c b/daemon/file.c index 6c3b011a0..9464d3bd0 100644 --- a/daemon/file.c +++ b/daemon/file.c @@ -531,7 +531,7 @@ do_copy_attributes (const char *src, const char *dest, int all, int mode, int xa static const unsigned int file_mask = 07777; /* If it was specified to copy everything, manually enable all the flags - * not manually specified to avoid checking for flag || all everytime. + * not manually specified to avoid checking for flag || all every time. */ if (all) { if (!(optargs_bitmask & GUESTFS_COPY_ATTRIBUTES_MODE_BITMASK)) diff --git a/daemon/inspect_fs_windows.ml b/daemon/inspect_fs_windows.ml index 173cd15a3..8bcda5eb8 100644 --- a/daemon/inspect_fs_windows.ml +++ b/daemon/inspect_fs_windows.ml @@ -428,7 +428,7 @@ and map_registry_disk_blob_gpt partitions blob = | Not_found -> None (* Extracts the binary GUID stored in blob from Windows registry - * HKLM\SYSTYEM\MountedDevices\DosDevices value and converts it to a + * HKLM\SYSTEM\MountedDevices\DosDevices value and converts it to a * GUID string so that it can be matched against libguestfs partition * device GPT GUID. *) diff --git a/docs/guestfs-building.pod b/docs/guestfs-building.pod index 9b07d5880..ddca9dfe3 100644 --- a/docs/guestfs-building.pod +++ b/docs/guestfs-building.pod @@ -747,7 +747,7 @@ We backport upstream features. =back -The patches we apply to RHEL releases are available publically in the +The patches we apply to RHEL releases are available publicly in the upstream git repository, in a branch called C For example, the RHEL 7.3 patches are available here: diff --git a/docs/guestfs-hacking.pod b/docs/guestfs-hacking.pod index 879e2b3e0..6828f11f9 100644 --- a/docs/guestfs-hacking.pod +++ b/docs/guestfs-hacking.pod @@ -817,7 +817,7 @@ We support i18n (gettext anyhow) in the library. However many messages come from the daemon, and we don’t translate those at the moment. One reason is that the appliance generally has all locale files removed from it, because they take up a lot of space. -So we'd have to readd some of those, as well as copying our PO files +So we'd have to re-add some of those, as well as copying our PO files into the appliance. Debugging messages are never translated, since they are intended for diff --git a/docs/guestfs-release-notes-1.28.pod b/docs/guestfs-release-notes-1.28.pod index 8fe6b83c4..b6b957654 100644 --- a/docs/guestfs-release-notes-1.28.pod +++ b/docs/guestfs-release-notes-1.28.pod @@ -451,7 +451,7 @@ virt-builder "proxy=off" setting doesn't turn off the proxy for downloads =item L -virt-sparsify man failes to mention what happens to snapshots within a qcow2 image (they are discarded) +virt-sparsify man fails to mention what happens to snapshots within a qcow2 image (they are discarded) =item L diff --git a/docs/guestfs-release-notes-1.32.pod b/docs/guestfs-release-notes-1.32.pod index 7cf73813a..b67770a94 100644 --- a/docs/guestfs-release-notes-1.32.pod +++ b/docs/guestfs-release-notes-1.32.pod @@ -395,7 +395,7 @@ RFE: V2V to check and warn user to disable group policy and anti virus on Window =item L -Wrong graphics protocal and video type set for guest after convert to rhev 3.6 by virt-v2v +Wrong graphics protocol and video type set for guest after convert to rhev 3.6 by virt-v2v =item L diff --git a/docs/guestfs-release-notes-1.36.pod b/docs/guestfs-release-notes-1.36.pod index 4e697c45d..c95a6a2e3 100644 --- a/docs/guestfs-release-notes-1.36.pod +++ b/docs/guestfs-release-notes-1.36.pod @@ -279,7 +279,7 @@ Debian hosts using UsrMerge are now supported (Pino Toscano). Header files and C structs can now have internal documentation using the special C comments. -C<@VAR@> subtitutions in C<./run> are now fully quoted. This is +C<@VAR@> substitutions in C<./run> are now fully quoted. This is necessary so that (eg) C<./configure PYTHON=/some/path> works robustly if C contains characters that need to be quoted (Hilko Bengen). @@ -417,7 +417,7 @@ Importing VMs from VMware is failing with error "Inspection field 'i_arch' was ' =item L -RFE: Increate virt-sysprep coverage a bit +RFE: Increase virt-sysprep coverage a bit =item L diff --git a/docs/guestfs-release-notes-1.4.pod b/docs/guestfs-release-notes-1.4.pod index 5f4270121..699cbbd5f 100644 --- a/docs/guestfs-release-notes-1.4.pod +++ b/docs/guestfs-release-notes-1.4.pod @@ -158,7 +158,7 @@ the git repository, or the ChangeLog file distributed in the tarball. - 588763 libguestfs should use non-public or link-local addresses for appliance network - 588733 Updates to Spanish translation - 588651 guestfish 'strings-e' cmd does not give proper error message or hint - - 587484 lvresize can't reduce size of a volumn + - 587484 lvresize can't reduce size of a volume - 585961 Updates to Spanish translation - 585223 ntfsresize should support shrinking filesystems - 585222 pvresize should support shrinking PVs diff --git a/docs/guestfs-release-notes-1.50.pod b/docs/guestfs-release-notes-1.50.pod index b98355ad0..9ce9242ac 100644 --- a/docs/guestfs-release-notes-1.50.pod +++ b/docs/guestfs-release-notes-1.50.pod @@ -116,7 +116,7 @@ Disable the LVM2 devicesfile in the appliance since it interferes with cloned LVs that have the same UUID (Laszlo Ersek). Don't use C<-cpu max> on RISC-V as it is not yet supported by qemu's -TCG emulation of that architecture. This will be reenabled when qemu +TCG emulation of that architecture. This will be re-enabled when qemu gets support. Avoid a rare hang that would happen when launching the appliance. diff --git a/erlang/README b/erlang/README index 4d710a96b..4304e784a 100644 --- a/erlang/README +++ b/erlang/README @@ -1,4 +1,4 @@ -REAMDE for the Erlang bindings to libguestfs +README for the Erlang bindings to libguestfs ---------------------------------------------------------------------- To get started, take a look at the man page guestfs-erlang(3) and the diff --git a/generator/actions_core.ml b/generator/actions_core.ml index 34bd15ae6..53fa129f5 100644 --- a/generator/actions_core.ml +++ b/generator/actions_core.ml @@ -9785,7 +9785,7 @@ C is the encrypted block device. The appliance will connect to the Tang servers noted in the tree of Clevis pins that is bound to a keyslot of the LUKS header. The Clevis -pin tree may comprise C (redudancy) pins as internal nodes +pin tree may comprise C (redundancy) pins as internal nodes (optionally), and C pins as leaves. C pins are not supported. The appliance unlocks the encrypted block device by combining responses from the Tang servers with metadata from the LUKS diff --git a/generator/types.mli b/generator/types.mli index e8939370e..0e1b89846 100644 --- a/generator/types.mli +++ b/generator/types.mli @@ -365,7 +365,7 @@ type action = { protocol_limit_warning : bool; (** warn about protocol size limits *) fish_alias : string list; (** alias(es) for this cmd in guestfish *) fish_output : fish_output_t option; (** how to display output in guestfish *) - visibility: visibility; (** The visbility of function *) + visibility: visibility; (** The visibility of function *) deprecated_by : deprecated_by; (** function is deprecated *) optional : string option; (** function is part of an optional group *) progress : bool; (** function can generate progress messages *) diff --git a/gnulib/lib/hash.h b/gnulib/lib/hash.h index 9c7d43b8c..631f5a1ff 100755 --- a/gnulib/lib/hash.h +++ b/gnulib/lib/hash.h @@ -187,7 +187,7 @@ extern Hash_table *hash_xinitialize (size_t candidate, Hash_data_freer data_freer); /* Make all buckets empty, placing any chained entries on the free list. - Apply the user-specified function data_freer (if any) to the datas of any + Apply the user-specified function data_freer (if any) to the data of any affected entries. */ extern void hash_clear (Hash_table *table); diff --git a/test-tool/libguestfs-test-tool.pod b/test-tool/libguestfs-test-tool.pod index db9e2e139..6f404d5ed 100644 --- a/test-tool/libguestfs-test-tool.pod +++ b/test-tool/libguestfs-test-tool.pod @@ -156,7 +156,7 @@ You can convert AVCs into suggested SELinux policy rules using tools like L. For more information, see the "Security Enhanced Linux User Guide". -To reenable SELinux and sVirt, do: +To re-enable SELinux and sVirt, do: setenforce Enforcing diff --git a/tests/md/test-inspect-fstab-md.sh b/tests/md/test-inspect-fstab-md.sh index 097b68773..d0a193e39 100755 --- a/tests/md/test-inspect-fstab-md.sh +++ b/tests/md/test-inspect-fstab-md.sh @@ -41,7 +41,7 @@ if [ "$(cat inspect-fstab-md.output)" != "true" ]; then exit 1 fi -# Test inspection when /boot is specfied as /dev/md/bootdev +# Test inspection when /boot is specified as /dev/md/bootdev cat <<'EOF' > inspect-fstab-md.fstab /dev/VG/Root / ext2 default 0 0 /dev/md/bootdev /boot ext2 default 0 0 diff --git a/tests/md/test-partitioned-md-devices.sh b/tests/md/test-partitioned-md-devices.sh index 1f9680849..bb6b1b3e9 100755 --- a/tests/md/test-partitioned-md-devices.sh +++ b/tests/md/test-partitioned-md-devices.sh @@ -17,7 +17,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # Test guestfish list-filesystems command finds file system on partitioned -# md device and does't take into account md device itself (similar to as +# md device and doesn't take into account md device itself (similar to as # physical devices are skipped if they are partitioned) source ./functions.sh diff --git a/tests/regressions/rhbz690819.sh b/tests/regressions/rhbz690819.sh index 4d86ef3c1..9b32254e2 100755 --- a/tests/regressions/rhbz690819.sh +++ b/tests/regressions/rhbz690819.sh @@ -17,7 +17,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # https://bugzilla.redhat.com/show_bug.cgi?id=690819 -# mkfs fails creating a filesytem on a disk device when using a disk +# mkfs fails creating a filesystem on a disk device when using a disk # with 'ide' interface # # The 'iface' parameter is now ignored: