svn commit: r187628 - stable/7/bin/ln

[Giorgos Keramidas]

Author: keramida (doc committer)
Date: Fri Jan 23 11:54:31 2009
New Revision: 187628
URL: http://svn.freebsd.org/changeset/base/187628

Log:
  MFC 173702 from /head
  
    Express in the usage() and SYNOPSIS that -F depends on -s, and
    that -f and -i are exclusive.
  
  This reduces diffs of stable/7 from /head, in preparation for more MFCs.

Modified:
  stable/7/bin/ln/   (props changed)
  stable/7/bin/ln/ln.1
  stable/7/bin/ln/ln.c

Modified: stable/7/bin/ln/ln.1
==============================================================================
--- stable/7/bin/ln/ln.1	Fri Jan 23 11:39:00 2009	(r187627)
+++ stable/7/bin/ln/ln.1	Fri Jan 23 11:54:31 2009	(r187628)
@@ -41,11 +41,15 @@
 .Nd make links
 .Sh SYNOPSIS
 .Nm
-.Op Fl Ffhinsv
+.Op Fl s Op Fl F
+.Op Fl f | i
+.Op Fl hnv
 .Ar source_file
 .Op Ar target_file
 .Nm
-.Op Fl Ffhinsv
+.Op Fl s Op Fl F
+.Op Fl f | i
+.Op Fl hnv
 .Ar source_file ...
 .Ar target_dir
 .Nm link

Modified: stable/7/bin/ln/ln.c
==============================================================================
--- stable/7/bin/ln/ln.c	Fri Jan 23 11:39:00 2009	(r187627)
+++ stable/7/bin/ln/ln.c	Fri Jan 23 11:54:31 2009	(r187628)
@@ -254,8 +254,8 @@ void
 usage(void)
 {
 	(void)fprintf(stderr, "%s\n%s\n%s\n",
-	    "usage: ln [-Ffhinsv] source_file [target_file]",
-	    "       ln [-Ffhinsv] source_file ... target_dir",
+	    "usage: ln [-s [-F]] [-f | -i] [-hnv] source_file [target_file]",
+	    "       ln [-s [-F]] [-f | -i] [-hnv] source_file ... target_dir",
 	    "       link source_file target_file");
 	exit(1);
 }