From a4a035499b7eb5c37218c92078c5f8cec5950d08 Mon Sep 17 00:00:00 2001
From: Forrest Alvarez <forrest.alvarez@gmail.com>
Date: Fri, 3 Jan 2014 06:10:51 +0000
Subject: [PATCH] Updated README to have all the states properly set up,
 dropped the apt requirement from everything.

---
 README.rst     | 69 +++++++++++++++++++++++++++++++++++++-------------
 php/apc.sls    |  3 ---
 php/curl.sls   |  3 ---
 php/fpm.sls    |  3 ---
 php/gd.sls     |  3 ---
 php/init.sls   |  3 ---
 php/mcrypt.sls |  3 ---
 php/mysql.sls  |  3 ---
 php/pear.sls   |  3 ---
 9 files changed, 51 insertions(+), 42 deletions(-)

diff --git a/README.rst b/README.rst
index 3abc4ed..837bed2 100644
--- a/README.rst
+++ b/README.rst
@@ -1,25 +1,58 @@
+===
 php
-======
-DEPENDENCIES:
-  These formulas are required:
+===
 
-	1) apt
+Formulas to set up and configure php and various php libraries.
 
-ORDERING:
+.. note::
 
-The ordering of the states for php falls into block ranges which are:
+    See the full `Salt Formulas installation and usage instructions
+    <http://docs.saltstack.com/topics/conventions/formulas.html>`_.
 
-	1)  php will use 1-500 for ordering
-	2)  php will reserve 1  -100 as unused
-	3)  php will reserve 101-150 for pre pkg install
-	4)  php will reserve 151-200 for pkg install
-	5)  php will reserve 201-250 for pkg configure
-	6)  php will reserve 251-300 for downloads, git stuff, load data
-	7)  php will reserve 301-400 for unknown purposes
-	8)  php will reserve 401-450 for service restart-reloads
-	9)  php WILL reserve 451-460 for service.running
-	10) php will reserve 461-500 for cmd requiring operational services
+Available states
+================
 
-PILLARS:
+.. contents::
+    :local:
 
-	No Pillars are used in this formula as of yet.
+``php``
+-------
+
+Installs the php package.
+
+``php.apc``
+-----------
+
+Installs the php-apc package.
+
+``php.curl``
+------------
+
+Installs the php5-curl package on Debian, and ensures that curl itself is
+installed for RedHat systems, this is due to the curl libs being provided by
+php-common, which will get installed with the main php package.
+
+``php.fpm``
+-----------
+
+Installs the php-fpm package, starts the service, and enables it.
+
+``php.gd``
+----------
+
+Installs the php-gd package.
+
+``php.mcrypt``
+--------------
+
+Installs the php-mcrypt package.
+
+``php.mysql``
+-------------
+
+Installs the php-mysql package.
+
+``php.pear``
+------------
+
+Installs the php-pear package.
diff --git a/php/apc.sls b/php/apc.sls
index 5c960b7..09b2246 100644
--- a/php/apc.sls
+++ b/php/apc.sls
@@ -1,8 +1,5 @@
 {% from "php/map.jinja" import php with context %}
 
-include:
-  - apt
-
 php-apc:
   pkg:
     - installed
diff --git a/php/curl.sls b/php/curl.sls
index ca6d9ba..f795c2d 100644
--- a/php/curl.sls
+++ b/php/curl.sls
@@ -1,8 +1,5 @@
 {% from "php/map.jinja" import php with context %}
 
-include:
-  - apt
-
 php-curl:
   pkg:
     - installed
diff --git a/php/fpm.sls b/php/fpm.sls
index 44ee160..3b91f6e 100644
--- a/php/fpm.sls
+++ b/php/fpm.sls
@@ -1,8 +1,5 @@
 {% from "php/map.jinja" import php with context %}
 
-include:
-  - apt
-
 php-fpm:
   pkg:
     - installed
diff --git a/php/gd.sls b/php/gd.sls
index 3769b1a..f2b62dc 100644
--- a/php/gd.sls
+++ b/php/gd.sls
@@ -1,8 +1,5 @@
 {% from "php/map.jinja" import php with context %}
 
-include:
-  - apt
-
 php-gd:
   pkg:
     - installed
diff --git a/php/init.sls b/php/init.sls
index 6272e40..67812c9 100644
--- a/php/init.sls
+++ b/php/init.sls
@@ -1,8 +1,5 @@
 {% from "php/map.jinja" import php with context %}
 
-include:
-  - apt
-
 php:
   pkg:
     - installed
diff --git a/php/mcrypt.sls b/php/mcrypt.sls
index 6d155b0..40d31d0 100644
--- a/php/mcrypt.sls
+++ b/php/mcrypt.sls
@@ -1,8 +1,5 @@
 {% from "php/map.jinja" import php with context %}
 
-include:
-  - apt
-
 php-mcrypt:
   pkg:
     - installed
diff --git a/php/mysql.sls b/php/mysql.sls
index 054f79b..09c1cee 100644
--- a/php/mysql.sls
+++ b/php/mysql.sls
@@ -1,8 +1,5 @@
 {% from "php/map.jinja" import php with context %}
 
-include:
-  - apt
-
 php-mysql:
   pkg:
     - installed
diff --git a/php/pear.sls b/php/pear.sls
index c696f8a..3968a9b 100644
--- a/php/pear.sls
+++ b/php/pear.sls
@@ -1,8 +1,5 @@
 {% from "php/map.jinja" import php with context %}
 
-include:
-  - apt
-
 php-pear:
   pkg:
     - installed