[paludis-commits] r4561 - in trunk: . doc/overview

[dleverton at svn.pioto.org]

Author: dleverton
Date: 2008-04-13 17:29:54 +0000 (Sun, 13 Apr 2008)
New Revision: 4561

Modified:
   trunk/ChangeLog
   trunk/doc/overview/gettingstarted.html.part
Log:
Update manual configuration guide for new world file behaviour.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-04-13 17:20:46 UTC (rev 4560)
+++ trunk/ChangeLog	2008-04-13 17:29:54 UTC (rev 4561)
@@ -5,6 +5,11 @@
 only listed in SVN log. For a summary of what has changed between releases,
 see the NEWS file. This file is occasionally pruned to ChangeLog.old.bz2.
 
+2008-04-13 David Leverton
+
+	* doc/overview/: Update manual configuration guide for new world
+	file behaviour.
+
 2008-04-13 Bo Ørsted Andresen
 
 	* paludis/repositories/e/ebuild/exheres-0/build_functions.bash: Fix

Modified: trunk/doc/overview/gettingstarted.html.part
===================================================================
--- trunk/doc/overview/gettingstarted.html.part	2008-04-13 17:20:46 UTC (rev 4560)
+++ trunk/doc/overview/gettingstarted.html.part	2008-04-13 17:29:54 UTC (rev 4561)
@@ -81,6 +81,15 @@
 mkdir -p /etc/paludis/repositories
 </pre>
 
+<h3>environment.conf</h3>
+
+<p>The file <code>/etc/paludis/environment.conf</code> must, at minimum, specify the location of the world file
+(other options are described elsewhere in the documentation).  The usual location for Paludis is:</p>
+
+<pre>world = /var/db/pkg/world</pre>
+
+<p>The option <code>world = /var/lib/portage/world</code> can be set if Portage's world file is to be used.</p>
+
 <h3>keywords.conf</h3>
 
 <p>You will need to make <code>/etc/paludis/keywords.conf</code>:</p>
@@ -225,9 +234,6 @@
 
 <p>You are responsible for ensuring that any cache directories you use exist and have appropriate permissions.</p>
 
-<p>The option <code>world = /var/lib/portage/world</code> can be set if Portage's world file is to be used. By default,
-Paludis uses <code>${location}/world</code>.</p>
-
 <h4>repositories/paludis-overlay.conf</h4>
 
 <p>You might find the Paludis overlay useful, if you need very up to date or live ebuilds. This also illustrates the