diff --git a/cat/virt-cat.pod b/cat/virt-cat.pod index b2c481107..aabe08517 100644 --- a/cat/virt-cat.pod +++ b/cat/virt-cat.pod @@ -125,10 +125,7 @@ security problem with malicious guests (CVE-2010-3851). __INCLUDE:key-option.pod__ -=item B<--keys-from-stdin> - -Read key or passphrase parameters from stdin. The default is -to try to read passphrases from the user by opening F. +__INCLUDE:keys-from-stdin-option.pod__ =item B<-m> dev[:mountpoint[:options[:fstype]]] diff --git a/cat/virt-filesystems.pod b/cat/virt-filesystems.pod index c800cd82f..5e9ae6658 100644 --- a/cat/virt-filesystems.pod +++ b/cat/virt-filesystems.pod @@ -203,10 +203,7 @@ security problem with malicious guests (CVE-2010-3851). In I<--long> mode, display sizes in human-readable format. -=item B<--keys-from-stdin> - -Read key or passphrase parameters from stdin. The default is -to try to read passphrases from the user by opening F. +__INCLUDE:keys-from-stdin-option.pod__ =item B<-l> diff --git a/cat/virt-log.pod b/cat/virt-log.pod index 23085ca18..4eb4c2d3c 100644 --- a/cat/virt-log.pod +++ b/cat/virt-log.pod @@ -109,10 +109,7 @@ security problem with malicious guests (CVE-2010-3851). __INCLUDE:key-option.pod__ -=item B<--keys-from-stdin> - -Read key or passphrase parameters from stdin. The default is -to try to read passphrases from the user by opening F. +__INCLUDE:keys-from-stdin-option.pod__ =item B<-v> diff --git a/cat/virt-ls.pod b/cat/virt-ls.pod index 806e796c3..ba3894cd6 100644 --- a/cat/virt-ls.pod +++ b/cat/virt-ls.pod @@ -356,10 +356,7 @@ L above. __INCLUDE:key-option.pod__ -=item B<--keys-from-stdin> - -Read key or passphrase parameters from stdin. The default is -to try to read passphrases from the user by opening F. +__INCLUDE:keys-from-stdin-option.pod__ =item B<-m> dev[:mountpoint[:options[:fstype]]] diff --git a/cat/virt-tail.pod b/cat/virt-tail.pod index 89099772f..0f6af8018 100644 --- a/cat/virt-tail.pod +++ b/cat/virt-tail.pod @@ -127,10 +127,7 @@ security problem with malicious guests (CVE-2010-3851). __INCLUDE:key-option.pod__ -=item B<--keys-from-stdin> - -Read key or passphrase parameters from stdin. The default is -to try to read passphrases from the user by opening F. +__INCLUDE:keys-from-stdin-option.pod__ =item B<-m> dev[:mountpoint[:options[:fstype]]] diff --git a/common b/common index e73eca3b7..6d58f37f9 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit e73eca3b73f7d0a54615c5dc55eadd09dc170035 +Subproject commit 6d58f37f956c90f271d6b7d266e0f668b77451c0 diff --git a/customize/virt-customize.pod b/customize/virt-customize.pod index e30a6688d..70c52d17d 100644 --- a/customize/virt-customize.pod +++ b/customize/virt-customize.pod @@ -140,10 +140,7 @@ security problem with malicious guests (CVE-2010-3851). __INCLUDE:key-option.pod__ -=item B<--keys-from-stdin> - -Read key or passphrase parameters from stdin. The default is -to try to read passphrases from the user by opening F. +__INCLUDE:keys-from-stdin-option.pod__ =item B<-m> MB diff --git a/diff/virt-diff.pod b/diff/virt-diff.pod index cc3cf7746..bcec24c65 100644 --- a/diff/virt-diff.pod +++ b/diff/virt-diff.pod @@ -170,10 +170,7 @@ Display file sizes in human-readable format. __INCLUDE:key-option.pod__ -=item B<--keys-from-stdin> - -Read key or passphrase parameters from stdin. The default is -to try to read passphrases from the user by opening F. +__INCLUDE:keys-from-stdin-option.pod__ =item B<--times> diff --git a/edit/virt-edit.pod b/edit/virt-edit.pod index b362c5e94..5ab653428 100644 --- a/edit/virt-edit.pod +++ b/edit/virt-edit.pod @@ -157,10 +157,7 @@ security problem with malicious guests (CVE-2010-3851). __INCLUDE:key-option.pod__ -=item B<--keys-from-stdin> - -Read key or passphrase parameters from stdin. The default is -to try to read passphrases from the user by opening F. +__INCLUDE:keys-from-stdin-option.pod__ =item B<-m> dev[:mountpoint[:options[:fstype]]] diff --git a/fish/guestfish.pod b/fish/guestfish.pod index d98c395f9..4b68a0725 100644 --- a/fish/guestfish.pod +++ b/fish/guestfish.pod @@ -284,10 +284,7 @@ were found. __INCLUDE:key-option.pod__ -=item B<--keys-from-stdin> - -Read key or passphrase parameters from stdin. The default is -to try to read passphrases from the user by opening F. +__INCLUDE:keys-from-stdin-option.pod__ =item B<--listen> diff --git a/fuse/guestmount.pod b/fuse/guestmount.pod index 3b0ca48eb..0cbba693a 100644 --- a/fuse/guestmount.pod +++ b/fuse/guestmount.pod @@ -250,10 +250,7 @@ mounted on the real virtual machine. __INCLUDE:key-option.pod__ -=item B<--keys-from-stdin> - -Read key or passphrase parameters from stdin. The default is -to try to read passphrases from the user by opening F. +__INCLUDE:keys-from-stdin-option.pod__ =item B<--live> diff --git a/get-kernel/virt-get-kernel.pod b/get-kernel/virt-get-kernel.pod index 4da7ccdc1..adea1b21b 100644 --- a/get-kernel/virt-get-kernel.pod +++ b/get-kernel/virt-get-kernel.pod @@ -99,10 +99,7 @@ security problem with malicious guests (CVE-2010-3851). __INCLUDE:key-option.pod__ -=item B<--keys-from-stdin> - -Read key or passphrase parameters from stdin. The default is -to try to read passphrases from the user by opening F. +__INCLUDE:keys-from-stdin-option.pod__ =item B<--machine-readable> diff --git a/inspector/virt-inspector.pod b/inspector/virt-inspector.pod index e201db4d5..d5261e8b5 100644 --- a/inspector/virt-inspector.pod +++ b/inspector/virt-inspector.pod @@ -118,10 +118,7 @@ ensure the format is always specified. __INCLUDE:key-option.pod__ -=item B<--keys-from-stdin> - -Read key or passphrase parameters from stdin. The default is -to try to read passphrases from the user by opening F. +__INCLUDE:keys-from-stdin-option.pod__ =item B<--no-applications> diff --git a/sparsify/virt-sparsify.pod b/sparsify/virt-sparsify.pod index 9a38869eb..0b9bf8a9d 100644 --- a/sparsify/virt-sparsify.pod +++ b/sparsify/virt-sparsify.pod @@ -232,10 +232,7 @@ See L below. __INCLUDE:key-option.pod__ -=item B<--keys-from-stdin> - -Read key or passphrase parameters from stdin. The default is -to try to read passphrases from the user by opening F. +__INCLUDE:keys-from-stdin-option.pod__ =item B<--machine-readable> diff --git a/sysprep/virt-sysprep.pod b/sysprep/virt-sysprep.pod index f794cf787..521849eab 100644 --- a/sysprep/virt-sysprep.pod +++ b/sysprep/virt-sysprep.pod @@ -188,10 +188,7 @@ security problem with malicious guests (CVE-2010-3851). __INCLUDE:key-option.pod__ -=item B<--keys-from-stdin> - -Read key or passphrase parameters from stdin. The default is -to try to read passphrases from the user by opening F. +__INCLUDE:keys-from-stdin-option.pod__ =item B<--list-operations>