Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 15 Oct 2013 00:37:17 +0000 (UTC)
From:      Dru Lavigne <dru@FreeBSD.org>
To:        doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org
Subject:   svn commit: r42961 - head/en_US.ISO8859-1/books/handbook/linuxemu
Message-ID:  <201310150037.r9F0bH72067432@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dru
Date: Tue Oct 15 00:37:17 2013
New Revision: 42961
URL: http://svnweb.freebsd.org/changeset/doc/42961

Log:
  Comment out Oracle for now as it too is only 64-bit.
  Use ignore instead of dashes and comments as this is a cleaner way to accomplish this.
  
  Approved by:	hrs (mentor)

Modified:
  head/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml

Modified: head/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml	Mon Oct 14 20:30:56 2013	(r42960)
+++ head/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml	Tue Oct 15 00:37:17 2013	(r42961)
@@ -326,7 +326,7 @@ multi on</programlisting>
     </sect2>
   </sect1>
 
-  <!--
+<?ignore
   While the installer works, the binaries do not. As of Oct 2013, Linux
   emulation is 32-bit but the trial version of Mathematica is only
   available as 64-bit. This section should be revisited if Linux
@@ -521,12 +521,13 @@ Installation complete.</programlisting>
 	  <filename>/usr/local/maple/bin/maple.system.type</filename>
 	  with the following:</para>
 
-	<programlisting>   &dash;&dash;&dash;&dash;- snip &dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;
+  
+	<programlisting>   ----- snip ------------------
 *** maple.system.type.orig      Sun Jul  8 16:35:33 2001
-&dash;&dash;- maple.system.type   Sun Jul  8 16:35:51 2001
+-- - maple.system.type   Sun Jul  8 16:35:51 2001
 ***************
 *** 72,77 ****
-&dash;&dash;- 72,78 &dash;&dash;&dash;&dash;
+-- - 72,78 ----
           # the IBM RS/6000 AIX case
           MAPLE_BIN="bin.IBM_RISC_UNIX"
           ;;
@@ -534,7 +535,7 @@ Installation complete.</programlisting>
       "Linux")
           # the Linux/x86 case
         # We have two Linux implementations, one for Red Hat and
-   &dash;&dash;&dash;&dash;- snip end of patch &dash;&dash;&dash;&dash;-</programlisting>
+   ----- snip end of patch -----</programlisting>
 
 	<para>Note that no whitespace should be present after
 	  <literal>"FreeBSD"|\</literal>.</para>
@@ -553,7 +554,7 @@ Installation complete.</programlisting>
 	  <filename>/usr/local/rtc/rc.d/lmgrd</filename> is a
 	  convenient way to start up <command>lmgrd</command>:</para>
 
-	<programlisting>   &dash;&dash;&dash;&dash;- snip &dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;
+	<programlisting>   ----- snip ------------
 
 #! /bin/sh
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
@@ -578,7 +579,7 @@ stop)
 esac
 
 exit 0
-   &dash;&dash;&dash;&dash;- snip &dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;</programlisting></step>
+   ----- snip ------------</programlisting></step>
 
 
       <step><para>Test that
@@ -871,9 +872,11 @@ exit 0</programlisting>
 	use.</para>
     </sect2>
   </sect1>
-  -->
 
   <sect1 id="linuxemu-oracle">
+    While the Oracle website is unclear, the installation script is: You
+    are attempting to install 64-bit Oracle on a 32-bit operating system.
+    This is not supported and will not work.
     <sect1info>
       <authorgroup>
 	<author>
@@ -881,7 +884,6 @@ exit 0</programlisting>
 	  <surname>Moolenaar</surname>
 	  <contrib>Contributed by </contrib>
 	</author>
-	<!-- marcel@cup.hp.com -->
       </authorgroup>
     </sect1info>
     <title>Installing &oracle;</title>
@@ -1084,7 +1086,7 @@ export PATH</programlisting>
 ! CHOWN=/bin/chown
 #
 # Define variables to be used in this script
---- 31,37 ----
+ --- 31,37 ----
 # This is the default value for CHOWN
 # It will redefined later in this script for those ports
 # which have it conditionally defined in ss_install.h
@@ -1135,6 +1137,7 @@ export PATH</programlisting>
 	running on &linux;.</para>
     </sect2>
   </sect1>
+?>
 
   <sect1 id="linuxemu-advanced">
     <title>Advanced Topics</title>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310150037.r9F0bH72067432>