aboutsummaryrefslogtreecommitdiff
path: root/utils/ftpdir.c
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2012-07-01 02:12:43 +0000
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2012-07-01 02:12:43 +0000
commit13ea39a34766fcbecd96ab94bcdf798b08e9bb60 (patch)
tree1e1463b03838a6f36868a4dafc7e652358a51857 /utils/ftpdir.c
parent1f8d504f631531c199d7c6154a0dc442d80ea4a7 (diff)
parent7e15f3d69a83a34ac62cbbee944a0bfbfa92724e (diff)
downloadhurd-13ea39a34766fcbecd96ab94bcdf798b08e9bb60.tar.gz
hurd-13ea39a34766fcbecd96ab94bcdf798b08e9bb60.tar.bz2
hurd-13ea39a34766fcbecd96ab94bcdf798b08e9bb60.zip
Merge branch 'master' into xkb
Conflicts: config.make.in configure.in
Diffstat (limited to 'utils/ftpdir.c')
-rw-r--r--utils/ftpdir.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/utils/ftpdir.c b/utils/ftpdir.c
index 9b496add..4ccb821d 100644
--- a/utils/ftpdir.c
+++ b/utils/ftpdir.c
@@ -39,7 +39,7 @@ static struct argp_option options[] =
{"account", 'a', "ACCT",0, "Account to login as"},
{"separator",'S', "SEP", 0, "String to separate multiple listings"},
{"prefix", 'P', "PFX", 0, "String to proceed listings; the first and second"
- " occurances of %s are replace by HOST and DIR"},
+ " occurrences of %s are replace by HOST and DIR"},
{"host", 'h', "HOST",0, "Use HOST as a default host"},
{"debug", 'D', 0, 0, "Turn on debugging output for ftp connections"},
{"intepret", 'i', 0, 0, "Parse the directory output"},