Applied Robb Roman's patches to upstream.

3 files changed, 42 insertions, 11 deletions

diff --git a/docs/src/user.tex b/docs/src/user.tex
index 1e32afa9d1..2f6bbfbbc6 100644
--- a/docs/src/user.tex
+++ b/docs/src/user.tex
@@ -1,3 +1,4 @@
+\batchmode
 \documentclass[11pt,twoside,final,openright]{report}
 \usepackage{a4,graphicx,html,parskip,setspace,times,xspace}
 \setstretch{1.15}
diff --git a/docs/src/user/installation.tex b/docs/src/user/installation.tex
index fd9b34b1c0..a9f567d5fe 100644
--- a/docs/src/user/installation.tex
+++ b/docs/src/user/installation.tex
@@ -35,10 +35,9 @@ if you wish to build from source.
 Once you have satisfied these prerequisites, you can now install either
 a binary or source distribution of Xen.
 
-
 \section{Installing from Binary Tarball}
 
-Pre-built tarballs are available for download from the Xen download
+Pre-built tarballs are available for download from the XenSource downloads
 page:
 \begin{quote} {\tt http://www.xensource.com/downloads/}
 \end{quote}
@@ -53,7 +52,22 @@ Once you've downloaded the tarball, simply unpack and install:
 Once you've installed the binaries you need to configure your system as
 described in Section~\ref{s:configure}.
 
+\section{Installing from RPMs}
+Pre-built RPMs are available for download from the XenSource downloads
+page:
+\begin{quote} {\tt http://www.xensource.com/downloads/}
+\end{quote}
 
+Once you've downloaded the RPMs, you typically install them via the RPM commands:
+\begin{verbatim}
+# rpm -ivh \emph{rpmname}
+\end{verbatim}
+
+See the instructions and the Release Notes for each RPM set referenced at:
+  \begin{quote}
+    {\tt http://www.xensource.com/downloads/}.
+  \end{quote}
+ 
 \section{Installing from Source}
 
 This section describes how to obtain, build and install Xen from source.
@@ -88,9 +102,9 @@ or as a clone of our master Mercurial repository.
 % \item[\path{tools/}] Xen node controller daemon (Xend), command line
 %   tools, control libraries
 % \item[\path{xen/}] The Xen VMM.
+% \item[\path{buildconfigs/}] Build configuration files
 % \item[\path{linux-*-xen-sparse/}] Xen support for Linux.
-% \item[\path{linux-*-patches/}] Experimental patches for Linux.
-% \item[\path{netbsd-*-xen-sparse/}] Xen support for NetBSD.
+% \item[\path{patches/}] Experimental patches for Linux.
 % \item[\path{docs/}] Various documentation files for users and
 %   developers.
 % \item[\path{extras/}] Bonus extras.
@@ -221,7 +235,7 @@ destinations.
 
 %% Files in \path{install/boot/} include:
 %% \begin{itemize}
-%% \item \path{install/boot/xen-2.0.gz} Link to the Xen 'kernel'
+%% \item \path{install/boot/xen-3.0.gz} Link to the Xen 3.0 'kernel'
 %% \item \path{install/boot/vmlinuz-2.6-xen0} Link to domain 0
 %%   XenLinux kernel
 %% \item \path{install/boot/vmlinuz-2.6-xenU} Link to unprivileged
@@ -287,9 +301,11 @@ When installing a new kernel, it is recommended that you do not delete
 existing menu options from \path{menu.lst}, as you may wish to boot your
 old Linux kernel in future, particularly if you have problems.
 
+%% KMS: Additional configurations as an Appendix?
+
 \subsection{Serial Console (optional)}
 
-%% kernel /boot/xen-2.0.gz dom0_mem=131072 com1=115200,8n1
+%% kernel /boot/xen-3.0.gz dom0_mem=131072 com1=115200,8n1
 %% module /boot/vmlinuz-2.6-xen0 root=/dev/sda4 ro
 
 In order to configure Xen serial console output, it is necessary to add
@@ -311,9 +327,9 @@ necessary to add a line into \path{/etc/inittab}. Add the line:
 \begin{quote} {\small {\tt c:2345:respawn:/sbin/mingetty ttyS0}}
 \end{quote}
 
-and you should be able to log in. To successfully log in as root over
-the serial line will require adding \path{ttyS0} to
-\path{/etc/securetty} if it is not already there.
+run \path{init q} to force init to re-examine \path{/etc/inittab}, and
+you should be able to log in.  Add \path{ttyS0} to \path{/etc/securetty}
+to allow root logins over serial console, if it is not already there.
 
 \subsection{TLS Libraries}
 
diff --git a/docs/src/user/start_addl_dom.tex b/docs/src/user/start_addl_dom.tex
index da686645c6..ceea583060 100644
--- a/docs/src/user/start_addl_dom.tex
+++ b/docs/src/user/start_addl_dom.tex
@@ -1,7 +1,7 @@
 \chapter{Starting Additional Domains}
 
 The first step in creating a new domain is to prepare a root
-filesystem for it to boot from.  Typically, this might be stored in a
+filesystem for it to boot.  Typically, this might be stored in a
 normal partition, an LVM or other volume manager partition, a disk
 file or on an NFS server.  A simple way to do this is simply to boot
 from your standard OS install CD and install the distribution into
@@ -12,6 +12,10 @@ To start the \xend\ control daemon, type
   \verb!# xend start!
 \end{quote}
 
+%% KMS: If we're going to use '# cmd' syntax we should be consistent
+%% about it and have a conventions section noting that '#' == root
+%% prompt.
+
 If you wish the daemon to start automatically, see the instructions in
 Section~\ref{s:xend}. Once the daemon is running, you can use the
 \path{xm} tool to monitor and maintain the domains running on your
@@ -70,11 +74,21 @@ you may wish to edit include:
 You may also want to edit the {\bf vif} variable in order to choose
 the MAC address of the virtual ethernet interface yourself.  For
 example:
+%% KMS:  We should indicate "safe" ranges to use.
 \begin{quote}
 \verb_vif = ['mac=00:06:AA:F6:BB:B3']_
 \end{quote}
 If you do not set this variable, \xend\ will automatically generate a
-random MAC address from an unused range.
+random MAC address from the range 00:16:3E:xx:xx:xx.  Generated MACs are
+not tested for possible collisions, however likelihood of this is low at
+\begin{math} 1:2^{48}.\end{math}  XenSource Inc.  gives permission for
+anyone to use addresses randomly allocated from this range for use by
+their Xen domains.
+
+
+For a list of IEEE
+assigned MAC organizationally unique identifiers (OUI), see \newline
+{\tt http://standards.ieee.org/regauth/oui/oui.txt}
 
 
 \section{Booting the Domain}