From owner-svn-src-all@freebsd.org  Sat Nov 19 20:04:01 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 47351C4BB7B;
 Sat, 19 Nov 2016 20:04:01 +0000 (UTC)
 (envelope-from jilles@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 14DBDA99;
 Sat, 19 Nov 2016 20:04:01 +0000 (UTC)
 (envelope-from jilles@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uAJK40Lj054530;
 Sat, 19 Nov 2016 20:04:00 GMT (envelope-from jilles@FreeBSD.org)
Received: (from jilles@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAJK40he054529;
 Sat, 19 Nov 2016 20:04:00 GMT (envelope-from jilles@FreeBSD.org)
Message-Id: <201611192004.uAJK40he054529@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jilles set sender to
 jilles@FreeBSD.org using -f
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Sat, 19 Nov 2016 20:04:00 +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: r308866 - stable/10/sbin/swapon
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.23
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: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 19 Nov 2016 20:04:01 -0000

Author: jilles
Date: Sat Nov 19 20:03:59 2016
New Revision: 308866
URL: https://svnweb.freebsd.org/changeset/base/308866

Log:
  MFC r306585: swapon(8): Update to reality: swapoff ignores -L and the late
  option in fstab.

Modified:
  stable/10/sbin/swapon/swapon.8
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sbin/swapon/swapon.8
==============================================================================
--- stable/10/sbin/swapon/swapon.8	Sat Nov 19 20:02:49 2016	(r308865)
+++ stable/10/sbin/swapon/swapon.8	Sat Nov 19 20:03:59 2016	(r308866)
@@ -28,7 +28,7 @@
 .\"     @(#)swapon.8	8.1 (Berkeley) 6/5/93
 .\" $FreeBSD$
 .\"
-.Dd November 22, 2013
+.Dd October 2, 2016
 .Dt SWAPON 8
 .Os
 .Sh NAME
@@ -96,16 +96,8 @@ option is used, all swap devices in
 .Pa /etc/fstab
 will be removed, unless their
 .Dq noauto
-or
-.Dq late
 option is also set.
 If the
-.Fl L
-option is specified,
-swap devices with the
-.Dq late
-option will be removed as well as ones with no option.
-If the
 .Fl q
 option is used,
 informational messages will not be