You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by kx...@apache.org on 2013/09/27 20:03:15 UTC

[14/50] [abbrv] git commit: updated refs/heads/1781-reorganize-and-improve-docs to 2375d00

Changed Mac OS X section

MacOS is now Mac OS X. Added "Installation using the Apache CouchDB native application" section (inspired by MySQL documentation), simplified MacPorts section. Who chose MacPorts in favor of the native app is because already using MacPorts, so he knows how to upgrade packages, make the selfupdate, etc.


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/be3507b7
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/be3507b7
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/be3507b7

Branch: refs/heads/1781-reorganize-and-improve-docs
Commit: be3507b7c3c8d404c0dc486038e2428ff50e0354
Parents: 3017c9a
Author: Filippo Fadda <fi...@gmail.com>
Authored: Wed Aug 21 20:55:13 2013 +0400
Committer: Alexander Shorin <kx...@apache.org>
Committed: Fri Sep 27 21:59:46 2013 +0400

----------------------------------------------------------------------
 share/doc/src/install/mac.rst | 66 +++++++++++++++++++++++++++++---------
 1 file changed, 51 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/be3507b7/share/doc/src/install/mac.rst
----------------------------------------------------------------------
diff --git a/share/doc/src/install/mac.rst b/share/doc/src/install/mac.rst
index 5cfeab0..2f7a12d 100644
--- a/share/doc/src/install/mac.rst
+++ b/share/doc/src/install/mac.rst
@@ -13,26 +13,63 @@
 
 .. _install/mac:
 
-=====================
-Installation on MacOS
-=====================
+========================
+Installation on Mac OS X
+========================
+
 
 .. _install/mac/binary:
 
-Install from binaries
-=====================
+Installation using the Apache CouchDB native application
+========================================================
+
+The easiest way to run CouchDB on Mac OS X is through his native Mac OS X
+application. Just follow the below instructions:
 
-#. Get `the latest MacOS binaries`_ from `CouchDB web site`_.
+#. `Download Apache CouchDB for Mac OS X`_.
    Old releases are available at `archive`_.
-#. Unzip it and place CouchDB Server into the Applications directory
-#. Run CouchDB
-#. `Open up Futon`_
-#. It's time to Relax!
+#. Double click on the Zip file
+#. Drag and drop the Apache CouchDB.app into Applications folder
 
-.. _Open up Futon: http://localhost:5984/_utils
-.. _CouchDB web site: http://couchdb.org/
+.. _Download Apache CouchDB for Mac OS X: http://couchdb.org/#download
 .. _archive: http://archive.apache.org/dist/couchdb/binary/mac/
-.. _the latest MacOS binaries: http://couchdb.org/#download
+
+That's all, now CouchDB is installed on your Mac:
+
+#. Run Apache CouchDB application
+#. `Open up Futon`_, the CouchDB admin interface
+#. Time to Relax!
+
+.. _Open up Futon: http://localhost:5984/_utils
+
+
+.. _install/mac/macports:
+
+Installation from MacPorts
+==========================
+
+To install CouchDB using MacPorts you have 2 package choices:
+
+- ``couchdb`` - the latest release version
+- ``couchdb-devel`` - updated every few weeks from the master branch
+
+::
+
+  $ sudo port install couchdb
+  
+or, if you want the last development version:
+
+  $ sudo port install couchdb-devel
+
+MacPorts takes care of installing all necessary dependencies.
+It should now be up and accessible via Futon at http://127.0.0.1:5984/_utils.
+
+If you want to run CouchDB as a service, load the launchd configuration which
+comes  with the project, with this command::
+
+  $ sudo port load couchdb
+
+Now CouchDB should be started automatically after every reboot.
 
 
 .. _install/mac/homebrew:
@@ -67,7 +104,7 @@ The same is true for recent versions of Erlang::
 
 Now it's time to brew CouchDB::
 
-  brew install couchdb
+    brew install couchdb
 
 
 The above Erlang install will use the bottled (pre-compiled) version if you are:
@@ -185,4 +222,3 @@ to reflect the latest versions of available packages. In order to do that run::
   $ sudo port selfupdate
 
 to update the port tree, and then install just as explained.
-