From owner-svn-src-stable-10@FreeBSD.ORG Wed Dec 18 03:51:05 2013 Return-Path: Delivered-To: svn-src-stable-10@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 7C4F1266; Wed, 18 Dec 2013 03:51:05 +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 68EEC1E67; Wed, 18 Dec 2013 03:51:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBI3p5Qh097399; Wed, 18 Dec 2013 03:51:05 GMT (envelope-from grehan@svn.freebsd.org) Received: (from grehan@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBI3p5Eb097397; Wed, 18 Dec 2013 03:51:05 GMT (envelope-from grehan@svn.freebsd.org) Message-Id: <201312180351.rBI3p5Eb097397@svn.freebsd.org> From: Peter Grehan Date: Wed, 18 Dec 2013 03:51:05 +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: r259536 - stable/10/usr.sbin/bhyve X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Dec 2013 03:51:05 -0000 Author: grehan Date: Wed Dec 18 03:51:04 2013 New Revision: 259536 URL: http://svnweb.freebsd.org/changeset/base/259536 Log: MFC r259302,r259413 r259302 bhyve(8) man page r259413 mdoc: sort SEE ALSO Added: stable/10/usr.sbin/bhyve/bhyve.8 - copied, changed from r259302, head/usr.sbin/bhyve/bhyve.8 Modified: stable/10/usr.sbin/bhyve/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.sbin/bhyve/Makefile ============================================================================== --- stable/10/usr.sbin/bhyve/Makefile Wed Dec 18 01:41:52 2013 (r259535) +++ stable/10/usr.sbin/bhyve/Makefile Wed Dec 18 03:51:04 2013 (r259536) @@ -6,6 +6,7 @@ PROG= bhyve DEBUG_FLAGS= -g -O0 +MAN= bhyve.8 SRCS= acpi.c atpic.c bhyverun.c block_if.c consport.c dbgport.c elcr.c SRCS+= inout.c ioapic.c legacy_irq.c mem.c mevent.c mptbl.c pci_ahci.c SRCS+= pci_emul.c pci_hostbridge.c pci_lpc.c pci_passthru.c pci_virtio_block.c @@ -15,8 +16,6 @@ SRCS+= uart_emul.c virtio.c xmsr.c spinu .PATH: ${.CURDIR}/../../sys/amd64/vmm SRCS+= vmm_instruction_emul.c -NO_MAN= - DPADD= ${LIBVMMAPI} ${LIBMD} ${LIBUTIL} ${LIBPTHREAD} LDADD= -lvmmapi -lmd -lutil -lpthread Copied and modified: stable/10/usr.sbin/bhyve/bhyve.8 (from r259302, head/usr.sbin/bhyve/bhyve.8) ============================================================================== --- head/usr.sbin/bhyve/bhyve.8 Fri Dec 13 08:31:13 2013 (r259302, copy source) +++ stable/10/usr.sbin/bhyve/bhyve.8 Wed Dec 18 03:51:04 2013 (r259536) @@ -288,8 +288,8 @@ bhyve -c 4 \e\ .Xr nmdm 4 , .Xr vmm 4 , .Xr ethers 5 , -.Xr bhyveload 8 , -.Xr bhyvectl 8 +.Xr bhyvectl 8 , +.Xr bhyveload 8 .Sh HISTORY .Nm first appeared in