From owner-svn-src-all@FreeBSD.ORG  Thu Apr  2 02:15:00 2015
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:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 6AF67CC0;
 Thu,  2 Apr 2015 02:15:00 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 55D8BEB4;
 Thu,  2 Apr 2015 02:15:00 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t322ExBK054603;
 Thu, 2 Apr 2015 02:14:59 GMT (envelope-from wblock@FreeBSD.org)
Received: (from wblock@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t322Exvl054602;
 Thu, 2 Apr 2015 02:14:59 GMT (envelope-from wblock@FreeBSD.org)
Message-Id: <201504020214.t322Exvl054602@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: wblock set sender to
 wblock@FreeBSD.org using -f
From: Warren Block <wblock@FreeBSD.org>
Date: Thu, 2 Apr 2015 02:14:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r280977 - stable/10/usr.bin/logger
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
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/options/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: Thu, 02 Apr 2015 02:15:00 -0000

Author: wblock (doc committer)
Date: Thu Apr  2 02:14:58 2015
New Revision: 280977
URL: https://svnweb.freebsd.org/changeset/base/280977

Log:
  MFC r262769:
  
  - Clarify usage of the -f option.
  
  MFC r280336:
  
  Describe the behavior when both -f and a message are given.  Pointed out by
  Raphael Abreu <raphael.lorenzeto@gmail.com> on freebsd-doc.

Modified:
  stable/10/usr.bin/logger/logger.1
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.bin/logger/logger.1
==============================================================================
--- stable/10/usr.bin/logger/logger.1	Thu Apr  2 01:49:12 2015	(r280976)
+++ stable/10/usr.bin/logger/logger.1	Thu Apr  2 02:14:58 2015	(r280977)
@@ -28,7 +28,7 @@
 .\"	@(#)logger.1	8.1 (Berkeley) 6/6/93
 .\" $FreeBSD$
 .\"
-.Dd August 2, 2006
+.Dd March 21, 2015
 .Dt LOGGER 1
 .Os
 .Sh NAME
@@ -74,7 +74,8 @@ with each line.
 .It Fl s
 Log the message to standard error, as well as the system log.
 .It Fl f Ar file
-Log the specified file.
+Read the contents of the specified file into syslog.
+This option is ignored when a message is also specified.
 .It Fl h Ar host
 Send the message to the remote system
 .Ar host