about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Doc/Zsh/zftpsys.yo2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 513d02581..6b2a58d3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-05-30  Peter Stephenson  <p.w.stephenson@ntlworld.com>
+
+	* Han Pingtian: 35311: Doc/Zsh/zftpsys.yo: typo in zfuput
+	behaviour.
+
 2015-05-30  Barton E. Schaefer  <schaefer@zsh.org>
 
 	* Oliver Kiddle: 35310 (plus undo 35268 (git 899613f)):
diff --git a/Doc/Zsh/zftpsys.yo b/Doc/Zsh/zftpsys.yo
index 00062e43d..349039edc 100644
--- a/Doc/Zsh/zftpsys.yo
+++ b/Doc/Zsh/zftpsys.yo
@@ -283,7 +283,7 @@ semantics, since `tt(/)' is used as a directory separator.
 )
 findex(zfuput)
 item(tt(zfuput) [ tt(-vs) ] var(file1) ...)(
-As tt(zfput), but only send files which are newer than their local
+As tt(zfput), but only send files which are newer than their remote
 equivalents, or if the remote file does not exist.  The logic is the same
 as for tt(zfuget), but reversed between local and remote files.
 )