From dennylin93@cnmc32.hs.ntnu.edu.tw  Sat Jan 23 14:13:21 2010
Return-Path: <dennylin93@cnmc32.hs.ntnu.edu.tw>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 951BF1065696
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 23 Jan 2010 14:13:21 +0000 (UTC)
	(envelope-from dennylin93@cnmc32.hs.ntnu.edu.tw)
Received: from mx.hs.ntnu.edu.tw (mx.hs.ntnu.edu.tw [140.131.149.2])
	by mx1.freebsd.org (Postfix) with ESMTP id 6035B8FC25
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 23 Jan 2010 14:13:21 +0000 (UTC)
Received: from mx.hs.ntnu.edu.tw (localhost [127.0.0.1])
	by mx.hs.ntnu.edu.tw (Postfix) with ESMTP id 4DBDB6FC44C
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 23 Jan 2010 22:13:20 +0800 (CST)
Received: by mx.hs.ntnu.edu.tw (Postfix, from userid 1002)
	id 31FEA6FC443; Sat, 23 Jan 2010 22:13:20 +0800 (CST)
Message-Id: <20100123141320.31FEA6FC443@mx.hs.ntnu.edu.tw>
Date: Sat, 23 Jan 2010 22:13:20 +0800 (CST)
From: Denny Lin <dennylin93@cnmc32.hs.ntnu.edu.tw>
Reply-To: Denny Lin <dennylin93@cnmc32.hs.ntnu.edu.tw>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [UPDATE] Update info about DHCP in Handbook
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         143120
>Category:       docs
>Synopsis:       [UPDATE] Update info about DHCP in Handbook
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    bcr
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 23 14:20:01 UTC 2010
>Closed-Date:    Sat Jan 30 21:13:00 UTC 2010
>Last-Modified:  Sat Jan 30 21:13:00 UTC 2010
>Originator:     Denny Lin
>Release:        FreeBSD 8.0-RELEASE-p2 amd64
>Organization:
>Environment:
System: FreeBSD cnmc32.hs.ntnu.edu.tw 8.0-RELEASE-p2 FreeBSD 8.0-RELEASE-p2 #0: Fri Jan 8 17:48:28 CST 2010 root@cnmc32.hs.ntnu.edu.tw:/usr/obj/usr/src/sys/CNMC32 amd64


	
>Description:
The info about DHCP in the Handbook is outdated. ISC DHCP 3.0 isn't supported any more (replaced by 3.1), and the script has changed as well.
	
>How-To-Repeat:
	
>Fix:

	

--- dhcp.patch begins here ---
--- doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml.orig	2010-01-23 22:06:42.631053228 +0800
+++ doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml	2010-01-23 22:10:00.922724015 +0800
@@ -2555,7 +2555,7 @@
         client-side program, <command>dhclient</command>, comes
         integrated within FreeBSD, and the server-side portion is
         available from the <filename
-        role="package">net/isc-dhcp3-server</filename> port.  The
+        role="package">net/isc-dhcp31-server</filename> port.  The
         &man.dhclient.8;, &man.dhcp-options.5;, and
         &man.dhclient.conf.5; manual pages, in addition to the
         references below, are useful resources.</para>
@@ -2665,7 +2665,7 @@
         </indexterm>
         <para>The DHCP server, <application>dhcpd</application>, is included
           as part of the <filename
-          role="package">net/isc-dhcp3-server</filename> port in the ports
+          role="package">net/isc-dhcp31-server</filename> port in the ports
           collection.  This port contains the ISC DHCP server and
           documentation.</para>
     </sect2>
@@ -2729,7 +2729,7 @@
 
 	  <para>The server is not provided as part of
 	    FreeBSD, and so you will need to install the
-	    <filename role="package">net/isc-dhcp3-server</filename>
+	    <filename role="package">net/isc-dhcp31-server</filename>
 	    port to provide this service.  See <xref linkend="ports"> for
 	    more information on using the Ports Collection.</para>
 	</sect3>
@@ -2768,7 +2768,7 @@
 
 	  <para>The next thing that you will need to do is edit the sample
 	    <filename>dhcpd.conf</filename> which was installed by the
-	    <filename role="package">net/isc-dhcp3-server</filename> port.
+	    <filename role="package">net/isc-dhcp31-server</filename> port.
 	    By default, this will be
 	    <filename>/usr/local/etc/dhcpd.conf.sample</filename>, and you
 	    should copy this to
@@ -2882,7 +2882,7 @@
 	  <para>Then, you can proceed to start the server by issuing the
 	    following command:</para>
 
-	  <screen>&prompt.root; <userinput>/usr/local/etc/rc.d/isc-dhcpd.sh start</userinput></screen>
+	  <screen>&prompt.root; <userinput>/usr/local/etc/rc.d/isc-dhcpd start</userinput></screen>
 
 	  <para>Should you need to make changes to the configuration of your
 	    server in the future, it is important to note that sending a
@@ -2932,7 +2932,7 @@
 		environments where one DHCP server forwards a request from a
 		client to another DHCP server on a separate network.  If you
 		require this functionality, then install the <filename
-		role="package">net/isc-dhcp3-relay</filename> port.  The
+		role="package">net/isc-dhcp31-relay</filename> port.  The
 		&man.dhcrelay.8; manual page provided with the
 		port contains more detail.</para>
 	    </listitem>
--- dhcp.patch ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-doc->bcr 
Responsible-Changed-By: bcr 
Responsible-Changed-When: Sat Jan 23 20:06:12 UTC 2010 
Responsible-Changed-Why:  
I will work on that. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=143120 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: docs/143120: commit references a PR
Date: Sat, 30 Jan 2010 20:59:13 +0000 (UTC)

 bcr         2010-01-30 20:56:24 UTC
 
   FreeBSD doc repository
 
   Modified files:
     en_US.ISO8859-1/books/handbook/network-servers chapter.sgml 
   Log:
   Replace outdated ISC DHCP 3.0 with version 3.1 from the ports collection.
   The extension .sh from the startup script was removed as well, see
   the entry of 20060818 in /usr/ports/UPDATING for details.
   
   PR:             docs/143120
   Submitted by:   Denny Lin (dennylin93 at cnmc32 dot hs dot ntnu dot edu dot tw)
   Discussed with: jkois
   
   Revision  Changes    Path
   1.119     +6 -6      doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: bcr 
State-Changed-When: Sat Jan 30 21:12:05 UTC 2010 
State-Changed-Why:  
Committed, thanks for filing this PR. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=143120 
>Unformatted:
