From a080be81d05f249719ef669792c208af0574055e Mon Sep 17 00:00:00 2001
From: Marc Fonvieille <blackend@FreeBSD.org>
Date: Sat, 24 Sep 2005 14:57:42 +0000
Subject: [PATCH] - Use of &base; instead of ../ - Fix/update various links -
 Mention Xorg server in X part

---
 en/projects/newbies.sgml | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)
diff --git a/en/projects/newbies.sgml b/en/projects/newbies.sgml
index 1c5aefd815..6f05a241be 100644
--- a/en/projects/newbies.sgml
+++ b/en/projects/newbies.sgml
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/projects/newbies.sgml,v 1.43 2005/09/17 17:48:35 remko Exp $">
+<!ENTITY date "$FreeBSD: www/en/projects/newbies.sgml,v 1.44 2005/09/24 14:39:05 blackend Exp $">
 <!ENTITY title 'Resources for Newbies'>
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
@@ -28,16 +28,16 @@
       FreeBSD. Newbies have found the following pages particularly helpful:</p>
 
     <ul>
-      <li><p><a href="../search/search.html">Search</a> the Handbook and FAQ, the
+      <li><p><a href="&base;/search/search.html">Search</a> the Handbook and FAQ, the
 	  whole web site, or the archives of the FreeBSD-Questions mailing
 	  list.</p></li>
       
-      <li><p>The <a href="../docs.html">Documentation</a> page has links to the
+      <li><p>The <a href="&base;/docs.html">Documentation</a> page has links to the
 	  Handbook and FAQ, tutorials, information about contributing to the
 	  Documentation Project, documents in languages other than English,
 	  and much more.</p></li>
       
-      <li><p>The <a href="../support.html">Support</a> page contains a wealth of
+      <li><p>The <a href="&base;/support.html">Support</a> page contains a wealth of
 	  information about FreeBSD, including mailing lists, user groups, web
 	  and FTP sites, release information, and links to some sources of
 	  &unix; information.</p></li>
@@ -50,11 +50,11 @@
 	  <a href="&u.rel.announce;">latest mainstream release</a>.
           (See the Handbook for why you should <strong>not</strong> be tempted
           by any of the other branches.) Before you begin, carefully read the
-          <a href="../doc/en_US.ISO8859-1/books/handbook/install.html">installation instructions</a>,
+          <a href="&base;/doc/en_US.ISO8859-1/books/handbook/install.html">installation instructions</a>,
           as well as each one of the *.TXT files in the FTP directory
           or on the installation CD. They are there because they contain information
           that you will need. Also pick up the latest
-          <a href="../releases/index.html">errata file</a>
+          <a href="&base;/releases/index.html">errata file</a>
           from the web site, in case it has been updated.</p>
 
          <p>If you decide to download FreeBSD, check whether these illustrated and
@@ -74,7 +74,7 @@
       <li><p>The first thing many people need to set up is ppp, and there is
           a lot of documentation to help. You might start with at least those
           parts of the
-          <a href="../doc/en_US.ISO8859-1/books/handbook/index.html">Handbook</a>
+          <a href="&base;/doc/en_US.ISO8859-1/books/handbook/index.html">Handbook</a>
           that are relevant to your needs, and explore the
           <a href="http://www.awfulhak.org/ppp.html">ppp page</a>
           for links to the other valuable information and the latest updates.</p></li>
@@ -86,8 +86,8 @@
 	  everything you need to know to set up and run a FreeBSD system. You
 	  also get to understand what you are doing and why.</p></li>
       
-      <li><p>The <a href="../doc/en_US.ISO8859-1/books/handbook/index.html">FreeBSD Handbook</a> and <a
-	    href="../doc/en_US.ISO8859-1/books/faq/index.html">Frequently Asked Questions (FAQ)</a> are the
+      <li><p>The <a href="&base;/doc/en_US.ISO8859-1/books/handbook/index.html">FreeBSD Handbook</a> and <a
+	    href="&base;/doc/en_US.ISO8859-1/books/faq/index.html">Frequently Asked Questions (FAQ)</a> are the
 	  main documents for FreeBSD. Essential reading, they contain a lot of
 	  material for newbies as well as some pretty advanced stuff. Do not
 	  worry if you are unable to understand the advanced sections. The handbook
@@ -100,7 +100,7 @@
 	  the following form:
 	  <a href="http://lists.FreeBSD.org/mailman/listinfo/freebsd-questions">http://lists.FreeBSD.org/mailman/listinfo/freebsd-questions</a>.
 	  You can look up old questions and
-	  answers via the <a href="../search/search.html#mailinglists">search</a>
+	  answers via the <a href="&base;/search/search.html#mailinglists">search</a>
 	  page.</p></li>
     
       <li><p>The main newsgroup for FreeBSD is <a
@@ -109,7 +109,7 @@
 	    href="news:comp.unix.bsd.freebsd.announce">comp.unix.bsd.freebsd.announce</a>
 	  as well.</p></li>
       
-      <li><p><a href="http://www.FreeBSD.org/cgi/man.cgi">Man pages</a> are good
+      <li><p><a href="&base;/cgi/man.cgi">Man pages</a> are good
 	  for reference but not always
 	  the best introduction for a novice. The more you work with man pages
 	  the more familiar they become. Some are very good for newbies, so
@@ -162,7 +162,7 @@
       <li><p>UNIX questions are dealt with in the newsgroup <a
 	    href="news:comp.unix.questions">comp.unix.questions</a> and the
 	  associated <a
-	    href="http://www.cis.ohio-state.edu/hypertext/faq/usenet/unix-faq/faq/top.html">
+	    href="http://www.cse.ohio-state.edu/hypertext/faq/usenet/unix-faq/faq/top.html">
 	    Frequently Asked Questions</a>.
 	  You can also get a copy of the
 	  <a href="ftp://rtfm.mit.edu/pub/usenet/news.answers/unix-faq/faq/">FAQ</a>
@@ -172,7 +172,7 @@
       <li><p>Another interesting newsgroup is <a
 	    href="news:comp.unix.user-friendly">comp.unix.user-friendly</a>
 	  which also has a <a
-	    href="http://www.camelcity.com/~noel/usenet/cuuf-FAQ.htm">FAQ</a>.
+	    href="http://www.faqs.org/faqs/unix-faq/user-friendly/index.html">FAQ</a>.
 	  Although this newsgroup is for discussing user-friendliness, it can
 	  contain some good information for newbies. The <a
 	    href="ftp://rtfm.mit.edu/pub/usenet/news.answers/unix-faq/user-friendly">FAQ</a>
@@ -188,8 +188,10 @@
     <h2><a name="xwin">Learning about the X Window System</a></h2>
 
     <p>The X Window System is used with a number of operating systems,
-      including FreeBSD. The documentation for X can be found at
-      <a href="http://www.xfree86.org/">The XFree86 Project, Inc</a>.
+      including FreeBSD. The documentation for X can be found at the
+      <a href="http://www.x.org/">X.Org Foundation</a> or
+      <a href="http://www.xfree86.org/">The XFree86 Project, Inc</a>
+      web sites according to the version you run.
       Beware, much of this documentation is reference material which is
       more likely to be difficult for newcomers to digest.</p>
 
@@ -197,7 +199,7 @@
     <li><p>For basic information about installing, configuring and using the
       X Window System, three of the books mentioned above have sections
       dealing with X at beginner level:
-      <a href="../doc/en_US.ISO8859-1/books/handbook/index.html">The FreeBSD Handbook</a>,
+      <a href="&base;/doc/en_US.ISO8859-1/books/handbook/index.html">The FreeBSD Handbook</a>,
       <a href="#cfbsd">The Complete FreeBSD</a>, and
       <a href="#ufti">UNIX for the Impatient</a>.</p></li>
 
@@ -209,7 +211,7 @@
 
     <li><p>Before you can get X running exactly the way you like, you will need
       to choose a window manager.
-      Visit the <a href="http://www.PLiG.org/xwinman/">Window Managers for X</a>
+      Visit the <a href="http://xwinman.org/">Window Managers for X</a>
       page and follow the link to the introduction to find out about window
       managers, then return and read "The Basics". Then go back and compare
       the different types that are available. (Bonus: there is another
@@ -235,7 +237,7 @@
       challenges. If you do not have many friends who use FreeBSD,
       consider using your old FreeBSD CDs to create some more :-)</p>
 
-    <p><a href="../usergroups.html">User groups</a> are
+    <p><a href="&base;/usergroups.html">User groups</a> are
       good places to meet other FreeBSD users. If there is no one nearby,
       you might consider starting one!</p>
     
