From owner-freebsd-doc@FreeBSD.ORG Sat Feb 2 05:09:37 2013 Return-Path: Delivered-To: freebsd-doc@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 9EF2B4D8 for ; Sat, 2 Feb 2013 05:09:37 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: from mail-la0-x22f.google.com (la-in-x022f.1e100.net [IPv6:2a00:1450:4010:c03::22f]) by mx1.freebsd.org (Postfix) with ESMTP id EF333F8B for ; Sat, 2 Feb 2013 05:09:36 +0000 (UTC) Received: by mail-la0-f47.google.com with SMTP id fj20so3362988lab.34 for ; Fri, 01 Feb 2013 21:09:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eitanadler.com; s=0xdeadbeef; h=x-received:mime-version:from:date:message-id:subject:to :content-type; bh=rCiitmS3YUQ/sYz1Zhy2gySxqHC37gy9f00cRdSk45E=; b=dh02Glr5L9Mf2Ji8filDDZuknoKiF2PXLIxHNZF8sox3bl8kGj+tC6jA4hP4UinEmD Bmzpey8eXEkAXX6pnIHIK/esk3nikvzrJlouaHKq/rOaUrI5NspHK1GIf85hvPOo3Y+w kex8Aq9Tvx2NbUvXZoy5Taw7mUQ+HXVbZ97OA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:mime-version:from:date:message-id:subject:to :content-type:x-gm-message-state; bh=rCiitmS3YUQ/sYz1Zhy2gySxqHC37gy9f00cRdSk45E=; b=diMVC0UFozFUMFCih60PT1IXfzzQ/ZiiD/c3iXhwIjFW+e7xBwEfoDNP0Jxj2yHJrh TuJlgNcSqKFrRnJe1g98XDwpxvXgRtM5O12HSzOQk6sa/HecYAPItXATER79YhL9rX29 xBlQwkG7DJcsHAodhd10ejB+fK8yebR33/7EJUZanFn1a+5z2/GLrb5UzPaLDT1vjwBf 6/5Fmd3gB1vncuhBpjbrjnGaTCQowcS1uE2F96jf6NZSS42YWj9f2vmeoT06T3twYNah K0NSPEdOnzX2O2EfUSC7E7CfoO1drbo7JtAv6bXhCjzu8vjX954lU1TgTwq9IoBRVFCJ MFQg== X-Received: by 10.152.109.146 with SMTP id hs18mr13286963lab.8.1359781775720; Fri, 01 Feb 2013 21:09:35 -0800 (PST) MIME-Version: 1.0 Received: by 10.112.100.164 with HTTP; Fri, 1 Feb 2013 21:09:05 -0800 (PST) From: Eitan Adler Date: Sat, 2 Feb 2013 00:09:05 -0500 Message-ID: Subject: To: freebsd-doc@freebsd.org Content-Type: text/plain; charset=UTF-8 X-Gm-Message-State: ALoCoQlXACl+fUqqcZLHUeqHcIZrZBLS7NHMm186j3xLZNy618JeWxBcWqPthi4knSXdUMy3cM3K X-BeenThere: freebsd-doc@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Documentation project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Feb 2013 05:09:37 -0000 Can I please get some review of this patch? In particular can someone comment on the changes to the description of -STABLE. I am almost certain the description is wrong, but can't seem to find any better documentation on this. commit 2178bfca1c982f85791375bd208156d071553429 Author: Eitan Adler Date: Sat Feb 2 00:05:48 2013 -0500 Update and modernize the version numbers used in the FAQ examples. Remove references to 7.x (which is EOL in less than a month). diff --git a/en_US.ISO8859-1/books/faq/book.xml b/en_US.ISO8859-1/books/faq/book.xml index abf7d5a..47bc922 100644 --- a/en_US.ISO8859-1/books/faq/book.xml +++ b/en_US.ISO8859-1/books/faq/book.xml @@ -18,18 +18,12 @@ RELENG_8"> - -X"> -7-STABLE"> -RELENG_7"> - - ]> Frequently Asked Questions for &os; - &rel3.relx;, &rel2.relx;, and &rel.relx; + &rel2.relx;, and &rel.relx; The &os; Documentation Project @@ -80,10 +74,8 @@ This is the FAQ for &os; versions - &rel3.relx;, &rel2.relx; and &rel.relx;. - All entries are assumed to be - relevant to &os; &rel3.relx; and later, - unless otherwise noted. If you are interested in helping with + &rel2.relx; and &rel.relx;. + If you are interested in helping with this project, send email to the &a.doc;. The latest version of this document is always available from the &os; website. @@ -100,7 +92,7 @@ Introduction Welcome to the &os; - &rel3.relx; -, &rel2.relx; - and &rel.relx; - + &rel2.relx; - and &rel.relx; - FAQ! As is usual with Usenet FAQs, this document aims to cover the @@ -354,14 +346,14 @@ made from the &rel.stable; branch, and &rel2.relx; releases are made from the &rel2.stable; branch. - Up until the release of 8.0, the - &rel3.relx; series was the one known as - -STABLE. However, as of 8.0, the - &rel3.relx; branch will be designated for + Up until the release of 9.0, the + 8.x series was the one known as + -STABLE. However, as of 10.0, the + 8.x branch will be designated for an extended support status and receive only fixes for major problems, such as security-related fixes. There will be no more releases made from the - &rel3.stable; branch, and it is considered a + &rel2.stable; branch, and it is considered a legacy branch and most current work will only become a part of &rel.stable; and &rel2.stable;. @@ -2730,7 +2722,7 @@ kern.timecounter.hardware: TSC -> i8254 periodic updates on new entries. Most ports should work on the - &rel3.relx;, &rel2.relx;, and &rel.relx; branches. + &rel2.relx;, and &rel.relx; branches. Each time a &os; release is made, a snapshot of the ports tree at the time of release in also included in the ports/ @@ -2755,15 +2747,6 @@ kern.timecounter.hardware: TSC -> i8254 - for &rel3.relx; -RELEASE/&rel3.stable; - - - ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/&rel3.packages; - - - - for &rel2.relx; -RELEASE/&rel2.stable; @@ -2836,7 +2819,7 @@ kern.timecounter.hardware: TSC -> i8254 Why can I not build this port on my - &rel3.relx; -, &rel2.relx; -, or + &rel2.relx; -, or &rel.relx; -STABLE machine? @@ -4723,8 +4706,8 @@ options SYSVMSG # enable for messaging the same way as -PRERELEASE.) Long answer: &os; derives its releases from one of two - places. Major, dot-zero, releases, such as 7.0-RELEASE and - 8.0-RELEASE, are branched from the head of the development + places. Major, dot-zero, releases, such as 9.0-RELEASE + are branched from the head of the development stream, commonly referred to as -CURRENT. Minor releases, such as 6.3-RELEASE or 5.2-RELEASE, have been snapshots of the @@ -8266,11 +8249,6 @@ hint.sio.7.irq="12" - &rel3.releng; AKA - &rel3.stable; - - - &rel2.releng; AKA &rel2.stable; -- Eitan Adler