From owner-svn-doc-head@FreeBSD.ORG Fri Oct 18 21:36:01 2013 Return-Path: Delivered-To: svn-doc-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 20EBD32F; Fri, 18 Oct 2013 21:36:01 +0000 (UTC) (envelope-from dru@FreeBSD.org) 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 0D69B2FCA; Fri, 18 Oct 2013 21:36:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9ILa07U028873; Fri, 18 Oct 2013 21:36:00 GMT (envelope-from dru@svn.freebsd.org) Received: (from dru@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9ILa0DM028871; Fri, 18 Oct 2013 21:36:00 GMT (envelope-from dru@svn.freebsd.org) Message-Id: <201310182136.r9ILa0DM028871@svn.freebsd.org> From: Dru Lavigne Date: Fri, 18 Oct 2013 21:36:00 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43005 - head/en_US.ISO8859-1/books/handbook/ppp-and-slip X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Oct 2013 21:36:01 -0000 Author: dru Date: Fri Oct 18 21:36:00 2013 New Revision: 43005 URL: http://svnweb.freebsd.org/changeset/doc/43005 Log: Combine Static and Dynamic IP sections into a Basic Configuration section. Make it clearer when ppp.linkup is required. This section still has to make it obvious how to actually use ppp once a basic configuration has been created. The next few patches will shuffle content to organize it into various advanced configuration sections. Modified: head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml Fri Oct 18 20:50:45 2013 (r43004) +++ head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml Fri Oct 18 21:36:00 2013 (r43005) @@ -206,7 +206,7 @@ - PPP With a Static <acronym>IP</acronym> Address + Basic Configuration PPP @@ -214,10 +214,11 @@ addresses - If the ISP, also known as the peer, has - provided an address that does not change, edit - /etc/ppp/ppp.conf as described in the - example below. + In order to configure a PPP connection, + first edit + /etc/ppp/ppp.conf with the dial-in + information for the ISP. This file is described + as follows: 1 default: 2 set log Phase Chat LCP IPCP CCP tun command @@ -397,20 +398,34 @@ Line 16: - Sets the interface addresses. The - x.x.x.x should be - replaced by the static IP address - that the ISP has allocated and - the y.y.y.y should be - replaced by the IP address of the + Sets the interface addresses. The values used + depend upon whether a static IP + address has been obtained from the + ISP or if it instead negotiates + a dynamic IP address during + connection. + + If the + ISP has allocated a static + IP address and default gateway, replace + x.x.x.x with the static + IP address and replace + y.y.y.y with the + IP address of the default gateway. If the ISP has - not provided a gateway address, use 10.0.0.2/0. When using a - guessed address, create an entry in - /etc/ppp/ppp.linkup as per the - instructions in . - If this line is omitted, ppp - cannot run in mode. + only provided a static IP address + without a gateway address, replace y.y.y.y with 10.0.0.2/0. + + If the IP address changes whenever + a connection is made, change this line + to the following value. + This tells &man.ppp.8; to use the + IP Configuration Protocol + (IPCP) to negotiate a dynamic IP address: + + set ifaddr 10.0.0.1/0 10.0.0.2/0 255.255.255.255 0.0.0.0 + @@ -423,60 +438,35 @@ automatically be replaced with the gateway address specified on line 16. It is important that this line appears after line 16. - - When mode is not used to - start the connection, this line should be moved to - ppp.linkup. Examples for this - file can be found in /usr/share/examples/ppp/. - However, ppp.linkup is not - needed when running &man.ppp.8; in - mode as the routing table - entries are already correct. - - - - <acronym>PPP</acronym> With a Dynamic - <acronym>IP</acronym> Address - - - PPP - with dynamic IP - addresses - - - - IPCP - - - If the IP address changes whenever - a connection is made, change the set ifaddr line - in /etc/ppp/ppp.conf to the following value. - This tells &man.ppp.8; to use the - IP Configuration Protocol - (IPCP) to negotiate the IP address. - - set ifaddr 10.0.0.1/0 10.0.0.2/0 255.255.255.255 0.0.0.0 - When not running in mode, - create - /etc/ppp/ppp.linkup with the following lines. This file is - used after a connection has been established. At this + Depending upon whether &man.ppp.8; is started + manually or automatically, a + /etc/ppp/ppp.linkup may also need to + be created which contains the following lines. This file + is required when running ppp + in mode. This file is + used after the connection has been established. At this point, the IP address will have been assigned - and it will now be possible to add the - routing table entries. The HISADDR line will be replaced with the - IP address of the default gateway as - negotiated using IPCP. Make sure that + and it is now be possible to add the + routing table entries. When creating this file, make sure that provider matches the value - used in ppp.conf. + demonstrated in line 11 of ppp.conf. provider: add default HISADDR - + This file is also needed when the default gateway + address is guessed in a static + IP address configuration. In this case, + remove line 17 from ppp.conf and + create /etc/ppp/ppp.linkup with the + above two lines. More examples for this file can be found + in /usr/share/examples/ppp/. + Receiving Incoming Calls