git: Do the revert operation in a secondary working tree

[git.ikiwiki.info.git] / doc / tips / ikiwiki_on_mac_os_x.mdwn

diff --git a/doc/tips/ikiwiki_on_mac_os_x.mdwn b/doc/tips/ikiwiki_on_mac_os_x.mdwn
index b1757af842a3aeda87eb64d166b5925ae3c1f1b1..6c7487a98774c9fe9ee6d3d67f25254a353c998a 100644 (file)
--- a/doc/tips/ikiwiki_on_mac_os_x.mdwn
+++ b/doc/tips/ikiwiki_on_mac_os_x.mdwn
@@ -1,14 +1,21 @@
 [[!toc]]
 [[!toc]]

+[[!meta date="2011-06-24 17:35:14 -0400"]]

 
 # pkgsrc
 
 The easiest way of installing an up-to-date ikiwiki on any version of Mac OS X is via
 [pkgsrc](http://www.pkgsrc.org/).
 
 
 # pkgsrc
 
 The easiest way of installing an up-to-date ikiwiki on any version of Mac OS X is via
 [pkgsrc](http://www.pkgsrc.org/).
 

+## From source:
+

 7. [Bootstrap pkgsrc](http://www.netbsd.org/docs/pkgsrc/platforms.html#bootstrapping-pkgsrc)
 7. Run `cd .../pkgsrc/www/ikiwiki && make install clean`
 
 7. [Bootstrap pkgsrc](http://www.netbsd.org/docs/pkgsrc/platforms.html#bootstrapping-pkgsrc)
 7. Run `cd .../pkgsrc/www/ikiwiki && make install clean`
 

-{OK} As of 2013/09/14, the [version of ikiwiki in pkgsrc](http://pkgsrc.se/www/ikiwiki) is 3.20130904.1.
+## From binary packages:
+
+7. [install binary packages (OSX)](http://www.pkgsrc.org/#index1h1)
+
+{OK} As of 2014/10/14, the [version of ikiwiki in pkgsrc](http://pkgsrc.se/www/ikiwiki) is 3.20140916.

 
 -----
 
 
 -----
 


@@ -33,7 +40,7 @@ enjoy
 
 Enrique Castilla
 
 
 Enrique Castilla
 

-[!] As of 2013/09/14, the [version of ikiwiki in MacPorts](http://www.macports.org/ports.php?by=name&substr=Ikiwiki) is 3.20110608.
+[!] As of 2014/10/14, the [version of ikiwiki in MacPorts](http://www.macports.org/ports.php?by=name&substr=Ikiwiki) is 3.20110608.

 
 -----
 
 
 -----
 


@@ -179,7 +186,7 @@ it installed without issue so I'm baffled why it didn't install from command lin
     _ This setup file causes ikiwiki to create a wiki, check it into revision
     _ control, generate a setup file for the new wiki, and set everything up.
     
     _ This setup file causes ikiwiki to create a wiki, check it into revision
     _ control, generate a setup file for the new wiki, and set everything up.
     

-    _ Just run: ikiwiki -setup /etc/ikiwiki/auto.setup
+    _ Just run: ikiwiki --setup /etc/ikiwiki/auto.setup

     
     _By default, it asks a few questions, and confines itself to the user's home
     _directory. You can edit it to change what it asks questions about, or to
     
     _By default, it asks a few questions, and confines itself to the user's home
     _directory. You can edit it to change what it asks questions about, or to