From 597ccea2b538a48288642ff67a95267250e35a43 Mon Sep 17 00:00:00 2001 From: Murray Stokely Date: Wed, 17 Oct 2001 06:49:07 +0000 Subject: [PATCH] Use example.com or example.org for domain names in examples instead of variations of "foobar" and the like. Submitted by: nik and dougb (per RFC 2606) --- .../articles/diskless-x/article.sgml | 8 ++++---- en_US.ISO8859-1/books/faq/book.sgml | 20 +++++++++---------- .../handbook/advanced-networking/chapter.sgml | 4 ++-- .../books/handbook/config/chapter.sgml | 8 ++++---- .../books/handbook/eresources/chapter.sgml | 2 +- .../books/handbook/install/chapter.sgml | 16 +++++++-------- .../books/handbook/mail/chapter.sgml | 4 ++-- .../books/handbook/ppp-and-slip/chapter.sgml | 14 ++++++------- .../books/handbook/security/chapter.sgml | 20 +++++++++---------- 9 files changed, 48 insertions(+), 48 deletions(-) diff --git a/en_US.ISO8859-1/articles/diskless-x/article.sgml b/en_US.ISO8859-1/articles/diskless-x/article.sgml index 22c29f5283..235a346099 100644 --- a/en_US.ISO8859-1/articles/diskless-x/article.sgml +++ b/en_US.ISO8859-1/articles/diskless-x/article.sgml @@ -38,10 +38,10 @@ terminal required first creating a diskless system with minimal utilities mounted via NFS. These same steps were used to create 2 separate diskless systems. The first is altair.kcis.com. A diskless X terminal that I + role="fqdn">altair.example.com. A diskless X terminal that I run on my old 386DX-40. It has a 340Meg hard disk but, I did not want to change it. So, it boots from antares.kcis.com across a Ethernet. The second + role="fqdn">antares.example.com across a Ethernet. The second system is a 486DX2-66. I setup a diskless FreeBSD (complete) that uses no local disk. The server in that case is a Sun 670MP running SunOS 4.1.3. The same setup configuration was needed for both. @@ -256,9 +256,9 @@ bootps dgram udp wait root /usr/libexec/bootpd bootpd /etc/bootptab/tftpboot/cfg.199.246.76.2. The contents is: rootfs 199.246.76.1:/DiskLess/rootfs/altair -hostname altair.kcis.com +hostname altair.example.com - The line hostname altair.kcis.com simply tells + The line hostname altair.example.com simply tells the diskless system what its fully qualified domain name is. The line rootfs diff --git a/en_US.ISO8859-1/books/faq/book.sgml b/en_US.ISO8859-1/books/faq/book.sgml index 2f9601fa13..814df87057 100644 --- a/en_US.ISO8859-1/books/faq/book.sgml +++ b/en_US.ISO8859-1/books/faq/book.sgml @@ -19,7 +19,7 @@ The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.271 2001/10/03 20:29:11 ue Exp $ + $FreeBSD$ 1995 @@ -8633,11 +8633,11 @@ round-trip min/avg/max/stddev = 2.530/2.643/2.774/0.103 ms You will probably find that the host is actually in a - different domain; for example, if you are in foo.bar.edu and + different domain; for example, if you are in foo.example.org and you wish to reach a host called mumble in the - bar.edu domain, you will + example.org domain, you will have to refer to it by the fully-qualified domain name, mumble.bar.edu, instead of just + role="fqdn">mumble.example.org, instead of just mumble. Traditionally, this was allowed by BSD BIND resolvers. @@ -8647,23 +8647,23 @@ round-trip min/avg/max/stddev = 2.530/2.643/2.774/0.103 ms abbreviations for non-fully qualified domain names other than the domain you are in. So an unqualified host mumble must either be found as mumble.foo.bar.edu, or it will be searched + role="fqdn">mumble.foo.example.org, or it will be searched for in the root domain. This is different from the previous behavior, where the search continued across - mumble.bar.edu, and + mumble.example.org, and mumble.edu. Have a look at RFC 1535 for why this was considered bad practice, or even a security hole. As a good workaround, you can place the line - search foo.bar.edu bar.edu + search foo.example.org example.org instead of the previous - domain foo.bar.edu + domain foo.example.org into your /etc/resolv.conf file (see &man.resolv.conf.5;). However, make sure that the @@ -8825,9 +8825,9 @@ round-trip min/avg/max/stddev = 2.530/2.643/2.774/0.103 ms tree in category sysutils. Simply replace the service's commandline to call socket instead, like so: - ftp stream tcp nowait nobody /usr/local/bin/socket socket ftp.foo.com ftp + ftp stream tcp nowait nobody /usr/local/bin/socket socket ftp.example.com ftp - where ftp.foo.com and + where ftp.example.com and ftp are the host and port to redirect to, respectively. diff --git a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml index 3dcc928038..4240c523dc 100644 --- a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml +++ b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml @@ -1244,7 +1244,7 @@ Exports list on foobar: max-lease-time 7200; authoritative; - option domain-name "mydom.com"; + option domain-name "example.com"; option domain-name-servers 192.168.4.1; option routers 192.168.4.1; @@ -1255,7 +1255,7 @@ Exports list on foobar: host margaux { hardware ethernet 01:23:45:67:89:ab; - fixed-address margaux.mydom.com; + fixed-address margaux.example.com; next-server 192.168.4.4; filename "/tftpboot/kernel.diskless"; option root-path "192.168.4.4:/data/misc/diskless"; diff --git a/en_US.ISO8859-1/books/handbook/config/chapter.sgml b/en_US.ISO8859-1/books/handbook/config/chapter.sgml index 1e1e158f34..d992f7d9ee 100644 --- a/en_US.ISO8859-1/books/handbook/config/chapter.sgml +++ b/en_US.ISO8859-1/books/handbook/config/chapter.sgml @@ -1,7 +1,7 @@ @@ -271,7 +271,7 @@ rc.conf: . rc.conf.site - hostname="node15.webcompany.com" + hostname="node15.example.com" network_interfaces="fxp0 lo0" ifconfig_fxp0="inet 10.1.1.1" rc.conf.site: @@ -574,7 +574,7 @@ exit 0 A typical resolv.conf: - search foobar.com + search example.com nameserver 147.11.1.11 nameserver 147.11.100.30 @@ -635,7 +635,7 @@ nameserver 147.11.100.30 For example: - 10.0.0.1 myRealHostname.foobar.com myRealHostname foobar1 foobar2 + 10.0.0.1 myRealHostname.example.com myRealHostname foobar1 foobar2 Consult &man.hosts.5; for more information. diff --git a/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml b/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml index 4ac67612c4..8063337dc6 100644 --- a/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml +++ b/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml @@ -528,7 +528,7 @@ subscribe freebsd-announce highly appreciated by us!), you would do something like: &prompt.user; mail majordomo@FreeBSD.org -subscribe freebsd-announce local-announce@somesite.com +subscribe freebsd-announce local-announce@example.com ^D Finally, it is also possible to unsubscribe yourself from a list, diff --git a/en_US.ISO8859-1/books/handbook/install/chapter.sgml b/en_US.ISO8859-1/books/handbook/install/chapter.sgml index 35bcd426a9..74ae596e06 100644 --- a/en_US.ISO8859-1/books/handbook/install/chapter.sgml +++ b/en_US.ISO8859-1/books/handbook/install/chapter.sgml @@ -2684,18 +2684,18 @@ Mounting root from ufs:/dev/md0c @ sign. The proxy server then fakes the real server. For example, assuming you want to install from ftp.FreeBSD.org, using the proxy FTP - server foo.bar.com, listening on port + server foo.example.com, listening on port 1024. In this case, you go to the options menu, set the FTP username to ftp@ftp.FreeBSD.org, and the password to your email address. As your installation media, you specify FTP (or passive FTP, if the proxy supports it), and the URL - ftp://foo.bar.com:1234/pub/FreeBSD. + ftp://foo.example.com:1234/pub/FreeBSD. Since /pub/FreeBSD from ftp.FreeBSD.org is proxied under - foo.bar.com, you are able to install + foo.example.com, you are able to install from that machine (which will fetch the files from ftp.FreeBSD.org as your installation requests them. @@ -2859,7 +2859,7 @@ installation menus to try and retry whichever operations have failed. Host - The fully-qualified hostname, e.g. k6-2.weeble.com in + The fully-qualified hostname, e.g. k6-2.example.com in this case. @@ -2869,7 +2869,7 @@ installation menus to try and retry whichever operations have failed. The name of the domain that your machine is - in, e.g. weeble.com for this case. + in, e.g. example.com for this case. @@ -4319,13 +4319,13 @@ Generating RSA keys: Key generation complete. Your identification has been saved in /etc/ssh/ssh_host_key. Your public key has been saved in /etc/ssh/ssh_host_key.pub. The key fingerprint is: -2d:02:37:d2:0e:68:93:8f:9c:46:de:92:f4:be:60:0a root@k6-2.weeble.com +2d:02:37:d2:0e:68:93:8f:9c:46:de:92:f4:be:60:0a root@k6-2.example.com creating ssh DSA host key Generating DSA parameter and key. Your identification has been saved in /etc/ssh/ssh_host_dsa_key. Your public key has been saved in /etc/ssh/ssh_host_dsa_key.pub. The key fingerprint is: -38:af:d2:1f:63:14:00:d8:83:fd:dd:4b:97:1c:43:6d root@k6-2.weeble.com. +38:af:d2:1f:63:14:00:d8:83:fd:dd:4b:97:1c:43:6d root@k6-2.example.com. setting ELF ldconfig path: /usr/lib /usr/lib/compat /usr/X11R6/lib /usr/local/lib setting a.out ldconfig path: /usr/lib/aout /usr/lib/compat/aout @@ -4337,7 +4337,7 @@ Additional ABI support: linux. Local package initilization:. Additional TCP options:. -FreeBSD/i386 (k6-2.weeble.com) (ttyv0) +FreeBSD/i386 (k6-2.example.com) (ttyv0) login: rpratt Password: diff --git a/en_US.ISO8859-1/books/handbook/mail/chapter.sgml b/en_US.ISO8859-1/books/handbook/mail/chapter.sgml index b248a422b0..8036c6840b 100644 --- a/en_US.ISO8859-1/books/handbook/mail/chapter.sgml +++ b/en_US.ISO8859-1/books/handbook/mail/chapter.sgml @@ -1,7 +1,7 @@ @@ -338,7 +338,7 @@ okay.cyberspammer.com OK another.source.of.spam. The next entry accepts mail connections from a host okay.cyberspammer.com, which is more exact than - the cyberspamer.com line above. More specific + the cyberspammer.com line above. More specific matches override less exact matches. The last entry allows relaying of electronic mail from hosts with an IP address that begins with 128.32. These hosts would be able diff --git a/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml b/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml index 80fe1afb3b..32b55a425e 100644 --- a/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml +++ b/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml @@ -350,13 +350,13 @@ bind contain entries for the machine which will be running ppp. Assuming that your machine is called foo.bar.com with the IP address foo.example.com with the IP address 10.0.0.1, /etc/hosts should contain: - 127.0.0.1 localhost.bar.com localhost -::1 localhost.bar.com localhost -10.0.0.1 foo.bar.com foo + 127.0.0.1 localhost.example.com localhost +::1 localhost.example.com localhost +10.0.0.1 foo.example.com foo The first two lines define the alias localhost as a synonym for the current @@ -364,7 +364,7 @@ bind for these lines should always be 127.0.0.1 and ::1. The last line maps - the name foo.bar.com (and the + the name foo.example.com (and the shorthand foo) to the IP address 10.0.0.1. @@ -386,7 +386,7 @@ bind resolver how to behave. Normally, you will need to enter the following line(s): - domain bar.com + domain example.com nameserver x.x.x.x nameserver y.y.y.y @@ -1199,7 +1199,7 @@ set nbns 203.14.100.5 Working from the top down in this file, make sure the hostname= line is set, e.g.: - hostname="foo.bar.com" + hostname="foo.example.com" If your ISP has supplied you with a static IP address and name, it is probably best that you use this name as your host diff --git a/en_US.ISO8859-1/books/handbook/security/chapter.sgml b/en_US.ISO8859-1/books/handbook/security/chapter.sgml index f014f38d48..ecd6672faf 100644 --- a/en_US.ISO8859-1/books/handbook/security/chapter.sgml +++ b/en_US.ISO8859-1/books/handbook/security/chapter.sgml @@ -3238,7 +3238,7 @@ Your identification has been saved in /home/user/.ssh/identity. The following command tells &man.ssh.1; to create a tunnel for telnet. - &prompt.user; ssh -2 -N -f -L 5023:localhost:23 user@foo.bar.com + &prompt.user; ssh -2 -N -f -L 5023:localhost:23 user@foo.example.com &prompt.user; The ssh command is used with the @@ -3285,7 +3285,7 @@ Your identification has been saved in /home/user/.ssh/identity. - + The remote SSH server. @@ -3311,13 +3311,13 @@ Your identification has been saved in /home/user/.ssh/identity. A typical SSH Tunnel - &prompt.user; ssh -2 -N -f -L 5025:localhost:25 user@mailserver.foobar.com -user@mailserver.foobar.com's password: ***** + &prompt.user; ssh -2 -N -f -L 5025:localhost:25 user@mailserver.example.com +user@mailserver.example.com's password: ***** &prompt.user; telnet localhost 5025 Trying 127.0.0.1... Connected to localhost. Escape character is '^]'. -220 mailserver.foobar.com ESMTP +220 mailserver.example.com ESMTP This can be used in conjunction with an &man.ssh-keygen.1; and additional user accounts to create a more seamless/hassle-free @@ -3340,13 +3340,13 @@ Escape character is '^]'. an SSH connection to your office's SSH server, and tunnel through to the mail server. - &prompt.user; ssh -2 -N -f -L 2110:mail.office-foobar.com user@ssh-server.office-foobar.com -user@ssh-server.office-foobar.com's password: ****** + &prompt.user; ssh -2 -N -f -L 2110:mail.example.com user@ssh-server.example.com +user@ssh-server.example.com's password: ****** When the tunnel is up and running, you can point your mail client to send POP3 requests to localhost port 2110. A connection here will be forwarded securely across - the tunnel to mail.office-foobar.com. + the tunnel to mail.example.com. @@ -3367,12 +3367,12 @@ user@ssh-server.office-foobar.com's password: ****** outside of your network's firewall, and use it to tunnel to the Ogg Vorbis server. - &prompt.user; ssh -2 -N -f -L 8888:music.foobar.com:8000 user@unfirewalled.myserver.com + &prompt.user; ssh -2 -N -f -L 8888:music.example.com:8000 user@unfirewalled.myserver.com user@unfirewalled.myserver.com's password: ******* Your streaming client can now be pointed to localhost port 8888, which will be - forwarded over to music.foobar.com port + forwarded over to music.example.com port 8000, successfully evading the firewall.