diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:12:43 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:12:43 +0000 |
| commit | 13ea39a34766fcbecd96ab94bcdf798b08e9bb60 (patch) | |
| tree | 1e1463b03838a6f36868a4dafc7e652358a51857 /hostmux/leaf.c | |
| parent | 1f8d504f631531c199d7c6154a0dc442d80ea4a7 (diff) | |
| parent | 7e15f3d69a83a34ac62cbbee944a0bfbfa92724e (diff) | |
Merge branch 'master' into xkb
Conflicts:
config.make.in
configure.in
Diffstat (limited to 'hostmux/leaf.c')
| -rw-r--r-- | hostmux/leaf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hostmux/leaf.c b/hostmux/leaf.c index aba32b84..fb53622f 100644 --- a/hostmux/leaf.c +++ b/hostmux/leaf.c @@ -53,7 +53,7 @@ netfs_get_translator (struct node *node, char **argz, size_t *argz_len) *argz = 0; /* Initialize return value. */ *argz_len = 0; - /* Return a copy of MUX's translator template, with occurances of + /* Return a copy of MUX's translator template, with occurrences of HOST_PAT replaced by the canonical hostname. */ err = argz_append (argz, argz_len, mux->trans_template, mux->trans_template_len); |