diff options
author | Shawn Routhier <sar@isc.org> | 2016-08-23 21:38:45 -0700 |
---|---|---|
committer | Shawn Routhier <sar@isc.org> | 2016-08-23 21:38:45 -0700 |
commit | 60bba4343c0166736b2c94a867004825b6fd4244 (patch) | |
tree | 4942ad9b944a6aa0847917f636485c0bacdddceb /doc | |
parent | edd6d8881bc4d8ec4b04173c66c1c840756bbe76 (diff) | |
download | isc-dhcp-60bba4343c0166736b2c94a867004825b6fd4244.tar.gz |
[master] remove uses of vix.com, nominum.com and fugue.com
Squashed commit of the following:
commit 375a26d52db75c3f62b8914f36e4f1618253075e
Author: Shawn Routhier <sar@isc.org>
Date: Thu Aug 18 14:26:28 2016 -0700
[rt43069] remove uses of vix.com, nominum.com and fugue.com
Diffstat (limited to 'doc')
-rw-r--r-- | doc/ja_JP.eucJP/dhclient-script.8 | 9 | ||||
-rw-r--r-- | doc/ja_JP.eucJP/dhclient.conf.5 | 15 | ||||
-rw-r--r-- | doc/ja_JP.eucJP/dhclient.leases.5 | 9 | ||||
-rw-r--r-- | doc/ja_JP.eucJP/dhcp-eval.5 | 8 | ||||
-rw-r--r-- | doc/ja_JP.eucJP/dhcp-options.5 | 9 |
5 files changed, 8 insertions, 42 deletions
diff --git a/doc/ja_JP.eucJP/dhclient-script.8 b/doc/ja_JP.eucJP/dhclient-script.8 index 01388a29..9ebcf3f0 100644 --- a/doc/ja_JP.eucJP/dhclient-script.8 +++ b/doc/ja_JP.eucJP/dhclient-script.8 @@ -1,6 +1,6 @@ .\" $Id: dhclient-script.8,v 1.4 2009/11/24 02:06:56 sar Exp $ .\" -.\" Copyright (c) 2004,2009 by Internet Systems Consortium, Inc. ("ISC") +.\" Copyright (c) 2004,2009,2016 by Internet Systems Consortium, Inc. ("ISC") .\" Copyright (c) 1996-2003 by Internet Software Consortium .\" .\" Permission to use, copy, modify, and distribute this software for any @@ -21,13 +21,6 @@ .\" <info@isc.org> .\" https://www.isc.org/ .\" -.\" This software has been written for Internet Systems Consortium -.\" by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc. -.\" To learn more about Internet Systems Consortium, see -.\" ``https://www.isc.org/''. To learn more about Vixie Enterprises, -.\" see ``http://www.vix.com''. To learn more about Nominum, Inc., see -.\" ``http://www.nominum.com''. -.\" .\" %FreeBSD: src/contrib/isc-dhcp/client/dhclient-script.8,v 1.5.2.4 2002/04/11 10:16:45 murray Exp % .\" .\" $FreeBSD: doc/ja_JP.eucJP/man/man8/dhclient-script.8,v 1.13 2002/05/08 03:27:27 horikawa Exp $ diff --git a/doc/ja_JP.eucJP/dhclient.conf.5 b/doc/ja_JP.eucJP/dhclient.conf.5 index 187538bd..a14e1da6 100644 --- a/doc/ja_JP.eucJP/dhclient.conf.5 +++ b/doc/ja_JP.eucJP/dhclient.conf.5 @@ -1,6 +1,6 @@ .\" $Id: dhclient.conf.5,v 1.4 2009/11/24 02:06:56 sar Exp $ .\" -.\" Copyright (c) 2004,2009 by Internet Systems Consortium, Inc. ("ISC") +.\" Copyright (c) 2004,2009,2016 by Internet Systems Consortium, Inc. ("ISC") .\" Copyright (c) 1996-2003 by Internet Software Consortium .\" .\" Permission to use, copy, modify, and distribute this software for any @@ -21,13 +21,6 @@ .\" <info@isc.org> .\" https://www.isc.org/ .\" -.\" This software has been written for Internet Systems Consortium -.\" by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc. -.\" To learn more about Internet Systems Consortium, see -.\" ``https://www.isc.org/''. To learn more about Vixie Enterprises, -.\" see ``http://www.vix.com''. To learn more about Nominum, Inc., see -.\" ``http://www.nominum.com''. -.\" .\" %FreeBSD: src/contrib/isc-dhcp/client/dhclient.conf.5,v 1.7.2.1 2002/04/11 10:16:46 murray Exp % .\" $FreeBSD: doc/ja_JP.eucJP/man/man5/dhclient.conf.5,v 1.6 2002/05/03 03:23:30 horikawa Exp $ .\" WORD: lease リース(アドレスの貸与)[dhclient.conf.5] @@ -237,7 +230,7 @@ DHCP プロトコルで常に送られるオプションは また、次のようにクライアントで fqdn オプションを設定する必要があります: .PP .nf - send fqdn.fqdn "grosse.fugue.com."; + send fqdn.fqdn "grosse.example.com."; send fqdn.encoded on; send fqdn.server-update off; .fi @@ -591,10 +584,10 @@ initial-interval 2; reject 192.33.137.209; interface "ep0" { - send host-name "andare.fugue.com"; + send host-name "andare.example.com"; send dhcp-client-identifier 1:0:a0:24:ab:fb:9c; send dhcp-lease-time 3600; - supersede domain-name "fugue.com rc.vix.com home.vix.com"; + supersede domain-name "example.com rc.isc.org home.isc.org"; prepend domain-name-servers 127.0.0.1; request subnet-mask, broadcast-address, time-offset, routers, domain-name, domain-name-servers, host-name; diff --git a/doc/ja_JP.eucJP/dhclient.leases.5 b/doc/ja_JP.eucJP/dhclient.leases.5 index 5a34516b..d88a9d94 100644 --- a/doc/ja_JP.eucJP/dhclient.leases.5 +++ b/doc/ja_JP.eucJP/dhclient.leases.5 @@ -1,6 +1,6 @@ .\" $Id: dhclient.leases.5,v 1.4 2009/11/24 02:06:56 sar Exp $ .\" -.\" Copyright (c) 2004,2009 by Internet Systems Consortium, Inc. ("ISC") +.\" Copyright (c) 2004,2009,2016 by Internet Systems Consortium, Inc. ("ISC") .\" Copyright (c) 1997-2003 by Internet Software Consortium .\" .\" Permission to use, copy, modify, and distribute this software for any @@ -21,13 +21,6 @@ .\" <info@isc.org> .\" https://www.isc.org/ .\" -.\" This software has been written for Internet Systems Consortium -.\" by Ted Lemon in cooperation with Vixie -.\" Enterprises. To learn more about Internet Systems Consortium, -.\" see ``https://www.isc.org/''. To learn more about Vixie -.\" Enterprises, see ``http://www.vix.com''. -.\" -.\" .\" %FreeBSD: src/contrib/isc-dhcp/client/dhclient.leases.5,v 1.2.4.1 2002/04/11 10:16:46 murray Exp % .\" .\" $FreeBSD: doc/ja_JP.eucJP/man/man5/dhclient.leases.5,v 1.6 2002/05/05 20:40:23 horikawa Exp $ diff --git a/doc/ja_JP.eucJP/dhcp-eval.5 b/doc/ja_JP.eucJP/dhcp-eval.5 index 0d3bc2c7..5ec22951 100644 --- a/doc/ja_JP.eucJP/dhcp-eval.5 +++ b/doc/ja_JP.eucJP/dhcp-eval.5 @@ -1,6 +1,6 @@ .\" $Id: dhcp-eval.5,v 1.5 2009/11/24 02:06:56 sar Exp $ .\" -.\" Copyright (c) 2004,2009 by Internet Systems Consortium, Inc. ("ISC") +.\" Copyright (c) 2004,2009,2016 by Internet Systems Consortium, Inc. ("ISC") .\" Copyright (c) 1996-2003 by Internet Software Consortium .\" .\" Permission to use, copy, modify, and distribute this software for any @@ -21,12 +21,6 @@ .\" <info@isc.org> .\" https://www.isc.org/ .\" -.\" This software has been written for Internet Systems Consortium -.\" by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc. -.\" To learn more about Internet Systems Consortium, see -.\" ``https://www.isc.org/''. To learn more about Vixie Enterprises, -.\" see ``http://www.vix.com''. To learn more about Nominum, Inc., see -.\" ``http://www.nominum.com''. .\" $FreeBSD: doc/ja_JP.eucJP/man/man5/dhcp-eval.5,v 1.2 2002/05/23 04:17:13 horikawa Exp $ .TH dhcp-eval 5 .SH 名称 diff --git a/doc/ja_JP.eucJP/dhcp-options.5 b/doc/ja_JP.eucJP/dhcp-options.5 index f13ceb4a..5dcaa2d9 100644 --- a/doc/ja_JP.eucJP/dhcp-options.5 +++ b/doc/ja_JP.eucJP/dhcp-options.5 @@ -1,6 +1,6 @@ .\" $Id: dhcp-options.5,v 1.5 2010/07/20 21:09:14 dhankins Exp $ .\" -.\" Copyright (c) 2004,2009 by Internet Systems Consortium, Inc. ("ISC") +.\" Copyright (c) 2004,2009,2016 by Internet Systems Consortium, Inc. ("ISC") .\" Copyright (c) 1996-2003 by Internet Software Consortium .\" .\" Permission to use, copy, modify, and distribute this software for any @@ -21,13 +21,6 @@ .\" <info@isc.org> .\" https://www.isc.org/ .\" -.\" This software has been written for Internet Systems Consortium -.\" by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc. -.\" To learn more about Internet Systems Consortium, see -.\" ``https://www.isc.org/''. To learn more about Vixie Enterprises, -.\" see ``http://www.vix.com''. To learn more about Nominum, Inc., see -.\" ``http://www.nominum.com''. -.\" .\" %FreeBSD: src/contrib/isc-dhcp/common/dhcp-options.5,v 1.2.2.1 2002/04/11 10:16:46 murray Exp % .\" $FreeBSD: doc/ja_JP.eucJP/man/man5/dhcp-options.5,v 1.11 2002/05/21 03:51:52 horikawa Exp $ .\" WORD: Dynamic Host Configuration Protocol 動的ホスト構成プロトコル |