diff options
author | Tom Rhodes <trhodes@FreeBSD.org> | 2005-07-21 09:16:14 +0000 |
---|---|---|
committer | Tom Rhodes <trhodes@FreeBSD.org> | 2005-07-21 09:16:14 +0000 |
commit | 72849eddb9bce19e3271f8ff8d04524705e83788 (patch) | |
tree | 3e219ce1592f71da35b08a111ad3e31d253327ba /en_US.ISO8859-1 | |
parent | 3cfa31a6a34f8c46f6a8e18487c44a2befbc4c8c (diff) | |
download | doc-72849eddb9bce19e3271f8ff8d04524705e83788.tar.gz doc-72849eddb9bce19e3271f8ff8d04524705e83788.zip |
filesystem -> file system
Notes
Notes:
svn path=/head/; revision=25189
Diffstat (limited to 'en_US.ISO8859-1')
-rw-r--r-- | en_US.ISO8859-1/books/handbook/Makefile | 1 | ||||
-rw-r--r-- | en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml | 34 | ||||
-rw-r--r-- | en_US.ISO8859-1/books/handbook/book.sgml | 2 | ||||
-rw-r--r-- | en_US.ISO8859-1/books/handbook/chapters.ent | 1 |
4 files changed, 21 insertions, 17 deletions
diff --git a/en_US.ISO8859-1/books/handbook/Makefile b/en_US.ISO8859-1/books/handbook/Makefile index b0dca1956f..067b62a88e 100644 --- a/en_US.ISO8859-1/books/handbook/Makefile +++ b/en_US.ISO8859-1/books/handbook/Makefile @@ -150,6 +150,7 @@ IMAGES_LIB+= callouts/10.png # # SGML content +SRCS+= audit/chapter.sgml SRCS+= book.sgml SRCS+= colophon.sgml SRCS+= freebsd-glossary.sgml 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 a79a5b9cb6..359c37dd2d 100644 --- a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml +++ b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml @@ -1976,7 +1976,7 @@ net.link.ether.bridge_ipfw=1</programlisting> <indexterm><primary>diskless operation</primary></indexterm> <para>A FreeBSD machine can boot over the network and operate without a - local disk, using filesystems mounted from an <acronym>NFS</acronym> server. No system + local disk, using file systems mounted from an <acronym>NFS</acronym> server. No system modification is necessary, beyond standard configuration files. Such a system is relatively easy to set up because all the necessary elements are readily available:</para> @@ -2007,7 +2007,7 @@ net.link.ether.bridge_ipfw=1</programlisting> <listitem> <para>A sample script (<filename>/usr/share/examples/diskless/clone_root</filename>) eases - the creation and maintenance of the workstation's root filesystem + the creation and maintenance of the workstation's root file system on the server. The script will probably require a little customization but it will get you started very quickly.</para> </listitem> @@ -2033,14 +2033,14 @@ net.link.ether.bridge_ipfw=1</programlisting> <itemizedlist> <listitem> <para>The diskless workstations use a shared - read-only <filename>/</filename> filesystem, and a shared + read-only <filename>/</filename> file system, and a shared read-only <filename>/usr</filename>.</para> - <para>The root filesystem is a copy of a + <para>The root file system is a copy of a standard FreeBSD root (typically the server's), with some configuration files overridden by ones specific to diskless operation or, possibly, to the workstation they belong to.</para> <para>The parts of the root which have to be - writable are overlaid with &man.mfs.8; (&os; 4.X) or &man.md.4; (&os; 5.X) filesystems. Any changes + writable are overlaid with &man.mfs.8; (&os; 4.X) or &man.md.4; (&os; 5.X) file systems. Any changes will be lost when the system reboots.</para> </listitem> <listitem> @@ -2153,7 +2153,7 @@ net.link.ether.bridge_ipfw=1</programlisting> </listitem> <listitem> - <para>Finally, the machine needs to access its filesystems. + <para>Finally, the machine needs to access its file systems. <acronym>NFS</acronym> is used in all cases.</para> </listitem> </itemizedlist> @@ -2259,7 +2259,7 @@ subnet 192.168.4.0 netmask 255.255.255.0 { <callout arearefs="co-dhcp-root-path"><para>The <literal>root-path</literal> option defines the path to - the root filesystem, in usual <acronym>NFS</acronym> notation. + the root file system, in usual <acronym>NFS</acronym> notation. When using <acronym>PXE</acronym>, it is possible to leave off the host's IP as long as you do not enable the kernel option BOOTP. The <acronym>NFS</acronym> server will then be @@ -2418,7 +2418,7 @@ margaux:ha=0123456789ab:tc=.def100 <filename>dhcpd.conf</filename>.</para> <para>In all cases, you also need to enable <acronym>NFS</acronym> and export the - appropriate filesystem on the <acronym>NFS</acronym> server.</para> + appropriate file system on the <acronym>NFS</acronym> server.</para> <procedure> <step> @@ -2427,7 +2427,7 @@ margaux:ha=0123456789ab:tc=.def100 </step> <step> - <para>Export the filesystem where the diskless root directory + <para>Export the file system where the diskless root directory is located by adding the following to <filename>/etc/exports</filename> (adjust the volume mount point and replace <replaceable>margaux corbieres</replaceable> @@ -2460,7 +2460,7 @@ margaux:ha=0123456789ab:tc=.def100 <programlisting> options BOOTP # Use BOOTP to obtain IP address/hostname -options BOOTP_NFSROOT # NFS mount root filesystem using BOOTP info +options BOOTP_NFSROOT # NFS mount root file system using BOOTP info </programlisting> <para>You may also want to use <literal>BOOTP_NFSV3</literal>, @@ -2509,7 +2509,7 @@ options BOOTP_NFSROOT # NFS mount root filesystem using BOOTP info <secondary>diskless operation</secondary> </indexterm> - <para>You need to create a root filesystem for the diskless + <para>You need to create a root file system for the diskless workstations, in the location listed as <literal>root-path</literal> in <filename>dhcpd.conf</filename>. The following sections describe @@ -2518,16 +2518,16 @@ options BOOTP_NFSROOT # NFS mount root filesystem using BOOTP info <sect4> <title>Using the <filename>clone_root</filename> Script</title> - <para>This is the quickest way to create a root filesystem, but + <para>This is the quickest way to create a root file system, but currently it is only supported on &os; 4.X. This shell script is located at <filename>/usr/share/examples/diskless/clone_root</filename> and needs customization, at least to adjust - the place where the filesystem will be created (the + the place where the file system will be created (the <literal>DEST</literal> variable).</para> <para>Refer to the comments at the top of the script for - instructions. They explain how the base filesystem is built, + instructions. They explain how the base file system is built, and how files may be selectively overridden by versions specific to diskless operation, to a subnetwork, or to an individual workstation. They also give examples for the diskless @@ -2552,7 +2552,7 @@ options BOOTP_NFSROOT # NFS mount root filesystem using BOOTP info Procedure</title> <para>This method can be applied to either &os; 4.X or 5.X and - will install a complete virgin system (not only the root filesystem) + will install a complete virgin system (not only the root file system) into <envar>DESTDIR</envar>. All you have to do is simply execute the following script:</para> @@ -2678,8 +2678,8 @@ host margaux { <sect4> <title>Using a Non-FreeBSD Server</title> - <para>When the server for the root filesystem is not running FreeBSD, - you will have to create the root filesystem on a + <para>When the server for the root file system is not running FreeBSD, + you will have to create the root file system on a FreeBSD machine, then copy it to its destination, using <command>tar</command> or <command>cpio</command>.</para> <para>In this situation, there are sometimes diff --git a/en_US.ISO8859-1/books/handbook/book.sgml b/en_US.ISO8859-1/books/handbook/book.sgml index 069a8afe5d..8e057f69d0 100644 --- a/en_US.ISO8859-1/books/handbook/book.sgml +++ b/en_US.ISO8859-1/books/handbook/book.sgml @@ -45,6 +45,7 @@ <!ENTITY % chap.index "IGNORE"> <!ENTITY % chap.freebsd-glossary "IGNORE"> <!ENTITY % chap.mac "IGNORE"> +<!ENTITY % chap.audit "IGNORE"> <!ENTITY % pgpkeys SYSTEM "../../../share/pgpkeys/pgpkeys.ent"> %pgpkeys; ]> @@ -258,6 +259,7 @@ <![ %chap.users; [ &chap.users; ]]> <![ %chap.security; [ &chap.security; ]]> <![ %chap.mac; [ &chap.mac; ]]> + <![ %chap.audit; [ &chap.audit; ]]> <![ %chap.disks; [ &chap.disks; ]]> <![ %chap.vinum; [ &chap.vinum; ]]> <![ %chap.l10n; [ &chap.l10n; ]]> diff --git a/en_US.ISO8859-1/books/handbook/chapters.ent b/en_US.ISO8859-1/books/handbook/chapters.ent index 6585365fd0..81f08c8170 100644 --- a/en_US.ISO8859-1/books/handbook/chapters.ent +++ b/en_US.ISO8859-1/books/handbook/chapters.ent @@ -31,6 +31,7 @@ <!ENTITY chap.users SYSTEM "users/chapter.sgml"> <!ENTITY chap.security SYSTEM "security/chapter.sgml"> <!ENTITY chap.mac SYSTEM "mac/chapter.sgml"> +<!ENTITY chap.audit SYSTEM "audit/chapter.sgml"> <!ENTITY chap.disks SYSTEM "disks/chapter.sgml"> <!ENTITY chap.vinum SYSTEM "vinum/chapter.sgml"> <!ENTITY chap.l10n SYSTEM "l10n/chapter.sgml"> |