2 files changed, 15 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index 34a17e98b..fcf4ec3f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
   - deraadt@cvs.openbsd.org 2001/03/06 06:11:44
     [sftp-int.c sftp.1 sftp.c]
     sftp -b batchfile; mouring@etoh.eviladmin.org
+   - deraadt@cvs.openbsd.org 2001/03/06 15:10:42
+     [sftp.1]
+     order things
 20010306
 - (bal) OpenBSD CVS Sync
@@ -4420,4 +4423,4 @@
 - Wrote replacements for strlcpy and mkdtemp
 - Released 1.0pre1
-$Id: ChangeLog,v 1.920 2001/03/07 01:26:48 mouring Exp $
+$Id: ChangeLog,v 1.921 2001/03/07 01:29:17 mouring Exp $
diff --git a/sftp.1 b/sftp.1
index e1c6960f8..7792283ee 100644
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp.1,v 1.10 2001/03/06 06:11:44 deraadt Exp $
+.\" $OpenBSD: sftp.1,v 1.11 2001/03/06 15:10:42 deraadt Exp $
 .\"
 .\" Copyright (c) 2001 Damien Miller.  All rights reserved.
 .\"
@@ -50,12 +50,6 @@ then enters an interactive command mode.
 .Pp
 The options are as follows:
 .Bl -tag -width Ds
-.It Fl v
-Raise logging level. This option is also passed to ssh.
-.It Fl C
-Enables compression (via ssh's 
-.Fl C
-flag)
 .It Fl b Ar batchfile
 Batch mode reads a series of commands from an input
 .Fn batchfile
@@ -67,9 +61,15 @@ commands fail:
 .Pa get, put, rename, rm, mkdir, chdir, lchdir
 and
 .Pa lmkdir.
+.It Fl C
+Enables compression (via ssh's 
+.Fl C
+flag)
 .It Fl o Ar ssh_option
 Specify an option to be directly passed to
 .Xr ssh 1 .
+.It Fl v
+Raise logging level. This option is also passed to ssh.
 .El
 .Sh INTERACTIVE COMMANDS
 Once in interactive mode,
@@ -104,8 +104,8 @@ to
 .Ar own .
 .Ar own
 must be a numeric UID.
-.It Ic help
+.It Ic exit
-Display help text.
+Quit sftp.
 .It Xo Ic get
 .Op Ar flags
 .Ar remote-path
@@ -120,6 +120,8 @@ remote machine. If the
 .Fl P
 flag is specified, then the file's full permission and access time are
 copied too.
+.It Ic help
+Display help text.
 .It Ic lls Op Ar ls-options Op Ar path
 Display local directory listing of either 
 .Ar path
@@ -157,8 +159,6 @@ flag is specified, then the file's full permission and access time are
 copied too.
 .It Ic pwd
 Display remote working directory.
-.It Ic exit
-Quit sftp.
 .It Ic quit
 Quit sftp.
 .It Ic rename Ar oldpath Ar newpath

diff --git a/ChangeLog b/ChangeLog index 34a17e98b..fcf4ec3f9 100644 --- a/ChangeLog +++ b/ChangeLog
@@ -6,6 +6,9 @@
6	- deraadt@cvs.openbsd.org 2001/03/06 06:11:44	6	- deraadt@cvs.openbsd.org 2001/03/06 06:11:44
7	[sftp-int.c sftp.1 sftp.c]	7	[sftp-int.c sftp.1 sftp.c]
8	sftp -b batchfile; mouring@etoh.eviladmin.org	8	sftp -b batchfile; mouring@etoh.eviladmin.org
		9	- deraadt@cvs.openbsd.org 2001/03/06 15:10:42
		10	[sftp.1]
		11	order things
9		12
10	20010306	13	20010306
11	- (bal) OpenBSD CVS Sync	14	- (bal) OpenBSD CVS Sync
@@ -4420,4 +4423,4 @@
4420	- Wrote replacements for strlcpy and mkdtemp	4423	- Wrote replacements for strlcpy and mkdtemp
4421	- Released 1.0pre1	4424	- Released 1.0pre1
4422		4425
4423	$Id: ChangeLog,v 1.920 2001/03/07 01:26:48 mouring Exp $	4426	$Id: ChangeLog,v 1.921 2001/03/07 01:29:17 mouring Exp $


diff --git a/sftp.1 b/sftp.1 index e1c6960f8..7792283ee 100644 --- a/sftp.1 +++ b/sftp.1
@@ -1,4 +1,4 @@
1	.\" $OpenBSD: sftp.1,v 1.10 2001/03/06 06:11:44 deraadt Exp $	1	.\" $OpenBSD: sftp.1,v 1.11 2001/03/06 15:10:42 deraadt Exp $
2	.\"	2	.\"
3	.\" Copyright (c) 2001 Damien Miller. All rights reserved.	3	.\" Copyright (c) 2001 Damien Miller. All rights reserved.
4	.\"	4	.\"
@@ -50,12 +50,6 @@ then enters an interactive command mode.
50	.Pp	50	.Pp
51	The options are as follows:	51	The options are as follows:
52	.Bl -tag -width Ds	52	.Bl -tag -width Ds
53	.It Fl v
54	Raise logging level. This option is also passed to ssh.
55	.It Fl C
56	Enables compression (via ssh's
57	.Fl C
58	flag)
59	.It Fl b Ar batchfile	53	.It Fl b Ar batchfile
60	Batch mode reads a series of commands from an input	54	Batch mode reads a series of commands from an input
61	.Fn batchfile	55	.Fn batchfile
@@ -67,9 +61,15 @@ commands fail:
67	.Pa get, put, rename, rm, mkdir, chdir, lchdir	61	.Pa get, put, rename, rm, mkdir, chdir, lchdir
68	and	62	and
69	.Pa lmkdir.	63	.Pa lmkdir.
		64	.It Fl C
		65	Enables compression (via ssh's
		66	.Fl C
		67	flag)
70	.It Fl o Ar ssh_option	68	.It Fl o Ar ssh_option
71	Specify an option to be directly passed to	69	Specify an option to be directly passed to
72	.Xr ssh 1 .	70	.Xr ssh 1 .
		71	.It Fl v
		72	Raise logging level. This option is also passed to ssh.
73	.El	73	.El
74	.Sh INTERACTIVE COMMANDS	74	.Sh INTERACTIVE COMMANDS
75	Once in interactive mode,	75	Once in interactive mode,
@@ -104,8 +104,8 @@ to
104	.Ar own .	104	.Ar own .
105	.Ar own	105	.Ar own
106	must be a numeric UID.	106	must be a numeric UID.
107	.It Ic help	107	.It Ic exit
108	Display help text.	108	Quit sftp.
109	.It Xo Ic get	109	.It Xo Ic get
110	.Op Ar flags	110	.Op Ar flags
111	.Ar remote-path	111	.Ar remote-path
@@ -120,6 +120,8 @@ remote machine. If the
120	.Fl P	120	.Fl P
121	flag is specified, then the file's full permission and access time are	121	flag is specified, then the file's full permission and access time are
122	copied too.	122	copied too.
		123	.It Ic help
		124	Display help text.
123	.It Ic lls Op Ar ls-options Op Ar path	125	.It Ic lls Op Ar ls-options Op Ar path
124	Display local directory listing of either	126	Display local directory listing of either
125	.Ar path	127	.Ar path
@@ -157,8 +159,6 @@ flag is specified, then the file's full permission and access time are
157	copied too.	159	copied too.
158	.It Ic pwd	160	.It Ic pwd
159	Display remote working directory.	161	Display remote working directory.
160	.It Ic exit
161	Quit sftp.
162	.It Ic quit	162	.It Ic quit
163	Quit sftp.	163	Quit sftp.
164	.It Ic rename Ar oldpath Ar newpath	164	.It Ic rename Ar oldpath Ar newpath