From owner-freebsd-questions@FreeBSD.ORG  Fri Apr 18 12:21:08 2008
Return-Path: <owner-freebsd-questions@FreeBSD.ORG>
Delivered-To: FreeBSD-Questions@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 22CFE106564A
	for <FreeBSD-Questions@FreeBSD.org>;
	Fri, 18 Apr 2008 12:21:08 +0000 (UTC)
	(envelope-from freebsd-questions-local@be-well.ilk.org)
Received: from be-well.ilk.org (dsl092-078-145.bos1.dsl.speakeasy.net
	[66.92.78.145]) by mx1.freebsd.org (Postfix) with ESMTP id E30238FC17
	for <FreeBSD-Questions@FreeBSD.org>;
	Fri, 18 Apr 2008 12:21:07 +0000 (UTC)
	(envelope-from freebsd-questions-local@be-well.ilk.org)
Received: from Lowell-Desk.lan (Lowell-Desk.lan [172.30.250.6])
	by be-well.ilk.org (Postfix) with ESMTP id 9D03D28459;
	Fri, 18 Apr 2008 08:21:04 -0400 (EDT)
Received: by Lowell-Desk.lan (Postfix, from userid 1147)
	id 3FFC01CC36; Fri, 18 Apr 2008 08:21:03 -0400 (EDT)
To: Andreas Pettersson <andpet@telia.com>
References: <1208437747.6635.31.camel@andreas-desktop>
From: Lowell Gilbert <freebsd-questions-local@be-well.ilk.org>
Date: Fri, 18 Apr 2008 08:21:02 -0400
In-Reply-To: <1208437747.6635.31.camel@andreas-desktop> (Andreas Pettersson's
	message of "Thu\, 17 Apr 2008 15\:09\:07 +0200")
Message-ID: <44prsn8ic1.fsf@Lowell-Desk.lan>
User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.1 (berkeley-unix)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: FreeBSD-Questions <FreeBSD-Questions@FreeBSD.org>
Subject: Re: freebsd-update for patches, make world for upgrades?
X-BeenThere: freebsd-questions@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: User questions <freebsd-questions.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>, 
	<mailto:freebsd-questions-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-questions>
List-Post: <mailto:freebsd-questions@freebsd.org>
List-Help: <mailto:freebsd-questions-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>, 
	<mailto:freebsd-questions-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Apr 2008 12:21:08 -0000

Andreas Pettersson <andpet@telia.com> writes:

> Does freebsd-update take care of all things mergemaster does?
> Or can I use freebsd-update to apply security patches and still use
> csup, make world and mergemaster to upgrade to a new release?

You certainly *can* use both.