aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2016-02-25 16:46:56 +0100
committerHans Nilsson <[email protected]>2016-02-25 16:46:56 +0100
commit5058b37d878f8cdf43c351ab4f05985196630c2b (patch)
tree09e3e5802de65e3c0b810be658758e552b7b3ef3 /lib/ssh
parent8ead4dbf8a2f73325dbc3113abf2e5dd4f885bb2 (diff)
parent5154dc8ff3d529e33e06b6fbf0d3906d06492353 (diff)
downloadotp-5058b37d878f8cdf43c351ab4f05985196630c2b.tar.gz
otp-5058b37d878f8cdf43c351ab4f05985196630c2b.tar.bz2
otp-5058b37d878f8cdf43c351ab4f05985196630c2b.zip
Merge branch 'maint'
Diffstat (limited to 'lib/ssh')
-rw-r--r--lib/ssh/doc/src/ssh_sftp.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ssh/doc/src/ssh_sftp.xml b/lib/ssh/doc/src/ssh_sftp.xml
index c6ca0f161a..f4b41b74f3 100644
--- a/lib/ssh/doc/src/ssh_sftp.xml
+++ b/lib/ssh/doc/src/ssh_sftp.xml
@@ -333,7 +333,7 @@
<func>
<name>position(ChannelPid, Handle, Location) -></name>
- <name>position(ChannelPid, Handle, Location, Timeout) -> {ok, NewPosition | {error, Error}</name>
+ <name>position(ChannelPid, Handle, Location, Timeout) -> {ok, NewPosition} | {error, Reason}</name>
<fsummary>Sets the file position of a file.</fsummary>
<type>
<v>ChannelPid = pid()</v>
@@ -399,7 +399,7 @@
<func>
<name>pwrite(ChannelPid, Handle, Position, Data) -> ok</name>
- <name>pwrite(ChannelPid, Handle, Position, Data, Timeout) -> ok | {error, Error}</name>
+ <name>pwrite(ChannelPid, Handle, Position, Data, Timeout) -> ok | {error, Reason}</name>
<fsummary>Writes to an open file.</fsummary>
<type>
<v>ChannelPid = pid()</v>
@@ -592,7 +592,7 @@
<func>
<name>write(ChannelPid, Handle, Data) -></name>
- <name>write(ChannelPid, Handle, Data, Timeout) -> ok | {error, Error}</name>
+ <name>write(ChannelPid, Handle, Data, Timeout) -> ok | {error, Reason}</name>
<fsummary>Writes to an open file.</fsummary>
<type>
<v>ChannelPid = pid()</v>