diff --git a/cmd/cmd.go b/cmd/cmd.go index 4bec1f74..6f5d0c8b 100644 --- a/cmd/cmd.go +++ b/cmd/cmd.go @@ -83,7 +83,7 @@ package environment to new version.`, cmd.Flag.Bool("dep-follow-suggests", false, "when processing dependencies, follow Suggests") cmd.Flag.Bool("dep-follow-source", false, "when processing dependencies, follow from binary to Source packages") cmd.Flag.Bool("dep-follow-recommends", false, "when processing dependencies, follow Recommends") - cmd.Flag.Bool("dep-follow-all-variants", false, "when processing dependencies, follow a & b if depdency is 'a|b'") + cmd.Flag.Bool("dep-follow-all-variants", false, "when processing dependencies, follow a & b if dependency is 'a|b'") cmd.Flag.String("architectures", "", "list of architectures to consider during (comma-separated), default to all available") cmd.Flag.String("config", "", "location of configuration file (default locations are /etc/aptly.conf, ~/.aptly.conf)") diff --git a/man/aptly.1 b/man/aptly.1 index b1f84830..8c2f9996 100644 --- a/man/aptly.1 +++ b/man/aptly.1 @@ -326,7 +326,7 @@ location of configuration file (default locations are /etc/aptly\.conf, ~/\.aptl . .TP \-\fBdep\-follow\-all\-variants\fR=false -when processing dependencies, follow a & b if depdency is \(cqa|b\(cq +when processing dependencies, follow a & b if dependency is \(cqa|b\(cq . .TP \-\fBdep\-follow\-recommends\fR=false diff --git a/system/t03_help/MainHelpTest_gold b/system/t03_help/MainHelpTest_gold index 0c42fb04..356c4e2f 100644 --- a/system/t03_help/MainHelpTest_gold +++ b/system/t03_help/MainHelpTest_gold @@ -13,7 +13,7 @@ package environment to new version. Options: -architectures="": list of architectures to consider during (comma-separated), default to all available -config="": location of configuration file (default locations are /etc/aptly.conf, ~/.aptly.conf) - -dep-follow-all-variants=false: when processing dependencies, follow a & b if depdency is 'a|b' + -dep-follow-all-variants=false: when processing dependencies, follow a & b if dependency is 'a|b' -dep-follow-recommends=false: when processing dependencies, follow Recommends -dep-follow-source=false: when processing dependencies, follow from binary to Source packages -dep-follow-suggests=false: when processing dependencies, follow Suggests diff --git a/system/t03_help/MainTest_gold b/system/t03_help/MainTest_gold index 3339c975..002005ba 100644 --- a/system/t03_help/MainTest_gold +++ b/system/t03_help/MainTest_gold @@ -21,7 +21,7 @@ Use "aptly help " for more information about a command. Options: -architectures="": list of architectures to consider during (comma-separated), default to all available -config="": location of configuration file (default locations are /etc/aptly.conf, ~/.aptly.conf) - -dep-follow-all-variants=false: when processing dependencies, follow a & b if depdency is 'a|b' + -dep-follow-all-variants=false: when processing dependencies, follow a & b if dependency is 'a|b' -dep-follow-recommends=false: when processing dependencies, follow Recommends -dep-follow-source=false: when processing dependencies, follow from binary to Source packages -dep-follow-suggests=false: when processing dependencies, follow Suggests diff --git a/system/t03_help/MirrorCreateHelpTest_gold b/system/t03_help/MirrorCreateHelpTest_gold index e404e2d9..07483573 100644 --- a/system/t03_help/MirrorCreateHelpTest_gold +++ b/system/t03_help/MirrorCreateHelpTest_gold @@ -15,7 +15,7 @@ Example: Options: -architectures="": list of architectures to consider during (comma-separated), default to all available -config="": location of configuration file (default locations are /etc/aptly.conf, ~/.aptly.conf) - -dep-follow-all-variants=false: when processing dependencies, follow a & b if depdency is 'a|b' + -dep-follow-all-variants=false: when processing dependencies, follow a & b if dependency is 'a|b' -dep-follow-recommends=false: when processing dependencies, follow Recommends -dep-follow-source=false: when processing dependencies, follow from binary to Source packages -dep-follow-suggests=false: when processing dependencies, follow Suggests diff --git a/system/t03_help/MirrorCreateTest_gold b/system/t03_help/MirrorCreateTest_gold index 2aaa8203..7ca699a7 100644 --- a/system/t03_help/MirrorCreateTest_gold +++ b/system/t03_help/MirrorCreateTest_gold @@ -6,7 +6,7 @@ aptly mirror create - create new mirror Options: -architectures="": list of architectures to consider during (comma-separated), default to all available -config="": location of configuration file (default locations are /etc/aptly.conf, ~/.aptly.conf) - -dep-follow-all-variants=false: when processing dependencies, follow a & b if depdency is 'a|b' + -dep-follow-all-variants=false: when processing dependencies, follow a & b if dependency is 'a|b' -dep-follow-recommends=false: when processing dependencies, follow Recommends -dep-follow-source=false: when processing dependencies, follow from binary to Source packages -dep-follow-suggests=false: when processing dependencies, follow Suggests diff --git a/system/t03_help/MirrorHelpTest_gold b/system/t03_help/MirrorHelpTest_gold index 6cefc10e..9d62fcca 100644 --- a/system/t03_help/MirrorHelpTest_gold +++ b/system/t03_help/MirrorHelpTest_gold @@ -17,7 +17,7 @@ Use "mirror help " for more information about a command. Options: -architectures="": list of architectures to consider during (comma-separated), default to all available -config="": location of configuration file (default locations are /etc/aptly.conf, ~/.aptly.conf) - -dep-follow-all-variants=false: when processing dependencies, follow a & b if depdency is 'a|b' + -dep-follow-all-variants=false: when processing dependencies, follow a & b if dependency is 'a|b' -dep-follow-recommends=false: when processing dependencies, follow Recommends -dep-follow-source=false: when processing dependencies, follow from binary to Source packages -dep-follow-suggests=false: when processing dependencies, follow Suggests diff --git a/system/t03_help/MirrorTest_gold b/system/t03_help/MirrorTest_gold index cf149c99..2c86e735 100644 --- a/system/t03_help/MirrorTest_gold +++ b/system/t03_help/MirrorTest_gold @@ -17,7 +17,7 @@ Use "mirror help " for more information about a command. Options: -architectures="": list of architectures to consider during (comma-separated), default to all available -config="": location of configuration file (default locations are /etc/aptly.conf, ~/.aptly.conf) - -dep-follow-all-variants=false: when processing dependencies, follow a & b if depdency is 'a|b' + -dep-follow-all-variants=false: when processing dependencies, follow a & b if dependency is 'a|b' -dep-follow-recommends=false: when processing dependencies, follow Recommends -dep-follow-source=false: when processing dependencies, follow from binary to Source packages -dep-follow-suggests=false: when processing dependencies, follow Suggests diff --git a/system/t03_help/WrongFlagTest_gold b/system/t03_help/WrongFlagTest_gold index 29c7a540..32e018fe 100644 --- a/system/t03_help/WrongFlagTest_gold +++ b/system/t03_help/WrongFlagTest_gold @@ -7,7 +7,7 @@ aptly mirror create - create new mirror Options: -architectures="": list of architectures to consider during (comma-separated), default to all available -config="": location of configuration file (default locations are /etc/aptly.conf, ~/.aptly.conf) - -dep-follow-all-variants=false: when processing dependencies, follow a & b if depdency is 'a|b' + -dep-follow-all-variants=false: when processing dependencies, follow a & b if dependency is 'a|b' -dep-follow-recommends=false: when processing dependencies, follow Recommends -dep-follow-source=false: when processing dependencies, follow from binary to Source packages -dep-follow-suggests=false: when processing dependencies, follow Suggests