[SCM] live-manual branch, debian, updated. debian/2.0.0-1-24-gcf5c0a6

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit cf5c0a68d5d3189bf20455a09b0e5d7b080ef208
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Dec 17 13:12:47 2010 +0100

    Adding reference to syslinux wiki for setting up a pxe server.

diff --git a/manual/en/user_basics.ssi b/manual/en/user_basics.ssi
index ca12046..84f1173 100644
--- a/manual/en/user_basics.ssi
+++ b/manual/en/user_basics.ssi
@@ -272,7 +272,7 @@ code{
 
 }code
 
-Setting up these three services can be a little tricky. You might need some patience to get all of them working together. The Debian Installer Manual's TFTP Net Booting section at http://d-i.alioth.debian.org/manual/en.i386/ch04s05.html might help as that process is very similar.
+Setting up these three services can be a little tricky. You might need some patience to get all of them working together. For more information, see the syslinux wiki at http://syslinux.zytor.com/wiki/index.php/PXELINUX or the Debian Installer Manual's TFTP Net Booting section at http://d-i.alioth.debian.org/manual/en.i386/ch04s05.html. They might help, as their processes are very similar.
 
 3~ Netboot testing HowTo
 

-- 
live-manual