svn commit: r46833 - head/en_US.ISO8859-1/articles/linux-users

[Benedict Reuschling]

Author: bcr
Date: Tue Jun 16 12:36:35 2015
New Revision: 46833
URL: https://svnweb.freebsd.org/changeset/doc/46833

Log:
  Clarify which is the default shell available to users and root.
  Also, mention the compatibility between shells with regards to scripts.
  Two other xml tag inconsistencies were fixed.
  
  PR: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=193892
  Differential Revision: https://reviews.freebsd.org/D2834
  Submitted by:	kpaasial icloud com
  Patch by:	Anthony Perkins (plus a minor change based on the review)
  Reviewed by:	allanjude

Modified:
  head/en_US.ISO8859-1/articles/linux-users/article.xml

Modified: head/en_US.ISO8859-1/articles/linux-users/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/linux-users/article.xml	Tue Jun 16 04:42:19 2015	(r46832)
+++ head/en_US.ISO8859-1/articles/linux-users/article.xml	Tue Jun 16 12:36:35 2015	(r46833)
@@ -54,12 +54,19 @@
 
     <para>&linux; users are often surprised to find that
       <application>Bash</application> is not the default shell in
-      &os;.  In fact, <application>Bash</application> is not even in
-      the default installation.  Instead, &os; uses &man.tcsh.1; as
-      the default shell.  However, <application>Bash</application> and
-      other shells are available for installation using the &os; <link
-	xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/ports.html">Packages
-	and Ports Collection</link>.</para>
+      &os;.  In fact, <application>Bash</application> is not included
+      in the default installation.  Instead, &os; uses &man.tcsh.1;
+      as the default root shell, and the <application>Bourne
+      shell</application>-compatible &man.sh.1; as the default user
+      shell.  &man.sh.1; is very similar to <application>Bash</application>
+      but with a much smaller feature-set.  Generally shell scripts
+      written for &man.sh.1; will run in <application>Bash</application>,
+      but the reverse is not always true.</para>
+
+    <para>However, <application>Bash</application> and other shells
+      are available for installation using the &os; <link
+      xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/ports.html">Packages
+      and Ports Collection</link>.</para>
 
     <para>After installing another shell, use &man.chsh.1; to change
       a user's default shell.  It is recommended that the
@@ -130,7 +137,7 @@
 	equivalents of <filename>.deb</filename> files on
 	Debian/Ubuntu based systems and <filename>.rpm</filename>
 	files on Red Hat/Fedora based systems.  Packages are
-	installed using <application>pkg</application>.  For example,
+	installed using <command>pkg</command>.  For example,
 	the following command installs
 	<application>Apache 2.4</application>:</para>
 
@@ -247,7 +254,7 @@ apache24_flags="-DSSL"</programlisting>
       rebooting the system:</para>
 
     <screen>&prompt.root; <userinput>service <replaceable>sshd</replaceable> start</userinput>
-&prompt.root; <userinput>service apache24 start</userinput></screen>
+&prompt.root; <userinput>service <replaceable>apache24</replaceable> start</userinput></screen>
 
     <para>If a service has not been enabled, it can be started from
       the command line using <option>onestart</option>:</para>