[36140] trunk/doc-new/guide/xml

[simon at macports.org]

Revision: 36140
          http://trac.macosforge.org/projects/macports/changeset/36140
Author:   simon at macports.org
Date:     2008-04-19 01:33:49 -0700 (Sat, 19 Apr 2008)

Log Message:
-----------
doc-new: Xincluded macports.conf.xml into the guide and removed the old "configuration files" section.

Modified Paths:
--------------
    trunk/doc-new/guide/xml/internals.xml
    trunk/doc-new/guide/xml/macports.conf.xml

Modified: trunk/doc-new/guide/xml/internals.xml
===================================================================
--- trunk/doc-new/guide/xml/internals.xml	2008-04-19 08:29:34 UTC (rev 36139)
+++ trunk/doc-new/guide/xml/internals.xml	2008-04-19 08:33:49 UTC (rev 36140)
@@ -15,37 +15,9 @@
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
   </section>
 
-  <section id="internals.configuration-files">
-    <title>Configuration Files</title>
+  <xi:include href="macports.conf.xml"
+              xmlns:xi="http://www.w3.org/2001/XInclude" />
 
-    <para>The MacPorts configuration files do not need to be modified for the
-    general end user. They contain options that may be of use to advanced
-    users and port developers. All the MacPorts configuration files are
-    located in <filename>${prefix}/etc/macports</filename>.</para>
-
-    <section id="internals.configuration-files.sources-conf">
-      <title>sources.conf</title>
-
-      <para><filename>sources.conf</filename> is where the location(s) are set
-      to scan for MacPorts Portfiles. This file is commonly modified to add a
-      local Portfile repository.</para>
-    </section>
-
-    <section id="internals.configuration-files.macports-conf">
-      <title>macports.conf</title>
-
-      <para><filename>macports.conf</filename> contains advanced MacPorts
-      configuration options. See the file comments for instructions.</para>
-    </section>
-
-    <section id="internals.configuration-files.variants-conf">
-      <title>variants.conf</title>
-
-      <para><filename>variants.conf</filename> is used to specify variants to
-      be used for all ports where they exist.</para>
-    </section>
-  </section>
-
   <section id="internals.images">
     <title>Port Images</title>
 

Modified: trunk/doc-new/guide/xml/macports.conf.xml
===================================================================
--- trunk/doc-new/guide/xml/macports.conf.xml	2008-04-19 08:29:34 UTC (rev 36139)
+++ trunk/doc-new/guide/xml/macports.conf.xml	2008-04-19 08:33:49 UTC (rev 36140)
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<section id="reference.variables">
-  <title>MacPorts configuration files</title>
+<section id="internals.configuration-files">
+  <title>Configuration Files</title>
 
+  <para>The MacPorts configuration files do not need to be modified for the
+  general end user. They contain options that may be of use to advanced
+  users and port developers.</para>
+
   <para>There are three MacPorts configuration files that define important
   variables used by the MacPorts system: macports.conf, sources.conf, and
   variants.conf. All MacPorts configurations files are located in
@@ -13,7 +17,7 @@
   separated by either a space or a tab. Lines beginning with '#' are comments,
   empty lines are ignored.</para>
 
-  <section>
+  <section id="internals.configuration-files.macports-conf">
     <title>macports.conf</title>
 
     <para>macports.conf is the configuration file used to bootstrap the
@@ -372,7 +376,7 @@
     </variablelist>
   </section>
 
-  <section>
+  <section id="internals.configuration-files.sources-conf">
     <title>sources.conf</title>
 
     <para>This file enables rsync synchronization of the default ports tree
@@ -386,7 +390,7 @@
     <replaceable>file:///path/to/localportsrepository</replaceable></para>
   </section>
 
-  <section>
+  <section id="internals.configuration-files.variants-conf">
     <title>variants.conf</title>
 
     <para>This optional file specifies any variants you'd like to be invoked

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080419/6d7233e1/attachment.html