From: sjg <sjg@web>
Date: Fri, 20 Dec 2013 15:57:11 +0000 (+0000)
Subject: Woops, Justin beat me to it
X-Git-Url: https://gitweb.dragonflybsd.org/ikiwiki.git/commitdiff_plain/a2dcc62439bb59ab7efe311b69bf9e527202eb88

Woops, Justin beat me to it

This reverts commit c7ce0af01c76ba950ea8e672e8f2d7feeeeb2af3
---

diff --git a/donations/index.mdwn b/donations/index.mdwn
index c2836dfd..6dad5766 100644
--- a/donations/index.mdwn
+++ b/donations/index.mdwn
@@ -69,7 +69,6 @@ or damaged.
 * Thomas from <a href="http://www.hausjournal.net">Hausjournal</a> ($100)
 * Klaus from <a href="http://www.eleo-pavillon.de">eleo Pavillon</a>
 * Max from <a href="http://traeumen.org/">Traeumen</a> ($100)
-* Marie, Elwood <a href="http://www.liftchristianmarketing.com">Christian Marketing Consultant</a> ($100)
 
 #### 2012
 * Justin Sherrill ($500)
diff --git a/mailinglists.mdwn b/mailinglists.mdwn
index e2aca1c0..76435936 100644
--- a/mailinglists.mdwn
+++ b/mailinglists.mdwn
@@ -11,6 +11,7 @@ DragonFly uses Mailman to manage all mailing lists.  To subscribe, unsubscribe,
 The bugs@ and submit@ lists are tied into the bug tracker at [bugs.dragonflybsd.org](http://bugs.dragonflybsd.org/).  Subscribers to these lists will receive all output, but to post to those lists, you need to [create an account at bugs.dragonflybsd.org](http://bugs.dragonflybsd.org/account/register).
 
 A mailing list subscription is not necessary to post a bug report when you access the bugs database via [bugs.dragonflybsd.org](http://bugs.dragonflybsd.org).  You will be appropriately CCd via your bugs database registration.
+[Glutera](http://www.grosir-kosmetik.com/62-glutera.html), [Been pink](http://www.grosir-kosmetik.com/63-been-pink-beauty-series.html)
 
 ## By web archive
 
diff --git a/release36/index.mdwn b/release36/index.mdwn
index ade8608a..13313e9a 100644
--- a/release36/index.mdwn
+++ b/release36/index.mdwn
@@ -6,7 +6,7 @@ Version 3.6.0 released 25 November 2013.
 
 ### Default to dports
 
-Dports, which uses the FreeBSD ports system as a base, and the 'pkg' tools for installation, is now default on DragonFly.  Over 20,000 packages are available in binary or source form.
+[[Dports|docs/howtos/HowToDPorts]], which uses the [FreeBSD ports](http://www.freshports.org/categories.php) system as a base, and the 'pkg' tools for installation, is now default on DragonFly.  Over 20,000 packages are available in binary or source form.
 
 ### SMP scaling improvements
 
@@ -49,13 +49,13 @@ MD5 sums for the uncompressed images:
 
 ### pkgsrc packages
 
-There are no prebuilt pkgsrc packages; pkgsrc itself can be installed from tarballs or the cvs repository at http://www.pkgsrc.org/
+There are no prebuilt [pkgsrc](http://www.pkgsrc.org) packages; pkgsrc itself can be installed from tarballs or the cvs repository at http://www.pkgsrc.org/ or see the [[how-to use pkgsrc|docs/howtos/HowToPkgsrc]] page.
 
 ### dports packages
 
-Packages for dports on DragonFly 3.6 are available, for both 32 and 64 bit platforms.  The 'pkg' command will automatically access the main dports repository for DragonFly.  Modify /usr/local/etc/pkg.conf if you want to change this and select a different mirror.
+Packages for [[dports|docs/howtos/HowToDPorts]] on DragonFly 3.6 are available, for both 32 and 64 bit platforms.  The 'pkg' command will automatically access the main dports repository for DragonFly.  Modify /usr/local/etc/pkg.conf if you want to change this and select a different mirror.
 
-If you have pkgsrc packages installed, move or rename /usr/pkg and /var/db/pkg before installing from dports.  Dump databases before starting this process.  Use 'pkg search' to verify the existence of your needed packages before moving the existing pkgsrc files away, and 'pkg install' to add them.  U
+If you have pkgsrc packages installed, move or rename /usr/pkg and /var/db/pkg before installing from dports.  Dump databases before starting this process.  Use 'pkg search' to verify the existence of your needed packages before moving the existing pkgsrc files away, and 'pkg install' to add them.
 
 If you need specific build options for dports packages that aren't on by default, you will need to build your own versions of the software.  Download the dports src repository with 'make dports-create' in the /usr directory, and build from there.