From owner-svn-src-all@FreeBSD.ORG  Fri Jan 23 11:54:32 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 451101065678;
	Fri, 23 Jan 2009 11:54:32 +0000 (UTC)
	(envelope-from keramida@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 338708FC25;
	Fri, 23 Jan 2009 11:54:32 +0000 (UTC)
	(envelope-from keramida@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0NBsWRg042146;
	Fri, 23 Jan 2009 11:54:32 GMT
	(envelope-from keramida@svn.freebsd.org)
Received: (from keramida@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0NBsWaP042144;
	Fri, 23 Jan 2009 11:54:32 GMT
	(envelope-from keramida@svn.freebsd.org)
Message-Id: <200901231154.n0NBsWaP042144@svn.freebsd.org>
From: Giorgos Keramidas <keramida@FreeBSD.org>
Date: Fri, 23 Jan 2009 11:54:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r187628 - stable/7/bin/ln
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Jan 2009 11:54:33 -0000

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);
 }