From owner-svn-src-all@FreeBSD.ORG Wed Dec 25 15:40:15 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D1A2AF1C; Wed, 25 Dec 2013 15:40:15 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BCF821E96; Wed, 25 Dec 2013 15:40:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBPFeFQ7085147; Wed, 25 Dec 2013 15:40:15 GMT (envelope-from pluknet@svn.freebsd.org) Received: (from pluknet@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBPFeFBd085146; Wed, 25 Dec 2013 15:40:15 GMT (envelope-from pluknet@svn.freebsd.org) Message-Id: <201312251540.rBPFeFBd085146@svn.freebsd.org> From: Sergey Kandaurov Date: Wed, 25 Dec 2013 15:40:15 +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: r259871 - 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.17 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Dec 2013 15:40:15 -0000 Author: pluknet Date: Wed Dec 25 15:40:15 2013 New Revision: 259871 URL: http://svnweb.freebsd.org/changeset/base/259871 Log: MFC r258469: - Purge one more reference to ad(4)[1]. - NSWAPDEV limit has gone. Noticed by: Sergey V. Dyatko [1] 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 Wed Dec 25 15:23:01 2013 (r259870) +++ stable/10/sbin/swapon/swapon.8 Wed Dec 25 15:40:15 2013 (r259871) @@ -28,7 +28,7 @@ .\" @(#)swapon.8 8.1 (Berkeley) 6/5/93 .\" $FreeBSD$ .\" -.Dd June 21, 2013 +.Dd November 22, 2013 .Dt SWAPON 8 .Os .Sh NAME @@ -60,9 +60,7 @@ At boot time all swap entries in .Pa /etc/fstab are added automatically when the system goes multi-user. Swap devices use a fixed interleave; the maximum number of devices -is specified by the kernel configuration option -.Dv NSWAPDEV , -which is typically set to 4. +is unlimited. There is no priority mechanism. .Pp The @@ -193,8 +191,8 @@ overridden. 512 byte blocks are used by default. .El .Sh FILES -.Bl -tag -width ".Pa /dev/{ad,da}?s?b" -compact -.It Pa /dev/{ad,da}?s?b +.Bl -tag -width ".Pa /dev/{ada,da}?s?b" -compact +.It Pa /dev/{ada,da}?s?b standard paging devices .It Pa /dev/md? memory disk devices