diff -r dbac9ee4d761 docs/src/user.tex
--- a/docs/src/user.tex	Mon Sep 08 16:02:13 2008 +0100
+++ b/docs/src/user.tex	Tue Sep 09 13:36:39 2008 +0100
@@ -183,6 +183,18 @@ NetBSD, FreeBSD and Solaris are also com
 
 \section{Hardware Support}
 
+<<<<<<< /nfs/vol00/scratch-2/stephensp/xen-unstable.hg/docs/src/user.tex
+Xen currently runs on the x86 architecture, requiring a ``P6'' or
+newer processor (e.g.\ Pentium Pro, Celeron, Pentium~II, Pentium~III,
+Pentium~IV, Xeon, AMD~Athlon, AMD~Duron). Multiprocessor machines are
+supported, and there is support for HyperThreading (SMT).  In 
+addition, ports to IA64, ARM, and Power architectures are supported.
+
+The default 32-bit Xen supports for Intel's Physical Addressing Extensions (PAE), which enable x86/32 machines to address up to 64 GB of physical memory.
+It also supports non-PAE 32-bit Xen up to 4GB of memory. 
+Xen also supports x86/64 platforms such as Intel EM64T and AMD Opteron
+which can currently address up to 1TB of physical memory.
+=======
 Xen currently runs on the IA64 and x86 architectures. Multiprocessor
 machines are supported, and there is support for HyperThreading (SMT).
 
@@ -191,6 +203,7 @@ up to 16GB of physical memory. Xen also 
 up to 16GB of physical memory. Xen also supports x86/64 platforms
 such as Intel EM64T and AMD Opteron which can currently address up to
 1TB of physical memory.
+>>>>>>> /tmp/user.tex~other.WX1I1y
 
 Xen offloads most of the hardware support issues to the guest OS
 running in the \emph{Domain~0} management virtual machine. Xen itself
@@ -4252,7 +4265,7 @@ directory of the Xen source distribution
 \section{Online References}
 
 The official Xen web site can be found at:
-\begin{quote} {\tt http://www.xensource.com}
+\begin{quote} {\tt http://www.xen.org}
 \end{quote}
 
 This contains links to the latest versions of all online
@@ -4282,7 +4295,7 @@ mailing lists and subscription informati
   Subscribe at: \\
   {\small {\tt http://lists.xensource.com/xen-announce}}
 \item[xen-changelog@xxxxxxxxxxxxxxxxxxx] Changelog feed
-  from the unstable and 2.0 trees - developer oriented.  Subscribe at: \\
+  from the unstable and 3.0 trees - developer oriented.  Subscribe at: \\
   {\small {\tt http://lists.xensource.com/xen-changelog}}
 \end{description}