[26404] trunk/doc

source_changes at macosforge.org source_changes at macosforge.org
Thu Jun 21 01:53:49 PDT 2007


Revision: 26404
          http://trac.macosforge.org/projects/macports/changeset/26404
Author:   boeyms at macports.org
Date:     2007-06-21 01:53:47 -0700 (Thu, 21 Jun 2007)

Log Message:
-----------
Pick off some low-hanging fruit to start updating the DocBook documentation:
 * Replace instances of "Darwinports" with "MacPorts", "dport" with "mport",
   "CVS" with "Subversion" and "cvs" with "svn";
 * Update some of the old email address and links;
 * Make one update about MacPorts no longer supporting OSes other than Mac OS
   10.3 and above.

Modified Paths:
--------------
    trunk/doc/faq/Makefile
    trunk/doc/faq/resources/docbook.css
    trunk/doc/faq/xml/faq.xml
    trunk/doc/guide/Makefile
    trunk/doc/guide/resources/docbook.css
    trunk/doc/guide/xml/guide.xml
    trunk/doc/guide/xml/internals/internals.xml
    trunk/doc/guide/xml/internals/portimages.xml
    trunk/doc/guide/xml/internals/registry.xml
    trunk/doc/guide/xml/portfiles/commands.xml
    trunk/doc/guide/xml/portfiles/details.xml
    trunk/doc/guide/xml/portfiles/hier.xml
    trunk/doc/guide/xml/portfiles/quick.xml
    trunk/doc/guide/xml/portfiles/style.xml
    trunk/doc/guide/xml/portfiles/variants.xml
    trunk/doc/guide/xml/project/info.xml
    trunk/doc/guide/xml/project/membership.xml
    trunk/doc/guide/xml/project/policies.xml
    trunk/doc/guide/xml/project/roadmap.xml
    trunk/doc/guide/xml/project/submission.xml
    trunk/doc/guide/xml/user/dp_manager.xml
    trunk/doc/guide/xml/user/portimages.xml
    trunk/doc/guide/xml/user/user.xml

Modified: trunk/doc/faq/Makefile
===================================================================
--- trunk/doc/faq/Makefile	2007-06-21 07:41:18 UTC (rev 26403)
+++ trunk/doc/faq/Makefile	2007-06-21 08:53:47 UTC (rev 26404)
@@ -1,6 +1,6 @@
 # $Id$
 
-# To build DarwinPorts FAQ files from the source docbook xml.
+# To build MacPorts FAQ files from the source docbook xml.
 # michaelm at opendarwin.org, wbb4 at opendarwin.org
 
 ## Targets

Modified: trunk/doc/faq/resources/docbook.css
===================================================================
--- trunk/doc/faq/resources/docbook.css	2007-06-21 07:41:18 UTC (rev 26403)
+++ trunk/doc/faq/resources/docbook.css	2007-06-21 08:53:47 UTC (rev 26404)
@@ -1,5 +1,5 @@
 /*
- * DarwinPorts Guide Stylesheet
+ * MacPorts Guide Stylesheet
  */
 
 * {

Modified: trunk/doc/faq/xml/faq.xml
===================================================================
--- trunk/doc/faq/xml/faq.xml	2007-06-21 07:41:18 UTC (rev 26403)
+++ trunk/doc/faq/xml/faq.xml	2007-06-21 08:53:47 UTC (rev 26404)
@@ -4,7 +4,7 @@
 
 <article>
   <articleinfo>
-    <title>DarwinPorts FAQ</title>
+    <title>MacPorts FAQ</title>
 
  		<author>
 			<firstname>Jordan</firstname>
@@ -31,8 +31,8 @@
   </articleinfo>
 
 	<abstract>
-		<para>The DarwinPorts Frequently Asked Questions will attempt to
-			answer some questions that are often asked about DarwinPorts.</para>
+		<para>The MacPorts Frequently Asked Questions will attempt to
+			answer some questions that are often asked about MacPorts.</para>
 	</abstract>
 
 	<qandaset defaultlabel="general">
@@ -41,17 +41,17 @@
 
 			<qandaentry>
 				<question>
-					<para>What IS DarwinPorts?</para>
+					<para>What IS MacPorts?</para>
 				</question>
 
 				<answer>
-					<para>DarwinPorts is probably best described by comparison:  It's
+					<para>MacPorts is probably best described by comparison:  It's
 						sort of like the FreeBSD ports collection or fink in
 						that it automates the process of building 3rd party
 						software for Mac OS X.  It also tracks all dependency
 						information for a given piece of software and knows how to
 						make it build under Mac OS X and install it to a common
-						location, meaning that software installed via DarwinPorts
+						location, meaning that software installed via MacPorts
 						doesn't simply scatter itself all over the system or
 						require user knowledge of what to install in what order.</para>
 				</answer>
@@ -59,7 +59,7 @@
 
 			<qandaentry>
 				<question>
-					<para>How does DarwinPorts compare to FreeBSD ports?</para>
+					<para>How does MacPorts compare to FreeBSD ports?</para>
 				</question>
 		
 				<answer>
@@ -76,7 +76,7 @@
 
 			<qandaentry>
 				<question>
-					<para>Why did DarwinPorts start from scratch rather than
+					<para>Why did MacPorts start from scratch rather than
 					adopting something like FreeBSD ports?</para>
 				</question>
 		
@@ -86,7 +86,7 @@
 					automated build         systems is rather more complex than it
 					looks at first glance and         there's always room for
 					fresh approaches to the problem, which         is what we set
-					out to do with DarwinPorts. There are certainly         other
+					out to do with MacPorts. There are certainly         other
 					systems, some of which have already been mentioned, which
 					have made their own attempts at solving this problem and there
 					will likely be many more such systems in the future since
@@ -94,7 +94,7 @@
 					everyone is rather like         trying to find a single
 					programmin language which pleases         everyone - it's more
 					or less impossible.  We urge people to         judge
-					DarwinPorts' design on its own merits and consider it a
+					MacPorts' design on its own merits and consider it a
 					parallel rather than a competing effort since there's more
 					software out there than any one system can ever manage to
 					encapsulate and automate. </para>
@@ -103,13 +103,13 @@
 
 			<qandaentry>
 				<question>
-					<para>Will DarwinPorts run on any other Operating System?</para>
+					<para>Will MacPorts run on any other Operating System?</para>
 				</question>
 		
 				<answer>
-					<para>DarwinPorts was designed to be as portable as possible.
+					<para>MacPorts was designed to be as portable as possible.
 					Though our target platforms are Mac OS X and Darwin,
-					DarwinPorts is known to work on FreeBSD, OpenBSD, NetBSD and
+					MacPorts is known to work on FreeBSD, OpenBSD, NetBSD and
 					Solaris.  We also provide individual ports with ways of
 					specifying platform-specific rules that are only invoked on
 					that particular platform.</para>
@@ -118,31 +118,31 @@
 
 			<qandaentry>
 				<question>
-					<para>Does DarwinPorts also do Package Management?</para>
+					<para>Does MacPorts also do Package Management?</para>
 				</question>
 		
 				<answer>
-					<para>DarwinPorts works by first building software and
+					<para>MacPorts works by first building software and
 					installing it into a <varname>destroot</varname>, a
 					fake-installation location, then installing it into the
-					DarwinPorts prefix (<filename>/opt/local</filename> by
+					MacPorts prefix (<filename>/opt/local</filename> by
 					default).  It records this installation in its registry, and
 					you can query the installed port and uninstall it through
-					DarwinPorts.  Work is underway to add full package management
-					features to DarwinPorts.</para>
+					MacPorts.  Work is underway to add full package management
+					features to MacPorts.</para>
 
-					<para>You can also have DarwinPorts build a Mac OS X
+					<para>You can also have MacPorts build a Mac OS X
 					<filename>.pkg</filename> file of the port, and install it
 					using the Mac OS X Installer.  If that package has
 					dependencies, then you can also build a multi-part package
 					(<filename>.mpkg</filename>) which contains them as well.  You
-					can also build RPM packages from DarwinPorts.</para>
+					can also build RPM packages from MacPorts.</para>
 				</answer>
 			</qandaentry>
 
 			<qandaentry>
 				<question>
-					<para>Why does DarwinPorts install everything into
+					<para>Why does MacPorts install everything into
 					<filename>/opt/local</filename> by default?</para>
 				</question>
 		
@@ -150,9 +150,9 @@
 					<para>First, this location can be set to anything you like by
 					editing /etc/ports/ports.conf or specifying
 					<varname>--prefix</varname> during the
-					<filename>./configure</filename> phase of the DarwinPorts
+					<filename>./configure</filename> phase of the MacPorts
 					installation, so nothing           is fixed
-					in place.  Even the basic DarwinPorts infrastructure,
+					in place.  Even the basic MacPorts infrastructure,
 					which installs into /opt/local by           default, can be
 					installed elsewhere by overriding the value of
 					PREFIX on the command line (see the           README file for

Modified: trunk/doc/guide/Makefile
===================================================================
--- trunk/doc/guide/Makefile	2007-06-21 07:41:18 UTC (rev 26403)
+++ trunk/doc/guide/Makefile	2007-06-21 08:53:47 UTC (rev 26404)
@@ -1,6 +1,6 @@
 # $Id$
 
-# To build DarwinPorts  guide files from the source docbook xml.
+# To build MacPorts  guide files from the source docbook xml.
 # michaelm at opendarwin.org
 
 ## Targets

Modified: trunk/doc/guide/resources/docbook.css
===================================================================
--- trunk/doc/guide/resources/docbook.css	2007-06-21 07:41:18 UTC (rev 26403)
+++ trunk/doc/guide/resources/docbook.css	2007-06-21 08:53:47 UTC (rev 26404)
@@ -1,5 +1,5 @@
 /*
- * DarwinPorts Guide Stylesheet
+ * MacPorts Guide Stylesheet
  */
 
 * {

Modified: trunk/doc/guide/xml/guide.xml
===================================================================
--- trunk/doc/guide/xml/guide.xml	2007-06-21 07:41:18 UTC (rev 26403)
+++ trunk/doc/guide/xml/guide.xml	2007-06-21 08:53:47 UTC (rev 26404)
@@ -4,7 +4,7 @@
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <bookinfo>
-    <title>DarwinPorts Guide</title>
+    <title>MacPorts Guide</title>
       
     <author>
       <honorific>Dr</honorific>
@@ -25,18 +25,18 @@
 		</author>
 
 		<legalnotice>
-			<para>If you have any questions regarding DarwinPorts, you may
-				email the DarwinPorts mailing list: 
+			<para>If you have any questions regarding MacPorts, you may
+				email the MacPorts mailing list: 
 				<ulink
-						url="mailto:darwinports at opendarwin.org">
-					darwinports at opendarwin.org
+						url="mailto:macports-users at lists.macosforge.org">
+					macports-users at opendarwin.org
 				</ulink>
 				Please be aware that you are not allowed mail to the list
 				without first subscribing to it. This us due to spam. You may
 				subscribe to the list here:
 				<ulink
-						url="http://www.opendarwin.org/mailman/listinfo/darwinports">
-						OpenDarwin mailman: DarwinPorts
+						url="http://www.opendarwin.org/mailman/listinfo/macports">
+						MacOSforge mailman: MacPorts
 				</ulink>
 			</para>
 		</legalnotice>
@@ -52,19 +52,19 @@
   <preface>
     <title>About this guide</title>
       <para>Part I of this guide is intended to help you use
-        the DarwinPorts system. Part II is directed towards
-        users who wish to add their favorite software to DarwinPorts.
+        the MacPorts system. Part II is directed towards
+        users who wish to add their favorite software to MacPorts.
         Part III is intended for developers interested in extending
-        the DarwinPorts system.</para>
+        the MacPorts system.</para>
 
       <para>The Guide is still at an early draft stage, so if you have any
 	comments, corrections or (even better) contributions, please
-	contact the OpenDarwin Documentation Project at
-	<email>doc at opendarwin.org</email>.</para>
+	contact the MacPorts Documentation Project at
+	<email>macports-docs at lists.macosforge.org</email>.</para>
   </preface>
 
   <part>
-    <title>Using DarwinPorts</title>
+    <title>Using MacPorts</title>
 
     <xi:include href="user/user.xml" /> 
 
@@ -73,7 +73,7 @@
   </part>
 
   <part>
-    <title>DarwinPorts Portfiles</title>
+    <title>MacPorts Portfiles</title>
     
     <xi:include href="portfiles/quick.xml" />
     
@@ -94,7 +94,7 @@
   </part>
 
   <part>
-    <title>DarwinPorts Internals</title>
+    <title>MacPorts Internals</title>
   
     <xi:include href="internals/internals.xml" /> 
     <!-- <xi:include href="internals/portimages.xml" />  -->
@@ -102,7 +102,7 @@
 	</part>
 
 	<part>
-		<title>The DarwinPorts Project</title>
+		<title>The MacPorts Project</title>
 
 		<xi:include href="project/info.xml" />
 

Modified: trunk/doc/guide/xml/internals/internals.xml
===================================================================
--- trunk/doc/guide/xml/internals/internals.xml	2007-06-21 07:41:18 UTC (rev 26403)
+++ trunk/doc/guide/xml/internals/internals.xml	2007-06-21 08:53:47 UTC (rev 26404)
@@ -9,17 +9,17 @@
     </keywordset>
   </chapterinfo>
   
-  <title>DarwinPorts APIs</title> 
+  <title>MacPorts APIs</title> 
 
   <sect1 id="about">
     <title>About This Chapter</title>
 
-    <para>DarwinPorts contains two application programming interfaces
+    <para>MacPorts contains two application programming interfaces
     (APIs), written in Tcl.</para>
     
     <para>The Ports API is an internal API used to run individual
-      Portfiles.  The DarwinPorts (dport*) API is a high-level API used by
-      client applications such as DarwinPorts Manager.app or
+      Portfiles.  The MacPorts (mport*) API is a high-level API used by
+      client applications such as MacPorts Manager.app or
       <command>port</command>.</para>
   </sect1>
 
@@ -77,10 +77,10 @@
   </sect1>
 
   <sect1 id="dp_api">
-    <title>DarwinPorts API</title>
+    <title>MacPorts API</title>
 
-    <para>The code for the DarwinPorts API is located in
-      base/src/darwinports1.0. The DarwinPorts API performs the
+    <para>The code for the MacPorts API is located in
+      base/src/macports1.0. The MacPorts API performs the
       following functions:</para>
 
     <para>
@@ -108,28 +108,28 @@
         <listitem>
           <para>Registry management routines. Manages the rudimentary
             port registry in
-            <filename>${prefix}/var/db/dports/receipts/</filename>.</para>
+            <filename>${prefix}/var/db/mports/receipts/</filename>.</para>
 
           <para>
             <itemizedlist>
               <listitem>
-                <para><function>dportregistry::new</function>: create a
+                <para><function>mportregistry::new</function>: create a
                   new port registry entry</para>
               </listitem>
 
               <listitem>
-                <para><function>dportregistry::exists</function>: check
+                <para><function>mportregistry::exists</function>: check
                   if a port registry entry exists (either versioned or
                   not)</para>
               </listitem>
 
               <listitem>
-                <para><function>dportregistry::delete</function>: delete
+                <para><function>mportregistry::delete</function>: delete
                   an existing registry entry</para>
               </listitem>
 
               <listitem>
-                <para><function>dportregistry::close</function>: closes
+                <para><function>mportregistry::close</function>: closes
                   a new registry entry</para>
               </listitem>
             </itemizedlist>
@@ -137,41 +137,41 @@
         </listitem>
 
         <listitem>
-          <para>Exports the "darwinports" API for use by client
+          <para>Exports the "macports" API for use by client
             applications:</para>
 
           <para>
             <itemizedlist>
               <listitem>
-                <para><function>dportinit</function>: Initializes the
-                  darwinports system. Should be called before trying to
+                <para><function>mportinit</function>: Initializes the
+                  macports system. Should be called before trying to
                   use any other procedure</para>
               </listitem>
 
               <listitem>
-                <para><function>dportsearch</function>: Given a regexp,
+                <para><function>mportsearch</function>: Given a regexp,
                   searches the PortIndex for ports with matching
                   names</para>
               </listitem>
 
               <listitem>
-                <para><function>dportopen</function>: Given a URI to a
+                <para><function>mportopen</function>: Given a URI to a
                   port, opens the port and returns an opaque handle to
                   it</para>
               </listitem>
 
               <listitem>
-                <para><function>dportclose</function>: Given a port
+                <para><function>mportclose</function>: Given a port
                   handle, closes the port.</para>
               </listitem>
 
               <listitem>
-                <para><function>dportexec</function>: Given a port
+                <para><function>mportexec</function>: Given a port
                   handle, executes a target (i.e. install)</para>
               </listitem>
 
               <listitem>
-                <para><function>dportinfo</function>: Given a port
+                <para><function>mportinfo</function>: Given a port
                   handle, this returns the PortInfo array (as a flat
                   list of array elements). This is a little tricky and
                   unstable and only used by the 'portindex'
@@ -189,21 +189,21 @@
       </itemizedlist>
     </para>
     
-    <para>An example of how the DarwinPorts API is used:</para>
+    <para>An example of how the MacPorts API is used:</para>
 
-    <para><function>dportsearch</function> returns an arbitrary number
+    <para><function>mportsearch</function> returns an arbitrary number
       of Tcl arrays containing data from the
       <filename>PortIndex</filename>. The returned data includes the
       port name, version, revision, epoch, variants, depends, etc. When
       one executes <userinput>port install cm3</userinput>, the
       <command>port</command> utility uses the
-      <function>dportsearch</function> function to find the first port
-      that matches the name "cm3", uses <function>dportopen</function>
-      to open the port, and then uses <function>dportexec</function> to
+      <function>mportsearch</function> function to find the first port
+      that matches the name "cm3", uses <function>mportopen</function>
+      to open the port, and then uses <function>mportexec</function> to
       execute the install target in the port. Then, it uses
-      <function>dportclose</function> to close the port. When one
+      <function>mportclose</function> to close the port. When one
       executes <userinput>port search cm3</userinput>, the port utility
-      uses <function>dportsearch</function>, takes the list of arrays,
+      uses <function>mportsearch</function>, takes the list of arrays,
       and formats the data for human consumption.</para>
   </sect1>
 </chapter>

Modified: trunk/doc/guide/xml/internals/portimages.xml
===================================================================
--- trunk/doc/guide/xml/internals/portimages.xml	2007-06-21 07:41:18 UTC (rev 26403)
+++ trunk/doc/guide/xml/internals/portimages.xml	2007-06-21 08:53:47 UTC (rev 26404)
@@ -10,13 +10,13 @@
     </keywordset>
   </chapterinfo>
   
-  <title>DarwinPorts Port Images</title> 
+  <title>MacPorts Port Images</title> 
 
   <sect1 id="about">
     <title>About This Chapter</title>
 
-		<para>This chapter provides a detailed overview of the DarwinPorts
-			Port Images for DarwinPorts Infrastructure developers.</para>
+		<para>This chapter provides a detailed overview of the MacPorts
+			Port Images for MacPorts Infrastructure developers.</para>
   </sect1>
 
 </chapter>

Modified: trunk/doc/guide/xml/internals/registry.xml
===================================================================
--- trunk/doc/guide/xml/internals/registry.xml	2007-06-21 07:41:18 UTC (rev 26403)
+++ trunk/doc/guide/xml/internals/registry.xml	2007-06-21 08:53:47 UTC (rev 26404)
@@ -10,18 +10,18 @@
     </keywordset>
   </chapterinfo>
   
-  <title>The DarwinPorts Registry</title> 
+  <title>The MacPorts Registry</title> 
 
   <sect1 id="about">
     <title>About This Chapter</title>
 
-		<para>This chapter provides a detailed overview of the new DarwinPorts
+		<para>This chapter provides a detailed overview of the new MacPorts
 			Registry package and its API.  This package is queried by the
-			DarwinPorts tools for information about installed ports for
+			MacPorts tools for information about installed ports for
 			information related to dependencies, port images, and simple user
 			information about what is installed.</para>
 
-		<para>The DarwinPorts Registry contains an abstraction layer which
+		<para>The MacPorts Registry contains an abstraction layer which
 			allows for alternative storage mechanisms for receipts.  This
 			chapter will also provide an overview of this, and how to write a
 			receipt storage module.</para>
@@ -30,7 +30,7 @@
 	<sect1 id="registry_intro">
 		<title>Introduction To The New Registry</title>
 
-		<para>The new DarwinPorts Registry solves many problems with the old
+		<para>The new MacPorts Registry solves many problems with the old
 			registry:</para>
 
 		<itemizedlist>
@@ -47,7 +47,7 @@
 
 		<para>The new registry allows for modification of receipts, to
 			reflect and changes made to installed ports being maintained by
-			DarwinPorts.  It also provides global file and dependencies
+			MacPorts.  It also provides global file and dependencies
 			databases that can be queried to check if installed files conflict
 			with each other, and to maintain dependency trees of installed
 			ports.  It also provides abstraction over a modular receipt
@@ -58,10 +58,10 @@
 	<sect1 id="registry_api">
 		<title>API For Accessing The Registry</title>
 
-		<para>The DarwinPorts Registry provides a public API in the
+		<para>The MacPorts Registry provides a public API in the
 			<varname>registry1.0</varname> Tcl package.  Using this API you
-			can access the DarwinPorts Registry using the storage mechanism
-			the DarwinPorts user has chosen for receipt storage.</para>
+			can access the MacPorts Registry using the storage mechanism
+			the MacPorts user has chosen for receipt storage.</para>
 
 		<variablelist>
 			<varlistentry>

Modified: trunk/doc/guide/xml/portfiles/commands.xml
===================================================================
--- trunk/doc/guide/xml/portfiles/commands.xml	2007-06-21 07:41:18 UTC (rev 26403)
+++ trunk/doc/guide/xml/portfiles/commands.xml	2007-06-21 08:53:47 UTC (rev 26404)
@@ -136,7 +136,7 @@
     </sect2>
 
     <sect2>
-      <title>CVS Options</title>
+      <title>Subversion Options</title>
 
       <para></para>
 

Modified: trunk/doc/guide/xml/portfiles/details.xml
===================================================================
--- trunk/doc/guide/xml/portfiles/details.xml	2007-06-21 07:41:18 UTC (rev 26403)
+++ trunk/doc/guide/xml/portfiles/details.xml	2007-06-21 08:53:47 UTC (rev 26404)
@@ -90,7 +90,7 @@
 			<varlistentry id='libpath'>
 				<term>libpath</term>
 				<listitem>
-					<para>Path to the DarwinPorts TCL libraries. Read only.</para>
+					<para>Path to the MacPorts TCL libraries. Read only.</para>
 					
 				</listitem>
 			</varlistentry>
@@ -189,17 +189,17 @@
 				<term>PortSystem</term>
 				<listitem>
 					<para>Determines which version of the portsystem the 
-					Portfile is compatible with. DarwinPorts supports 
+					Portfile is compatible with. MacPorts supports 
 					versioning of the PortSystem so if new, backwards 
 					incompatible changes are introduced older Portfiles 
 					can continue to use the older version of the system. 
 					The PortSystem line wraps the loading of TCL libraries 
-					appropriate for that version of DarwinPorts. If you 
+					appropriate for that version of MacPorts. If you 
 					don't load the libraries, nothing else in the Portfile 
 					will work. Thus, the PortSystem should be the top line 
 					in the Portfile.</para>
 					
-					<para>Currently DarwinPorts only has version 1.0 so you 
+					<para>Currently MacPorts only has version 1.0 so you 
 					should put: <userinput>PortSystem 1.0</userinput> in your 
 					Portfile.</para>
 
@@ -471,7 +471,7 @@
               specify which site in <varname>master_sites</varname> to
               download which file from.</para>
             
-            <para>Fortunately DarwinPorts also provides a much more
+            <para>Fortunately MacPorts also provides a much more
               powerful and flexible syntax for mirror site lists.</para>
 
             <programlisting><userinput>distfiles                   file_one.tar.gz:tagone file_two.tar.gz:tagtwo file_three.tar.gz
@@ -553,7 +553,6 @@
               <listitem><para><varname>isc</varname></para></listitem>
               <listitem><para><varname>kde</varname></para></listitem>
               <listitem><para><varname>openbsd</varname></para></listitem>
-              <listitem><para><varname>opendarwin</varname></para></listitem>
               <listitem><para><varname>perl_cpan</varname></para></listitem>
               <listitem><para><varname>postgresql</varname></para></listitem>
               <listitem><para><varname>ruby</varname></para></listitem>
@@ -950,7 +949,7 @@
                 <para>Arguments passed to ${destroot.cmd} in order to 
                   install correctly into the destroot.</para>
                 <para>All ports must install via the 'destroot' so 
-                  that the DarwinPorts infrastructure can register each 
+                  that the MacPorts infrastructure can register each 
                   file and directory a port installs. Most autoconf based 
                   build systems will behave correctly and respect DESTDIR, 
                   however some will not. Most of those that do not respect 
@@ -1129,7 +1128,7 @@
 
 	<sect1>
           <title>TCL primitives</title>
-          <para>DarwinPorts provides several useful TCL primitives for
+          <para>MacPorts provides several useful TCL primitives for
             use within Portfiles.</para>
 
           <sect2>

Modified: trunk/doc/guide/xml/portfiles/hier.xml
===================================================================
--- trunk/doc/guide/xml/portfiles/hier.xml	2007-06-21 07:41:18 UTC (rev 26403)
+++ trunk/doc/guide/xml/portfiles/hier.xml	2007-06-21 08:53:47 UTC (rev 26404)
@@ -11,18 +11,18 @@
 		<para>Portfile authors are expected to make sure that a port, when
 		installed conforms to specific filesystem hierarchy guidelines.
 		These guidelines define where certain files should be installed in
-		the DarwinPorts filesystem.</para>
+		the MacPorts filesystem.</para>
 	</sect1>
 	
 	<sect1>
-		<title>DarwinPorts Base, ${prefix}</title>
+		<title>MacPorts Base, ${prefix}</title>
 
 		<variablelist>
 			<varlistentry>
 				<term><filename>/<variable>${prefix}</variable></filename></term>
 
 				<listitem>
-					<para>The base of the DarwinPorts filesystem
+					<para>The base of the MacPorts filesystem
 					hierarchy.</para>
 
 					<para>Default: <filename>/opt/local</filename></para>
@@ -155,9 +155,9 @@
 											system-specific database files.</para>
 											<variablelist>
 												<varlistentry>
-													<term><filename>dports/</filename></term>
+													<term><filename>mports/</filename></term>
 
-													<listitem><para>DarwinPorts runtime
+													<listitem><para>MacPorts runtime
 													data.</para></listitem>
 												</varlistentry>
 											</variablelist>

Modified: trunk/doc/guide/xml/portfiles/quick.xml
===================================================================
--- trunk/doc/guide/xml/portfiles/quick.xml	2007-06-21 07:41:18 UTC (rev 26403)
+++ trunk/doc/guide/xml/portfiles/quick.xml	2007-06-21 08:53:47 UTC (rev 26404)
@@ -21,19 +21,19 @@
   <title>Quick Start</title> 
 
   <sect1 id="getting_started">
-    <title>Getting Started With DarwinPorts</title>
+    <title>Getting Started With MacPorts</title>
 
     <para>This document will provide a short guide to the basics of a
-      DarwinPorts <filename>Portfile</filename>.  A
+      MacPorts <filename>Portfile</filename>.  A
       <filename>Portfile</filename> is actually a Tcl script run by the
       <command>port</command> system.  Despite this, the
       <filename>Portfile</filename> syntax is very
       straightforward.</para>
     
-    <para>In order to work with DarwinPorts, you will need to download and
-      install it on your system.  The <link linkend='getting_dports'> 
-      Obtaining</link> and <link linkend='install_dports'>Installing  
-      DarwinPorts</link> sections of this guide describes the process in
+    <para>In order to work with MacPorts, you will need to download and
+      install it on your system.  The <link linkend='getting_mports'> 
+      Obtaining</link> and <link linkend='install_mports'>Installing  
+      MacPorts</link> sections of this guide describes the process in
       detail. </para>
 
     <para>Since you're interested in writing a
@@ -41,7 +41,7 @@
       <command>port</command> with the <option>-v</option> (verbose
       output) and the <option>-d</option> (debugging option) switches.
       This will display useful messages that are usually suppressed
-      while running DarwinPorts.</para>
+      while running MacPorts.</para>
   </sect1>
 
   <sect1 id="basics">
@@ -90,7 +90,7 @@
             <para>Every <filename>Portfile</filename> starts with
               <varname>#&#x0024;Id: &#x0024;</varname>. This is a RCS
               <varname>Id</varname> tag (commented out with the '#' character
-              so that DarwinPorts is not confused by the tag). </para>
+              so that MacPorts is not confused by the tag). </para>
           </listitem>
         </varlistentry>
 
@@ -170,12 +170,12 @@
         </varlistentry>
       </variablelist>
       
-      <para>DarwinPorts uses the terms 'keys' and 'options'
+      <para>MacPorts uses the terms 'keys' and 'options'
         interchangeably since most keys are used as options of a
         particular task in the porting process.</para>
       
       <para>At this point, the <filename>Portfile</filename> is complete
-        enough to download ircII.  By default, DarwinPorts will append
+        enough to download ircII.  By default, MacPorts will append
         the <varname>version</varname> to <varname>name</varname> and
         assume sources are in a gzipped tar archive with the 
         <filename>.tar.gz</filename> suffix. </para>
@@ -189,7 +189,7 @@
 
       <para><computeroutput><literallayout>DEBUG: Executing com.apple.main (ircii)
 DEBUG: Executing com.apple.fetch (ircii)
---->  ircii-20020912.tar.gz doesn't seem to exist in /opt/local/var/db/dports/distfiles
+--->  ircii-20020912.tar.gz doesn't seem to exist in /opt/local/var/db/mports/distfiles
 --->  Attempting to fetch ircii-20020912.tar.gz from ftp://ircftp.au.eterna.com.au/pub/ircII/
 DEBUG: Executing com.apple.checksum (ircii)
 Error: No checksums statement in Portfile.  File checksums are:
@@ -201,13 +201,13 @@
     <sect2 id="checksums">
       <title>Verifying the Downloaded File</title>
 
-      <para>Notice that DarwinPorts first checks for a local copy of
+      <para>Notice that MacPorts first checks for a local copy of
         <filename>ircii-20020912.tar.gz</filename> and doesn't find it,
         so it then downloads from the remove site.  The port doesn't
         finish because of an error: <computeroutput>No checksums
           statement in Portfile.</computeroutput>
         Portfiles must contain an md5 checksum of all distribution
-        files--this allows DarwinPorts to verify the accuracy and
+        files--this allows MacPorts to verify the accuracy and
         authenticity of the sources.  For convenience, an md5 checksum
         of the downloaded files is printed when the
         <varname>checksums</varname> argument is not specified.  Go back
@@ -242,7 +242,7 @@
 DEBUG: Executing com.apple.extract (ircii)
 --->  Extracting for ircii-20020912
 --->  Extracting ircii-20020912.tar.gz ... DEBUG: Assembled command: 'cd
-/Users/kevin/opendarwin/proj/darwinports/dports/irc/ircii/work &amp;&amp; gzip -dc /opt/local/var/db/dports/distfiles/ircii-20020912.tar.gz | tar -xf -'
+/Users/kevin/opendarwin/proj/macports/mports/irc/ircii/work &amp;&amp; gzip -dc /opt/local/var/db/mports/distfiles/ircii-20020912.tar.gz | tar -xf -'
 Done</literallayout></computeroutput></para>
     </sect2>
 
@@ -252,12 +252,12 @@
       <para>Now that the sources have been extracted into a
         <filename>work</filename> directory in the Portfile
         directory, we can configure the sources to compile with the
-        desired options.  By default DarwinPorts assumes the software
+        desired options.  By default MacPorts assumes the software
         you're porting uses an autoconf <filename>configure</filename>
         script and  will pass the <option>--prefix=${prefix}</option> 
         argument to <filename>configure</filename>, specifying that the 
         software should be installed in the directory tree used by
-        DarwinPorts.</para>
+        MacPorts.</para>
 
       <para>ircII's standard set of options is fine for a base
         install on Darwin, so we won't add anything to the
@@ -444,7 +444,7 @@
             <para><varname>distfile</varname> is the name and version
               combined with the <varname>extract.suffix</varname> (by
               default <filename>${name}-${version}.tar.gz</filename>) 
-              by default, and is used by DarwinPorts to fetch the 
+              by default, and is used by MacPorts to fetch the 
               distribution file.  If the name of the file on the server 
               is not the same as <filename>${name}-${version}.tar.gz
               </filename> you can use this option to override the default
@@ -527,8 +527,8 @@
         (<filename>Portfile</filename>) repository for your
         uncommitted ports.  Edit your
         <filename>sources.conf</filename> file and
-        add:<userinput>file:///User/foo/dports-dev</userinput> (or
-        wherever your local dport tree is). Place all your <filename>Portfiles</filename>
+        add:<userinput>file:///User/foo/mports-dev</userinput> (or
+        wherever your local mport tree is). Place all your <filename>Portfiles</filename>
         inside their corresponding portdirs (reflecting the name
         of the port), which should in turn be placed inside directories
         that reflect their primary category (the first one listed for their
@@ -547,10 +547,10 @@
       <para>First run port install without root privileges, this is a
         good way to check that the port installs into the destroot and
         not directly into the main prefix directory, or elsewhere in
-        the system.  This should succeed up to the point darwinports
+        the system.  This should succeed up to the point macports
         attempts to copy the port from the destroot into the
-        darwinports prefix. Once you are confident the port is
-        correctly destrooted install the port into the darwinports
+        macports prefix. Once you are confident the port is
+        correctly destrooted install the port into the macports
         prefix using root privileges. </para>
       
       <para><userinput>sudo port install foo</userinput></para>
@@ -558,7 +558,7 @@
       <para> Ensure the Port installs into the destroot and does not
         install anything onto the system directly, most software that
         uses autoconf should behave correctly automatically as
-        darwinports sets DESTDIR by default. If files are directly
+        macports sets DESTDIR by default. If files are directly
         installed to the system they will not be registered and
         packaging will fail. </para>
     </sect2>
@@ -579,7 +579,7 @@
       clean install of the OS, to avoid missing dependencies.  
       Using a chrooted version of the OS to install and test ports 
       makes this much easier, see the chroot 
-      <ulink url="http://darwinports.gene-hacker.net/docs/howto/chroot_10.2/index.html">
+      <ulink url="http://macports.gene-hacker.net/docs/howto/chroot_10.2/index.html">
       HOWTO</ulink> for more details on how to set up the chroot. </para>
     </sect2>
         
@@ -599,8 +599,8 @@
   <sect1 id="advice">
     <title>Where can I ask for advice?</title> 
 
-    <para>Either on the <email>darwinports at opendarwin.org</email>
-      mailing list, or on the #darwinports channel on irc.freenode.net.
+    <para>Either on the <email>macports-dev at lists.macosforge.org</email>
+      mailing list, or on the #macports channel on irc.freenode.net.
       Don't be afraid to ask questions! You should also look at the
       later sections of the <link linkend="details">guide</link>and the
       <filename>portfile</filename>(7) and
@@ -675,7 +675,7 @@
     </example>
 
     <para>For more examples, you can browse the directory tree of
-      DarwinPorts' <filename>dports</filename> directory and have a look
+      MacPorts' <filename>mports</filename> directory and have a look
       at the <filename>Portfile</filename>s of your favorite
       ports.</para>
     

Modified: trunk/doc/guide/xml/portfiles/style.xml
===================================================================
--- trunk/doc/guide/xml/portfiles/style.xml	2007-06-21 07:41:18 UTC (rev 26403)
+++ trunk/doc/guide/xml/portfiles/style.xml	2007-06-21 08:53:47 UTC (rev 26404)
@@ -29,9 +29,9 @@
 		<title>Specifics</title> 
 		
 		<sect2>
-			<title>CVS ID tags</title> 
-			<para>On the first line of the Portfile you should put a cvs 
-			ID tag. This tag will be expanded by cvs when the Portfile is 
+			<title>Subversion ID tags</title> 
+			<para>On the first line of the Portfile you should put a svn 
+			ID tag. This tag will be expanded by svn when the Portfile is 
 			committed and allows people to see at a glance details like 
 			who was the last person to commit to a port and when the last 
 			commit was performed.</para>

Modified: trunk/doc/guide/xml/portfiles/variants.xml
===================================================================
--- trunk/doc/guide/xml/portfiles/variants.xml	2007-06-21 07:41:18 UTC (rev 26403)
+++ trunk/doc/guide/xml/portfiles/variants.xml	2007-06-21 08:53:47 UTC (rev 26404)
@@ -5,7 +5,7 @@
 	<title>Variants</title> 
 	<sect1>
 		<title>What are variants?</title> 
-		<para>DarwinPorts allows multiple versions of a port to be specified in a single Portfile. For example, vim can be built with and without x11 support. Rather than duplicate the whole port and have vim-x11 vim-nox ports DarwinPorts supports "variants". </para>
+		<para>MacPorts allows multiple versions of a port to be specified in a single Portfile. For example, vim can be built with and without x11 support. Rather than duplicate the whole port and have vim-x11 vim-nox ports MacPorts supports "variants". </para>
 
 	</sect1>
 

Modified: trunk/doc/guide/xml/project/info.xml
===================================================================
--- trunk/doc/guide/xml/project/info.xml	2007-06-21 07:41:18 UTC (rev 26403)
+++ trunk/doc/guide/xml/project/info.xml	2007-06-21 08:53:47 UTC (rev 26404)
@@ -9,63 +9,63 @@
     </keywordset>
   </chapterinfo>
   
-  <title>DarwinPorts Project Info</title> 
+  <title>MacPorts Project Info</title> 
 
   <sect1>
     <title>About this Chapter</title>
 
-		<para>This chapter contains basic information about the DarwinPorts
+		<para>This chapter contains basic information about the MacPorts
 		project.</para>
   </sect1>
 
   <sect1>
 	  <title>Mailing Lists</title>
-	  <para>The DarwinPorts project is organized through mailing lists,
+	  <para>The MacPorts project is organized through mailing lists,
 		and discussion on those lists ranges from new user help to bugs and
-		fixes to discussions about the future direction of DarwinPorts.
+		fixes to discussions about the future direction of MacPorts.
 	  </para>
 		<variablelist>
-			<varlistentry id='darwinports_at'>
+			<varlistentry id='macports_at'>
 				<term><ulink
-				url="http://www.opendarwin.org/mailman/listinfo/darwinports">darwinports
+				url="http://www.opendarwin.org/mailman/listinfo/macports">macports
 				[at] opendarwin DOT org</ulink></term>
 				<listitem>
-					<para>General discussion about DarwinPorts development, new
+					<para>General discussion about MacPorts development, new
 					user help, and most all discussion surrounding
-					DarwinPorts.</para>
+					MacPorts.</para>
 				</listitem>
 			</varlistentry>
 
-			<varlistentry id='darwinports_bugs_at'>
+			<varlistentry id='macports_bugs_at'>
 				<term><ulink
-				url="http://www.opendarwin.org/mailman/listinfo/darwinports-bugs">darwinports-bugs
+				url="http://www.opendarwin.org/mailman/listinfo/macports-bugs">macports-tickets
 				[at] opendarwin DOT org</ulink></term>
 				<listitem>
-					<para>All bugs entered in Bugzilla at OpenDarwin.org for
-						DarwinPorts... very little real communication goes on on
-						this list, it is used for DarwinPorts developers to view
+					<para>All bugs entered in Trac at macports.org for
+						MacPorts... very little real communication goes on on
+						this list, it is used for MacPorts developers to view
 						new bugs that are automatically assigned to this mailing
 						list.</para>
 				</listitem>
 			</varlistentry>
 
-			<varlistentry id='cvs_darwinports_all_at'>
+			<varlistentry id='svn_macports_all_at'>
 				<term><ulink
-				url="http://www.opendarwin.org/mailman/listinfo/cvs-darwinports-all">cvs-darwinports-all
-				[at] opendarwin DOT org</ulink></term>
+				url="http://www.opendarwin.org/mailman/listinfo/svn-macports-all">macports-changes
+				[at] lists DOT macosforge DOT org</ulink></term>
 				<listitem>
-					<para>CVS Commit messages are sent to this list, and
+					<para>Subversion commit messages are sent to this list, and
 					occasionally there is some discussion about a commit.  This is
-					mainly a list for DarwinPorts developers, however if you want
-					to track changes to DarwinPorts, you can subscribe to this
+					mainly a list for MacPorts developers, however if you want
+					to track changes to MacPorts, you can subscribe to this
 					list.</para>
 				</listitem>
 			</varlistentry>
 
 			<varlistentry id='portmgr_at'>
-				<term>portmgr [at] opendarwin DOT org</term>
+				<term>portmgr [at] lists DOT macosforge DOT org</term>
 				<listitem>
-					<para>This list is closed and is the home of the DarwinPorts
+					<para>This list is closed and is the home of the MacPorts
 						PortMgr steering group.  If you have an issue that needs to
 						be brought to the attention of PortMgr, send a mail to this
 						list.</para>
@@ -75,12 +75,12 @@
   </sect1>
 
 	<sect1>
-		<title>DarwinPorts PortMgr</title>
+		<title>MacPorts PortMgr</title>
 
-		<para>The DarwinPorts PortMgr Group is primarily responsible for 
-				the administritive decision making of DarwinPorts. For 
-				example managing the DarwinPorts website, approving cvs accounts,
-				maintaining the DarwinPorts mailing lists, and other 
+		<para>The MacPorts PortMgr Group is primarily responsible for 
+				the administritive decision making of MacPorts. For 
+				example managing the MacPorts website, approving svn accounts,
+				maintaining the MacPorts mailing lists, and other 
 				organizational functions. Send mail to portmgr [at]
 				opendarwin DOT org to get in contact with it.</para>
 
@@ -89,17 +89,17 @@
 			
 			<itemizedlist>
 				<listitem>
-					<para><emphasis>Markus W. Weissmann</emphasis>, mww [at] opendarwin
+					<para><emphasis>Markus W. Weissmann</emphasis>, mww [at] macports
 					DOT org</para>
 				</listitem>
 
 				<listitem>
-					<para><emphasis>Juan M. Palacios</emphasis>, jmpp [at] opendarwin
-					DOT org</para>
+					<para><emphasis>Juan M. Palacios</emphasis>, jmpp [at] macports
+                    DOT org</para>
 				</listitem>
 
 				<listitem>
-					<para><emphasis>James D. Berry</emphasis>, jberry [at] opendarwin
+					<para><emphasis>James D. Berry</emphasis>, jberry [at] macports
 					DOT org</para>
 				</listitem>
 

Modified: trunk/doc/guide/xml/project/membership.xml
===================================================================
--- trunk/doc/guide/xml/project/membership.xml	2007-06-21 07:41:18 UTC (rev 26403)
+++ trunk/doc/guide/xml/project/membership.xml	2007-06-21 08:53:47 UTC (rev 26404)
@@ -12,14 +12,14 @@
 			</keyword>
 		</keywordset>
 	</chapterinfo>
-	<title>DarwinPorts membership</title> 
+	<title>MacPorts membership</title> 
 	<sect1>
-		<title>Becoming a DarwinPorts committer</title>
+		<title>Becoming a MacPorts committer</title>
 
-		<para>Becoming a member of the DarwinPorts project with commit access
-		to our CVS repository is pretty much a matter of involvement in any of
+		<para>Becoming a member of the MacPorts project with commit access
+		to our Subversion repository is pretty much a matter of involvement in any of
 		the areas of the project and the record you can establish thereof. We
-		encourage any developer and/or volunteer to apply for a CVS account
+		encourage any developer and/or volunteer to apply for a Subversion account
 		if certain simple requirements are met:</para>
 
 		<variablelist>
@@ -28,10 +28,10 @@
 					Involvement on the List:
 				</term>
 				<listitem>
-					<para>One key attribute of any DarwinPorts committer must be
+					<para>One key attribute of any MacPorts committer must be
 					enthusiasm for the project, so therefore we appreciate applicants
 					who've shown their involvement through active participation
-					on the <ulink url="http://opendarwin.org/mailman/listinfo/darwinports">main user list</ulink>,
+					on the <ulink url="http://opendarwin.org/mailman/listinfo/macports">main user list</ulink>,
 					either through general user support and/or project roadmap discussion
 					and brainstorming.</para>
 				</listitem>
@@ -41,16 +41,16 @@
 					Contribution record:
 				</term>
 				<listitem>
-					<para>If applying for access to the "dports" section of the project,
+					<para>If applying for access to the "mports" section of the project,
 					an established record as a maintainer of already existing ports is
 					preferable. This can be accomplished either through the inheritance
-					of abandoned ports (those with the sole darwinports [at] opendarwin DOT org
+					of abandoned ports (those with the sole nomaintainer [at] macports DOT org
 					maintainer address) or through writing your own from scratch. If instead
 					you plan to apply to any other area of the project, like "base" or "www", contributions
 					in the form of patches that can vouch for your skills on the aspects you
 					plan to help with are certainly a big plus. In all cases, submissions to
 					the project should be processed per the instructions detailed on the
-					"<ulink url="/docs/ch15.html">DarwinPorts Submissions</ulink>" chapter.</para>
+					"<ulink url="/docs/ch15.html">MacPorts Submissions</ulink>" chapter.</para>
 				</listitem>
 			</varlistentry>
 		</variablelist>
@@ -60,13 +60,13 @@
 		a note to the <ulink href="/docs/ch12s03.html">PortMgr</ulink>
 		steering committee explaining your contributions, how long you've been involved
 		with the project and why think you'd make a good committer. The sole purpose of
-		said forum is overseeing the general evolution of DarwinPorts, so it is where you
+		said forum is overseeing the general evolution of MacPorts, so it is where you
 		should turn to for membership requests.</para>
 
 		<para>For a brief listing of the duties &amp; benefits resulting from holding
-		an OpenDarwin account, along with a short jump start on CVS primaries, read
+		an OpenDarwin account, along with a short jump start on Subversion primaries, read
 		OpenDarwin's <ulink url="http://opendarwin.org/en/articles/committer_guide/ar01s02.html">Committer's Guide</ulink>
-		for account applicants. The DarwinPorts' specific <ulink url="http://wiki.opendarwin.org/index.php/Darwinports:New_committers_guide">New Committer's Guide</ulink>
+		for account applicants. The MacPorts' specific <ulink url="http://wiki.opendarwin.org/index.php/Darwinports:New_committers_guide">New Committer's Guide</ulink>
 		is also a must read for new comers to become acquainted with our own procedures
 		and guidelines.</para>
 

Modified: trunk/doc/guide/xml/project/policies.xml
===================================================================
--- trunk/doc/guide/xml/project/policies.xml	2007-06-21 07:41:18 UTC (rev 26403)
+++ trunk/doc/guide/xml/project/policies.xml	2007-06-21 08:53:47 UTC (rev 26404)
@@ -9,19 +9,19 @@
     </keywordset>
   </chapterinfo>
   
-  <title>DarwinPorts Policies</title> 
+  <title>MacPorts Policies</title> 
 
   <sect1>
     <title>About this Chapter</title>
 
 		<para>This chapter contains policies and procedures, as well as
-		responsbilities for the DarwinPorts Project.</para>
+		responsbilities for the MacPorts Project.</para>
   </sect1>
 
   <sect1>
 	  <title>Port Maintenance Protocol</title>
 	  <para>
-		  DarwinPorts does not enforce exclusive write access to the maintainer
+		  MacPorts does not enforce exclusive write access to the maintainer
 		  of a given Port, however it is normal practice to inform the maintainer
 		  before making any changes to a Port. Detailed procedures are described 
 		  below.   
@@ -36,7 +36,7 @@
 		  <orderedlist numeration='arabic'>
 			  <listitem>
 				  Write patch for the port that resolves the issue, 
-				  and email maintainer or file a bug in Bugzilla,
+				  and email maintainer or file a bug in Trac,
 				  appropriately assigned to the maintainer of the port. If 
 				  you can't write a patch, file a bug and ignore the 
 				  following steps...
@@ -53,8 +53,8 @@
 				  (this may be the person originally submitting the patches). 
 				  If the person suggesting the changes does not have 
 				  write-access to the repository, they should send an 
-				  email to darwinports at opendarwin.org with a summary of the 
-				  bug and a reference to a bugzilla bug.
+				  email to macports-dev at lists.macosforge.org with a summary of the 
+				  bug and a reference to a Trac bug.
 			  </listitem>
 
 		  </orderedlist>
@@ -64,8 +64,8 @@
 
 		  <orderedlist>
 			  <listitem>
-				  A mass update to darwinports which touches many ports 
-				  (usually because of a change in the darwinports 
+				  A mass update to macports which touches many ports 
+				  (usually because of a change in the macports 
 				  infrastructure)
 			  </listitem>
 			  <listitem>
@@ -75,7 +75,7 @@
 			  </listitem>
 			  <listitem>
 				  The port maintainer is not defined or is assigned to 
-				  darwinports at opendarwin.org. Feel free to take over 
+				  nomaintainer at macports.org. Feel free to take over 
 				  such ports!
 			  </listitem>
 			  <listitem>
@@ -90,7 +90,7 @@
 		  <para>
 			  Abandonment is defined as when a bug has not been acknowledged 
 			  for more than 3 weeks after the bug was filed. If this occurs 
-			  a new bug should be filed in bugzilla against the port with 
+			  a new bug should be filed in Trac against the port with 
 			  the subject: [Port Abandoned] and that port should reference 
 			  the ignored bug.
 		  </para>
@@ -105,7 +105,7 @@
   <sect1>
     <title>Committer's Category Responsibility List</title>
 
-		<para>DarwinPorts has at least one committer responsible for each
+		<para>MacPorts has at least one committer responsible for each
 		category of ports (<filename>www</filename>,
 		<filename>textproc</filename>, etc).  This is a list of those
 		committers.</para>

Modified: trunk/doc/guide/xml/project/roadmap.xml
===================================================================
--- trunk/doc/guide/xml/project/roadmap.xml	2007-06-21 07:41:18 UTC (rev 26403)
+++ trunk/doc/guide/xml/project/roadmap.xml	2007-06-21 08:53:47 UTC (rev 26404)
@@ -9,12 +9,12 @@
     </keywordset>
   </chapterinfo>
   
-  <title>DarwinPorts Roadmap</title> 
+  <title>MacPorts Roadmap</title> 
 
   <sect1>
     <title>About this Chapter</title>
 
-    <para>This is the DarwinPorts roadmap for future development.  This
+    <para>This is the MacPorts roadmap for future development.  This
       chapter will contain a verbose TODO list for the project, as well
       as (once these goals are acheived) a place where new features
       and/or changes will be documented prior to their incorporation
@@ -22,15 +22,15 @@
   </sect1>
 
   <sect1>
-    <title>Remove cruft from DarwinPorts API</title>
+    <title>Remove cruft from MacPorts API</title>
 
-    <para>Most of the DarwinPorts API (<function>dportsearch</function>,
+    <para>Most of the MacPorts API (<function>mportsearch</function>,
       etc) is intended for use by external applications, such as Ports
-      Manager and <command>port</command>(1).  However, the DarwinPorts
+      Manager and <command>port</command>(1).  However, the MacPorts
       "API" has grown organically, and there is a lot of cruft and clean
       up that could be done. One piece of low hanging fruit would be to
-      use Tcl namespaces to properly remove the DarwinPorts API from the
-      global namespace, and only namespace export the dport*
+      use Tcl namespaces to properly remove the MacPorts API from the
+      global namespace, and only namespace export the mport*
       procedures.</para>
   </sect1>
 </chapter>

Modified: trunk/doc/guide/xml/project/submission.xml
===================================================================
--- trunk/doc/guide/xml/project/submission.xml	2007-06-21 07:41:18 UTC (rev 26403)
+++ trunk/doc/guide/xml/project/submission.xml	2007-06-21 08:53:47 UTC (rev 26404)
@@ -15,33 +15,33 @@
 			</keyword>
 		</keywordset>
 	</chapterinfo>
-	<title>DarwinPorts submissions</title> 
+	<title>MacPorts submissions</title> 
 	<sect1>
 		<title>Submitting a Port</title> 
 		
 		<para>Using a standardised approach to submitting the Portfiles and 
 		associated patches scripts, etc allows us to keep track of port 
 		submissions, process them efficiently and get them submitted as 
-		quickly as possible to our dports CVS tree. The following sections 
+		quickly as possible to our mports Subversion tree. The following sections 
 		will describe the standard port submission procedures. </para>
 		
 		<sect2>
 			<title>Where to submit</title>
 			
-			<para> All ports should be submitted via the DarwinPorts 
-			<ulink url="http://www.opendarwin.org/bugzilla/">bugzilla tool
+			<para> All ports should be submitted via the MacPorts 
+			<ulink url="http://www.opendarwin.org/bugzilla/">Trac tool
 			</ulink>. Your submission will be automatically emailled to the 
 			members of the 
-			<ulink url="http://www.opendarwin.org/mailman/listinfo/darwinports-bugs/">
-			darwinports-bugs</ulink> mailing list. If you are uncertain about 
+			<ulink url="http://www.opendarwin.org/mailman/listinfo/macports-tickets/">
+			macports-tickets</ulink> mailing list. If you are uncertain about 
 			any aspect of your port, you may also want to email it with your 
 			questions and the bug number to  
-			<ulink url="mailto:darwinports at opendarwin.org">DarwinPorts</ulink> 
+			<ulink url="mailto:macports-dev at lists.macosforge.org">MacPorts</ulink> 
 			mailing list.</para>
 			
 			<para>If you are submitting a modification, or an update to an 
 			existing port, please assign the port to the current maintainer 
-			in your bugzilla submission, so that the automatic email is 
+			in your Trac submission, so that the automatic email is 
 			directed to the maintainer, who will be best suited to deal 
 			with your submission.</para>
 			
@@ -52,10 +52,10 @@
 		
 		<sect2>
 		
-			<title>Using bugzilla to submit a Port</title>
+			<title>Using Trac to submit a Port</title>
 			
 			<para>The following section describes in some more detail how to 
-			use Bugzilla to submit your port.</para>
+			use Trac to submit your port.</para>
 			
 			<sect3>
 				<title>Submission parameters</title>
@@ -66,7 +66,7 @@
 							Project:
 						</term>
 						<listitem>
-							<para>Make sure you select the DarwinPorts 
+							<para>Make sure you select the MacPorts 
 							project.</para>
 
 						</listitem>
@@ -77,7 +77,7 @@
 							Component:
 						</term>
 						<listitem>
-							<para>Select "dports" as the component. </para>
+							<para>Select "mports" as the component. </para>
 
 						</listitem>
 					</varlistentry>
@@ -231,7 +231,7 @@
 				<title>Final comments on Port submission</title>
 			
 				<para>The following general points should also be borne in 
-				mind when submitting to bugzilla:
+				mind when submitting to Trac:
 					<simplelist type="vert">
 						<member>Small changes may be attached or included
 						in the description field.</member>
@@ -241,7 +241,7 @@
 						together using tar and attached to the submission.</member>
 						<member>Currently attachments must be sent in 
 						using the current bug number, remeber to query 
-						bugzilla to find out the current bug number, select
+						Trac to find out the current bug number, select
 						 that bug and use the 'Create a New Attachment' 
 						 link.</member>
 					</simplelist></para>
@@ -267,16 +267,16 @@
 					
 					<member>diff -u oldfile oldfile.new > oldfile.diff</member>
 					
-					<member>use bugzilla to submit your port UPDATE, assigning the bug to the corresponding port maintainer.</member>
+					<member>use Trac to submit your port UPDATE, assigning the bug to the corresponding port maintainer.</member>
 					
 				</simplelist></para>
 
-			<para>Or using cvs diff:
+			<para>Or using svn diff:
 				<simplelist type="vert">
-					<member>checkout the original source using cvs</member>
+					<member>checkout the original source using svn</member>
 					<member>edit the files and save your changes</member>
-					<member>cvs diff -u sourcefile > sourcefile.diff</member>
-					<member>use bugzilla to submit your port UPDATE, assigning the bug to the corresponding port maintainer.</member>
+					<member>svn diff sourcefile > sourcefile.diff</member>
+					<member>use Trac to submit your port UPDATE, assigning the bug to the corresponding port maintainer.</member>
 				</simplelist></para>
 
 			<para>Lastly, if your update consists of several files, use tar 
@@ -288,10 +288,10 @@
 		<title>Submission to other project areas</title>
 
 		<para>If you instead plan to contribute to the project by making a submission
-		to any other of its areas, like the "base" section holding the DarwinPorts
+		to any other of its areas, like the "base" section holding the MacPorts
 		sources themselves, the guidelines for such are very similar to those outlined
 		above. Just be sure to choose the correct component (be that "base", "doc",
-		"www" or any other) of the DarwinPorts product when creating the Bugzilla entry.</para>
+		"www" or any other) of the MacPorts product when creating the Trac entry.</para>
 
 	</section1>
 </chapter>

Modified: trunk/doc/guide/xml/user/dp_manager.xml
===================================================================
--- trunk/doc/guide/xml/user/dp_manager.xml	2007-06-21 07:41:18 UTC (rev 26403)
+++ trunk/doc/guide/xml/user/dp_manager.xml	2007-06-21 08:53:47 UTC (rev 26404)
@@ -22,27 +22,27 @@
     </keywordset>
   </chapterinfo>
   
-  <title>DarwinPorts Manager</title> 
+  <title>MacPorts Manager</title> 
   
   <sect1>
     <title>About this chapter</title>
 
-    <para>This chapter provides an overview of the DarwinPorts Manager
+    <para>This chapter provides an overview of the MacPorts Manager
       application and how to use it as an alternative to the command-line 
-      tools for DarwinPorts.</para>
+      tools for MacPorts.</para>
 
   </sect1>
 	
-  <sect1 id='darwinportsmanager'>
-    <title>DarwinPorts Manager.app</title>
+  <sect1 id='macportsmanager'>
+    <title>MacPorts Manager.app</title>
     
-    <para>DarwinPorts Manager.app is a Cocoa GUI for the DarwinPorts
+    <para>MacPorts Manager.app is a Cocoa GUI for the MacPorts
       project.  It will allow users to browse through available ports and
       their descriptions and to download, install, and uninstall the
-      software.  DarwinPorts Manager.app is currently under development,
+      software.  MacPorts Manager.app is currently under development,
       and is based on the older Ports Manager.app.</para>
 
     <para>We will be providing a binary installer (a '.pkg') file in
-      the near future for DarwinPorts Manager.app.</para>
+      the near future for MacPorts Manager.app.</para>
   </sect1>
 </chapter>

Modified: trunk/doc/guide/xml/user/portimages.xml
===================================================================
--- trunk/doc/guide/xml/user/portimages.xml	2007-06-21 07:41:18 UTC (rev 26403)
+++ trunk/doc/guide/xml/user/portimages.xml	2007-06-21 08:53:47 UTC (rev 26404)
@@ -10,15 +10,15 @@
     </keywordset>
   </chapterinfo>
   
-  <title>DarwinPorts Port Images</title> 
+  <title>MacPorts Port Images</title> 
   
   <sect1>
     <title>About this chapter</title>
 
-		<para>This chapter provides an overview of the DarwinPorts Port
+		<para>This chapter provides an overview of the MacPorts Port
 			Image model of installing and using ports for users of
-			DarwinPorts.  A more complete overview of Port Images can be found
-			in the DarwinPorts Internals part of this Guide.</para>
+			MacPorts.  A more complete overview of Port Images can be found
+			in the MacPorts Internals part of this Guide.</para>
   </sect1>
 	
   <sect1 id='what'>
@@ -31,7 +31,7 @@
 			the same time.  This is accomplished by installing the port into a
 			repository location and then create links, or aliases, from that
 			repository location into the <varname>${prefix}</varname> from
-			where you can use the DarwinPorts ports.</para>
+			where you can use the MacPorts ports.</para>
 
 		<para>Port Images provide the ability to test new versions of a
 			port, or different variants of a port, without having to uninstall
@@ -42,23 +42,23 @@
 	<sect1 id="activation">
 		<title>Port Image Activation</title>
 
-		<para>With Port Images in DarwinPorts, the port is installed as an
-			<emphasis>image</emphasis> to the DarwinPorts <emphasis>image
+		<para>With Port Images in MacPorts, the port is installed as an
+			<emphasis>image</emphasis> to the MacPorts <emphasis>image
 			repository</emphasis>.  This repository can be thought of as an
 			library of ports that actually contains all of the files belonging
 			to that port.  Once the port is installed as an image, the port
 			can be <emphasis>activated</emphasis>.</para>
 			
 		<para>Activation simply creates the links into the
-			<varname>${prefix}</varname> of DarwinPorts.  DarwinPorts manages
+			<varname>${prefix}</varname> of MacPorts.  MacPorts manages
 			any conflicts between any ports that are activated, and will
 			inform you if one port is attempting to link a file that already
 			exists and belongs to another port.  You have the option to force
-			DarwinPorts to go ahead and activate the port in the event of a
-			conflict, and DarwinPorts will continue, moving the old file out
+			MacPorts to go ahead and activate the port in the event of a
+			conflict, and MacPorts will continue, moving the old file out
 			of the way.</para>
 
-		<para>By default, DarwinPorts will go ahead and activate a port when
+		<para>By default, MacPorts will go ahead and activate a port when
 			you run <userinput>port install vim</userinput>.  Once a port is
 			installed and activated, you can <emphasis>deactivate</emphasis>,
 			in addition to <emphasis>uninstalling</emphasis> it.  If you wish
@@ -72,10 +72,10 @@
 	<sect1 id="using_images">
 		<title>Using Port Images</title>
 
-		<para>DarwinPorts uses Port Images by default now, so if you are
-			using a recent release of DarwinPorts, you are using Port Images!
+		<para>MacPorts uses Port Images by default now, so if you are
+			using a recent release of MacPorts, you are using Port Images!
 			Port Images will work transparently for users used to the old
-			installation model of DarwinPorts, as well as those familiar with
+			installation model of MacPorts, as well as those familiar with
 			other port systems.  If you wish to use the advanced features that
 			Port Images provide, namely activation and deactivation, the
 			following commands are available:</para>

Modified: trunk/doc/guide/xml/user/user.xml
===================================================================
--- trunk/doc/guide/xml/user/user.xml	2007-06-21 07:41:18 UTC (rev 26403)
+++ trunk/doc/guide/xml/user/user.xml	2007-06-21 08:53:47 UTC (rev 26404)
@@ -18,43 +18,43 @@
 			</keyword>
 		</keywordset>
 	</chapterinfo>
-	<title>Using DarwinPorts</title> 
+	<title>Using MacPorts</title> 
 	
 	
 	<sect1>
 		<title>About this chapter</title>
 		 
 		<para>This document provides a short guide to the basics of the 
-		DarwinPorts system. The first section provides a short description 
+		MacPorts system. The first section provides a short description 
 		of the goals of the project and a brief comparison with other systems. 
-		Subsequent sections describe how to get, install, and use DarwinPorts 
+		Subsequent sections describe how to get, install, and use MacPorts 
 		on your own machines. </para>
 
 		
 	</sect1>
 	
 	
-	<sect1 id='about_dports'>
-		<title>About DarwinPorts</title> 
+	<sect1 id='about_mports'>
+		<title>About MacPorts</title> 
 		
-		<para>The aim of the DarwinPorts project is to develop a second-
+		<para>The aim of the MacPorts project is to develop a second-
 		generation system for the building, installation and management of 
-		third party software. DarwinPorts is mainly developed on Mac OS X, 
+		third party software. MacPorts is mainly developed on Mac OS X, 
 		however by design it is quite portable and is intended to work on 
 		other UNIX-like systems, especially *BSD and hopefully Linux-based 
 		systems.  </para>
 
 		
-		<para>DarwinPorts is probably best described by comparison:  It's sort 
+		<para>MacPorts is probably best described by comparison:  It's sort 
 		of like the <ulink url='http://www.freebsd.org/ports'>FreeBSD ports 
 		collection</ulink> or <ulink url='http://fink.sf.org/'>Fink</ulink> 
 		in that it automates the process of building third party software for 
-		Mac OS X and other operating systems.  DarwinPorts also tracks all 
+		Mac OS X and other operating systems.  MacPorts also tracks all 
 		dependency information for a given piece of software. In other words, 
 		it knows what it needs to build and install and in what order for the 
-		piece of software you want to work properly. DarwinPorts knows how to 
+		piece of software you want to work properly. MacPorts knows how to 
 		make, build and install the software to a specific location, meaning 
-		that software installed via DarwinPorts doesn't simply scatter itself 
+		that software installed via MacPorts doesn't simply scatter itself 
 		all over the system or require user knowledge of dependencies in what 
 		order. </para>
 
@@ -64,7 +64,7 @@
 		BSDs. The FreeBSD Ports Collection is based on a large tree of ports 
 		where each software has a directory within a category (like mail or 
 		graphics). That directory contains the information needed to build the 
-		piece of software. DarwinPorts also uses a directory structure like this,
+		piece of software. MacPorts also uses a directory structure like this,
 		although unlike FreeBSD ports the intention is to avoid requiring a 
 		complete copy of the 'Ports Tree' on every user's machine.  The FreeBSD 
 		Ports Collection is essentially implemented as some very impressive but
@@ -81,8 +81,8 @@
 		knows the sources, dependencies, and other information necessary to 
 		*build* a given Open Source project.  A package management system relies 
 		on similar dependency information, but is focused on safely installing 
-		(and de-installing) software.   Before DarwinPorts, most systems did 
-		both at once; DarwinPorts, however, is explicitly designed as a pure 
+		(and de-installing) software.   Before MacPorts, most systems did 
+		both at once; MacPorts, however, is explicitly designed as a pure 
 		ports collection which can use various package management systems.
 		</para>
 
@@ -91,7 +91,7 @@
 		Collection described above, creating automated build systems is rather 
 		more complex than it looks at first glance and there's always room for 
 		fresh approaches to the problem.  Which is what we have set out to do 
-		with DarwinPorts. There are certainly other systems, some of which have 
+		with MacPorts. There are certainly other systems, some of which have 
 		already been mentioned, which have made their own attempts at solving 
 		this problem. There will likely be many more such systems in the future 
 		since trying to find a single solution which pleases everyone is rather 
@@ -99,13 +99,13 @@
 		- it's more or less impossible. </para>
 
 		
-		<para>DarwinPorts is mostly written in Tcl, with some components written 
-		in C. Tcl was chosen to allow DarwinPorts to be readily embedded in other 
+		<para>MacPorts is mostly written in Tcl, with some components written 
+		in C. Tcl was chosen to allow MacPorts to be readily embedded in other 
 		applications (e.g. a Cocoa GUI) and to allow flexible, but easy to read 
 		Portfiles. </para>
 
 		
-		<para>Even though DarwinPorts is written in Tcl, users do not need to know 
+		<para>Even though MacPorts is written in Tcl, users do not need to know 
 		Tcl in order to use the system or even to add new ports.  Port description 
 		files, though they are actually full Tcl programs in their own right, are 
 		designed to look like a simple list of key/value pairs. </para>
@@ -114,22 +114,21 @@
 	
 	
 	<sect1 id='setup'>
-		<title>Installing DarwinPorts</title>
+		<title>Installing MacPorts</title>
 		
 		<sect2 id='prerequisites'>
 			<title>What you need</title>
 			
-			<para>DarwinPorts primary target platform is Mac OS X 10.4
+			<para>MacPorts primary target platforms are Mac OS X 10.4
 			"Tiger" and Mac OS X 10.3 "Panther" (i. e. Darwin 8.x and 7.x).
 			However,
-			DarwinPorts should still work on Mac OS X 10.2 "Jaguar", although
-			most ports are no longer tested on Jaguar. DarwinPorts is also
+			MacPorts should still work on Mac OS X 10.2 "Jaguar", although
+			most ports are no longer tested on Jaguar. MacPorts was previously
 			known to work on various other operating systems such as FreeBSD,
-			NetBSD, OpenBSD, and various Linux distributions.  These
-			instructions should enable DarwinPorts to be installed on any of
-			these platforms.</para>
+			NetBSD, OpenBSD, and various Linux distributions, but the MacPorts
+			project is no longer supports them.</para>
 
-			<para>To install and use DarwinPorts you must install the Developer 
+			<para>To install and use MacPorts you must install the Developer 
 			tools (gcc, autoconf etc on other platforms, also known as the
 			"Xcode tools" on Mac OS X 10.3 and 10.4.).
 			All the other prerequisites are
@@ -138,13 +137,13 @@
 
 		</sect2>
 		
-		<sect2 id='getting_dports'>
-			<title>Obtaining DarwinPorts</title>	
+		<sect2 id='getting_mports'>
+			<title>Obtaining MacPorts</title>	
 			
-			<para>Currently there are basically two ways to obtain DarwinPorts.
+			<para>Currently there are basically two ways to obtain MacPorts.
 			Either download the sources as a tarball or get the binary
 			installer via the downloadable disk image (both available in the
-			<ulink url='http://www.darwinports.org/downloads/'>download
+			<ulink url='http://www.macports.org/downloads/'>download
 			section</ulink>). If you choose the binary installer, you can skip
 			the next sections.</para>
 
@@ -154,39 +153,39 @@
 						  	
 			<para>If you want to very closely track the latest ports and use
 			the latest experimental features of the port tool, you may want to
-			use cvs to check out the sources from our cvs repository.</para>
+			use svn to check out the sources from our svn repository.</para>
 		</sect2>
 		
-		<sect2 id='install_dports'>
-			<title>Installing DarwinPorts from sources</title>
+		<sect2 id='install_mports'>
+			<title>Installing MacPorts from sources</title>
 			
-			<para>To install DarwinPorts execute the following commands from the 
-			darwinports/base directory.  These commands assume that you checked
-			out the darwinports tree from CVS or downloaded and extracted the
+			<para>To install MacPorts execute the following commands from the 
+			macports/base directory.  These commands assume that you checked
+			out the macports tree from Subversion or downloaded and extracted the
 			tarball in your home directory.  Modify
 			the <userinput>cd</userinput> command appropriately if you did
 			otherwise.
-			<programlisting><![CDATA[% cd ~/darwinports/base
+			<programlisting><![CDATA[% cd ~/macports/base
 % ./configure 
 % make
 % sudo make install]]></programlisting>
 			This will compile and install all the necessary software. In order 
-			to install DarwinPorts on *BSD the default group-ownership must be 
+			to install MacPorts on *BSD the default group-ownership must be 
 			passed to each make command: <userinput>make DSTGRP=wheel
 			</userinput>.</para>
 		</sect2>
 
-		<sect2 id='configure_dports'>
-			<title>Configuring for DarwinPorts</title>
+		<sect2 id='configure_mports'>
+			<title>Configuring for MacPorts</title>
 			
 			<para>It is no longer necessary to edit
 			<filename>${prefix}/etc/ports/sources.conf</filename> after installing
-			DarwinPorts.  If you change the location of the
-			<filename>dports</filename> directory, which was in
-			<filename>~/darwinports/dports</filename> based on the above
+			MacPorts.  If you change the location of the
+			<filename>mports</filename> directory, which was in
+			<filename>~/macports/mports</filename> based on the above
 			examples, then you will still need to edit
 			<filename>${prefix}/etc/ports/sources.conf</filename> and modify the
-			<userinput>file:///Users/mike/darwinports/dports</userinput> line
+			<userinput>file:///Users/mike/macports/mports</userinput> line
 			to reflect the new location.  To edit the file you must use a
 			command line text editor like pico or vi. </para>
 
@@ -196,7 +195,7 @@
 				to: <userinput>portinstalltype direct</userinput></para></note>
 			
 			<para>You should add /opt/local/bin (or wherever you chose to 
-			install DarwinPorts) to your shell's path.</para>
+			install MacPorts) to your shell's path.</para>
 
 			<para>If you are using Mac OS X 10.3 "Panther", Mac OS X 10.4 "Tiger"
 			 or a Bourne shell (bash, zsh), add the following line to your
@@ -215,25 +214,25 @@
 			you might still have a C shell as login shell.</para>
 
 			<para>Once you have got this far, you should have a working 
-			installation of DarwinPorts, you have installed the 'port' 
+			installation of MacPorts, you have installed the 'port' 
 			command (by default this installed as
 			<filename>/opt/local/bin/port</filename>) 
 			and the libraries it needs (in
-			<filename>/opt/local/share/darwinports</filename> 
-			and <filename>/Library/Tcl/darwinports1.0</filename> by
+			<filename>/opt/local/share/macports</filename> 
+			and <filename>/Library/Tcl/macports1.0</filename> by
 			default.) 
 			</para>
 
 			
 		</sect2>
 
-		<sect2  id='updating_dports'>
-			<title>Updating DarwinPorts</title>
+		<sect2  id='updating_mports'>
+			<title>Updating MacPorts</title>
 			
-			<para>New ports are always being added to the DarwinPorts dports 
+			<para>New ports are always being added to the MacPorts mports 
 			tree, you should regularly update your tree to get access to new 
 			ports, and (hopefully) improved versions of current ports. 
-			Currently the simplest way you can update the dports tree is to use
+			Currently the simplest way you can update the mports tree is to use
 			the selfupdate feature of port.
 			To start a (rsync based) selfupdate, just issue
 			<command>port sync</command>.
@@ -249,12 +248,12 @@
 
 			<variablelist>
 				<varlistentry>
-					<term>Updating your DarwinPorts ports</term>
+					<term>Updating your MacPorts ports</term>
 
 					<listitem>
 						<para>To get the latest Portfiles (the instructions for
 							building ports), you need to update your
-							<filename>dports</filename> tree via
+							<filename>mports</filename> tree via
 							<programlisting><![CDATA[%port sync]]></programlisting>
 						</para>
 
@@ -262,10 +261,10 @@
 				</varlistentry>
 
 				<varlistentry>
-					<term>Updating your DarwinPorts infrastructure</term>
+					<term>Updating your MacPorts infrastructure</term>
 
 					<listitem>
-						<para>To get the latest DarwinPorts infrastructure (or
+						<para>To get the latest MacPorts infrastructure (or
 							"base") for building ports, you need to update your
 							<filename>base</filename> via
 							<programlisting><![CDATA[% port selfupdate]]></programlisting>
@@ -278,14 +277,14 @@
 	</sect1>
 	
 	<sect1>
-		<title>Using DarwinPorts</title>
+		<title>Using MacPorts</title>
 		
 		<sect2 id='port'>
 			<title>The port command</title>
 
 			<!--
 
-			<para>Using DarwinPorts is very straightforward, most of the time 
+			<para>Using MacPorts is very straightforward, most of the time 
 			all you need to do is execute a single command to install a port. 
 			For example, if you want to install the text editor vile, you'd 
 			simply execute the command <userinput>sudo port install vile
@@ -315,12 +314,12 @@
 			problem. </para>
 
 			<para>Once the port has been installed, you may want to delete 
-			all the intermediate files that DarwinPorts has created while 
+			all the intermediate files that MacPorts has created while 
 			building the port, to do this you should enter: 
 			<userinput>port clean vile</userinput>.</para>
 			-->
 
-			<para>Using the DarwinPorts <userinput>port</userinput> command is
+			<para>Using the MacPorts <userinput>port</userinput> command is
 			very straight-forward.  Most of the time all you need to do is
 			execute a single command to install a port.  For example, if you
 			want to install the text editor vile, you would simply
@@ -377,7 +376,7 @@
 
 					<listitem>
 						<para>Once the port has been installed, you may want to
-						delete all the intermediate files that DarwinPorts has
+						delete all the intermediate files that MacPorts has
 						created while building the port.  To do this, simply use the
 						<userinput>clean</userinput> option:</para>
 
@@ -512,16 +511,16 @@
 			sometimes the index you have is out of date or innacurate for 
 			some reason. When this occurs you will get an error message 
 			like 'port search failed: expected integer but got "PortIndex"'.
-			You can fix problem by moving to the dports directory 
-			(/Users/mike/darwinports/dports in our examples) and 
+			You can fix problem by moving to the mports directory 
+			(/Users/mike/macports/mports in our examples) and 
 			executing: <userinput>portindex</userinput>. This will go 
-			through all the available ports in the dport directory and 
+			through all the available ports in the mport directory and 
 			build an index file called PortIndex.</para>
 
 		</sect2>
 		
 	
-		<sect2 id='uninstall_dports'>
+		<sect2 id='uninstall_mports'>
 			<title>Removing ports</title>
 			
 			<para>Ports are removed using the port command described above, 
@@ -530,7 +529,7 @@
 
 		</sect2>
 		
-		<sect2 id='upgrade_dports'>
+		<sect2 id='upgrade_mports'>
 			<title>Upgrading ports</title>
 			<para>You can check if a port is outdated with the following command:
 			</para>
@@ -567,7 +566,7 @@
 		<para>There are a number of common problems so before you report a 
 		problem (details on how to <link linkend='user_bugs'>report problems</link>
 		 follow) check that the problem is described here, or in the 
-		 <ulink url='http://www.opendarwin.org/projects/darwinports/en/faq.php'>
+		 <ulink url='http://www.opendarwin.org/projects/macports/en/faq.php'>
 		 FAQ</ulink> first.</para>
 
 		<sect2>
@@ -602,9 +601,9 @@
 		<sect2 id='user_bugs'>
 			<title>Bug reports</title>
 			<para>If the you have updated your ports tree, searched the 
-			darwinports at opendarwin.org mailling list archives and read the 
+			macports-dev at lists.macosforge.org mailling list archives and read the 
 			common problems and the FAQ and you still can't find the answer 
-			to the problem, you should submit a bug report via bugzilla.</para>
+			to the problem, you should submit a bug report via Trac.</para>
 
 
 			<para>The following section describes in some more detail how 
@@ -619,7 +618,7 @@
 							Project:
 						</term>
 						<listitem>
-							<para>Make sure you select the DarwinPorts 
+							<para>Make sure you select the MacPorts 
 							project.</para>
 
 						</listitem>
@@ -630,7 +629,7 @@
 							Component:
 						</term>
 						<listitem>
-							<para>Select "dports" as the component. </para>
+							<para>Select "mports" as the component. </para>
 
 						</listitem>
 					</varlistentry>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070621/227aa0d3/attachment.html


More information about the macports-changes mailing list