diff --git a/en_US.ISO8859-1/articles/linux-users/article.xml b/en_US.ISO8859-1/articles/linux-users/article.xml
index 211068a5fa..ba8c2b1d20 100644
--- a/en_US.ISO8859-1/articles/linux-users/article.xml
+++ b/en_US.ISO8859-1/articles/linux-users/article.xml
@@ -48,7 +48,7 @@
- Shells: No Bash?
+ Default Shell&linux; users are often surprised to find that
Bash is not the default shell in &os;.
@@ -160,13 +160,13 @@
- System Startup: Where are the run-levels?
+ System Startup
- &linux; uses the SysV init system, whereas &os; uses the
- traditional BSD-style &man.init.8;. Under the BSD-style &man.init.8;
- there are no run-levels and no /etc/inittab,
- instead startup is controlled by the &man.rc.8; utility. The
- /etc/rc script reads
+ Many &linux; distributions use the SysV init system, whereas &os; uses the
+ traditional BSD-style &man.init.8;. Under the BSD-style &man.init.8;,
+ there are no run-levels and /etc/inittab does not exist.
+ Instead, startup is controlled by &man.rc.8; scripts. At system boot,
+ /etc/rc reads
/etc/defaults/rc.conf and
/etc/rc.conf to determine which services are to be
started. The specified services are then started by running the
@@ -176,73 +176,63 @@
the scripts located in /etc/init.d/ on &linux;
systems.
-
- Why are there two locations for service initialization
- scripts? The scripts found in
+ The scripts found in
/etc/rc.d/ are for applications that are part of
- the base system. (&man.cron.8;, &man.sshd.8;,
- &man.syslog.3;, and others.) The scripts in
+ the base system, such as &man.cron.8;, &man.sshd.8;, and
+ &man.syslog.3;. The scripts in
/usr/local/etc/rc.d/ are for user-installed
- applications such as Apache,
- Squid, etc.
+ applications such as Apache and
+ Squid.
- What is the difference between the base
- system and user-installed applications? FreeBSD is
- developed as a complete operating system. In other words, the
- kernel, system libraries, and userland utilities (such as &man.ls.1;,
- &man.cat.1;, &man.cp.1;, etc.) are developed and released together as
- one. This is what is referred to as the base system.
- The user-installed applications are applications that are not part of
- the base system, such as
- Apache, X11,
- Mozilla Firefox, etc. These
- user-installed applications are generally installed using &os;'s Packages and Ports Collection.
+ Since &os; is
+ developed as a complete operating system,
+ user-installed applications are not considered to be part of
+ the base system.
+ User-installed applications are generally installed using Packages or Ports.
In order to keep them separate from the base system,
- user-installed applications are normally installed under
- /usr/local/. Therefore the user-installed
+ user-installed applications are installed under
+ /usr/local/. Therefore, user-installed
binaries reside in /usr/local/bin/,
configuration files are in /usr/local/etc/,
and so on.
-
- Services are enabled by specifying
- ServiceName_enable="YES" in
- /etc/rc.conf (&man.rc.conf.5;). Take a look at
- /etc/defaults/rc.conf for the system defaults,
+ Services are enabled by adding an entry for the service in
+ /etc/rc.conf . The system defaults are found in
+ /etc/defaults/rc.conf and
these default settings are overridden by settings in
- /etc/rc.conf. Also, when installing additional
- applications be sure to review the documentation to determine how to
+ /etc/rc.conf. Refer to &man.rc.conf.5; for
+ more information about the available entries. When installing additional
+ applications, review the application's install message to determine how to
enable any associated services.
- The following snippet from /etc/rc.conf enables
- &man.sshd.8; and Apache 2.2. It also
- specifies that Apache should be started
- with SSL.
+ The following entries in /etc/rc.conf enable
+ &man.sshd.8;, enable Apache 2.4, and
+ specify that Apache should be started
+ with SSL.# enable SSHD
sshd_enable="YES"
# enable Apache with SSL
-apache22_enable="YES"
-apache22_flags="-DSSL"
+apache24_enable="YES"
+apache24_flags="-DSSL"
Once a service has been enabled in /etc/rc.conf,
- the service can be started from the command line (without rebooting the
- system):
+ it can be started without rebooting the
+ system:
- &prompt.root; /etc/rc.d/sshd start
+ &prompt.root; service sshd start
+ &prompt.root; service apache24 start
- If a service has not been enabled it can be started from the
- command line using :
+ If a service has not been enabled, it can be started from the
+ command line using :
- &prompt.root; /etc/rc.d/sshd forcestart
+ &prompt.root; service sshd onestartNetwork configuration
-
- Network Interfaces
-
Instead of a generic ethX identifier that
&linux; uses to identify a network interface, &os; uses the driver
name followed by a number as the identifier. The following output
@@ -262,75 +252,67 @@ em1: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500
ether 00:50:56:a7:03:2b
media: Ethernet autoselect (1000baseTX <full-duplex>)
status: active
-
-
- IP Configuration
-
- An IP address can be assigned to an interface using
- &man.ifconfig.8;. However, to remain persistent across reboots the
- IP configuration must be included in
+ An IP address can be assigned to an interface using
+ &man.ifconfig.8;. To remain persistent across reboots, the
+ IP configuration must be included in
/etc/rc.conf. The following example
- specifies the hostname, IP address, and default gateway:
+ specifies the hostname, IP address, and default gateway:hostname="server1.example.com"
-ifconfig_em0="inet 10.10.10.100 netmask 255.255.255.0"
+ifconfig_em0="inet 10.10.10.100 netmask 255.255.255.0"
defaultrouter="10.10.10.1"
- Use the following to configure an interface for DHCP:
+ Use the following to instead configure an interface for DHCP:hostname="server1.example.com"
ifconfig_em0="DHCP"
-
- Firewall
- Like IPTABLES in &linux;, &os; also offers
- a kernel level firewall; actually &os; offers three firewalls:
+ &os; does not use &linux; IPTABLES for its firewall. Instead, &os; offers
+ a choice of three kernel level firewalls:
- IPFIREWALL
- IPFILTERPF
+ IPFILTER
+ IPFW
- IPFIREWALL or
- IPFW (the command to manage an
- IPFW ruleset is &man.ipfw.8;) is the
- firewall developed and maintained by the &os; developers.
- IPFW can be paired with &man.dummynet.4; to
- provide traffic shaping capabilities and simulate different types of
- network connections.
+ PF is
+ developed by the OpenBSD project and ported to &os;. PF was
+ created as a replacement for IPFILTER and
+ its syntax is similar to that of
+ IPFILTER. PF can
+ be paired with &man.altq.4; to provide QoS features.
- Sample IPFW rule to allow
- SSH in:
+ This sample PF entry allows inbound
+ SSH:
- ipfw add allow tcp from any to me 22 in via $ext_if
+ pass in on $ext_if inet proto tcp from any to ($ext_if) port 22
- IPFILTER is the firewall application
- developed by Darren Reed. It is not specific to &os;, and has been
+ IPFILTER is the firewall application
+ developed by Darren Reed. It is not specific to &os; and has been
ported to several operating systems including NetBSD, OpenBSD, SunOS,
HP/UX, and Solaris.
- Sample IPFILTER command to allow
- SSH in:
+ The IPFILTER syntax to allow inbound
+ SSH is:pass in on $ext_if proto tcp from any to any port = 22
+
+ IPFW is the
+ firewall developed and maintained by &os;.
+ It can be paired with &man.dummynet.4; to
+ provide traffic shaping capabilities and simulate different types of
+ network connections.
- The last firewall application, PF, is
- developed by the OpenBSD project. PF was
- created as a replacement for IPFILTER. As
- such, the PF syntax is very similar to that of
- IPFILTER. PF can
- be paired with &man.altq.4; to provide QoS features.
+ The IPFW syntax to allow inbound
+ SSH would be:
- Sample PF command to allow
- SSH in:
-
- pass in on $ext_if inet proto tcp from any to ($ext_if) port 22
+ ipfw add allow tcp from any to me 22 in via $ext_if