diff --git a/foundation/www/docs/assets/img/setup/notifications/__init__.py b/foundation/www/docs/assets/img/setup/notifications/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/foundation/www/docs/assets/img/setup/email/email-alert-1.png b/foundation/www/docs/assets/img/setup/notifications/email-alert-1.png
similarity index 100%
rename from foundation/www/docs/assets/img/setup/email/email-alert-1.png
rename to foundation/www/docs/assets/img/setup/notifications/email-alert-1.png
diff --git a/foundation/www/docs/assets/img/setup/email/email-alert-2.png b/foundation/www/docs/assets/img/setup/notifications/email-alert-2.png
similarity index 100%
rename from foundation/www/docs/assets/img/setup/email/email-alert-2.png
rename to foundation/www/docs/assets/img/setup/notifications/email-alert-2.png
diff --git a/foundation/www/docs/assets/img/setup/email/email-alert-condition.png b/foundation/www/docs/assets/img/setup/notifications/email-alert-condition.png
similarity index 100%
rename from foundation/www/docs/assets/img/setup/email/email-alert-condition.png
rename to foundation/www/docs/assets/img/setup/notifications/email-alert-condition.png
diff --git a/foundation/www/docs/assets/img/setup/email/email-alert-set-property.png b/foundation/www/docs/assets/img/setup/notifications/email-alert-set-property.png
similarity index 100%
rename from foundation/www/docs/assets/img/setup/email/email-alert-set-property.png
rename to foundation/www/docs/assets/img/setup/notifications/email-alert-set-property.png
diff --git a/foundation/www/docs/assets/img/setup/email/email-alert-subject.png b/foundation/www/docs/assets/img/setup/notifications/email-alert-subject.png
similarity index 100%
rename from foundation/www/docs/assets/img/setup/email/email-alert-subject.png
rename to foundation/www/docs/assets/img/setup/notifications/email-alert-subject.png
diff --git a/foundation/www/docs/assets/img/setup/notifications/slack_notification_1.png b/foundation/www/docs/assets/img/setup/notifications/slack_notification_1.png
new file mode 100644
index 00000000..ec47f14f
Binary files /dev/null and b/foundation/www/docs/assets/img/setup/notifications/slack_notification_1.png differ
diff --git a/foundation/www/docs/assets/img/setup/notifications/slack_notification_2.png b/foundation/www/docs/assets/img/setup/notifications/slack_notification_2.png
new file mode 100644
index 00000000..a79b13bb
Binary files /dev/null and b/foundation/www/docs/assets/img/setup/notifications/slack_notification_2.png differ
diff --git a/foundation/www/docs/assets/img/setup/notifications/slack_notification_3.png b/foundation/www/docs/assets/img/setup/notifications/slack_notification_3.png
new file mode 100644
index 00000000..895ad876
Binary files /dev/null and b/foundation/www/docs/assets/img/setup/notifications/slack_notification_3.png differ
diff --git a/foundation/www/docs/assets/img/setup/notifications/slack_notification_4.png b/foundation/www/docs/assets/img/setup/notifications/slack_notification_4.png
new file mode 100644
index 00000000..5e6cef3c
Binary files /dev/null and b/foundation/www/docs/assets/img/setup/notifications/slack_notification_4.png differ
diff --git a/foundation/www/docs/user/manual/en/setting-up/email/email-alerts.md b/foundation/www/docs/user/manual/en/setting-up/email/email-alerts.md
deleted file mode 100755
index e1968f04..00000000
--- a/foundation/www/docs/user/manual/en/setting-up/email/email-alerts.md
+++ /dev/null
@@ -1,88 +0,0 @@
-
-# Email Alerts
-
-You can configure various email alerts in your system to remind you of important activities such as:
-
-1. Completion date of a Task.
-2. Expected Delivery Date of a Sales Order.
-3. Expected Payment Date.
-4. Reminder of followup.
-5. If an Order greater than a particular value is received or sent.
-6. Expiry notification for a Contract.
-7. Completion / Status change of a Task.
-
-For this, you need to setup an Email Alert.
-
-> Setup > Email > Email Alert
-
-### Setting Up An Alert
-
-To setup an Email Alert:
-
-1. Select which Document Type you want watch changes on
-2. Define what events you want to watch. Events are:
- 1. New: When a new document of the selected type is made.
- 2. Save / Submit / Cancel: When a document of the selected type is saved, submitted, cancelled.
- 3. Value Change: When a particular value in the selected type changes.
- 4. Days Before / Days After: Trigger this alert a few days before or after the **Reference Date.** To set the days, set **Days Before or After**. This can be useful in reminding you of upcoming due dates or reminding you to follow up on certain leads of quotations.
-3. Set additional conditions if you want.
-4. Set the recipients of this alert. The recipient could either be a field of the document or a list of fixed Email Addresses.
-5. Compose the message
-
-
-### Setting a Subject
-You can retrieve the data for a particular field by using `doc.[field_name]`. To use it in your subject / message, you have to surround it with `{% raw %}{{ }}{% endraw %}`. These are called [Jinja](http://jinja.pocoo.org/) tags. So, for example to get the name of a document, you use `{% raw %}{{ doc.name }}{% endraw %}`. The below example sends an email on saving a Task with the Subject, "TASK##### has been created"
-
-
-
-### Setting Conditions
-
-Email alerts allow you to set conditions according to the field data in your documents. For example, if you want to recieve an Email if a Lead has been saved as "Interested" as it's status, you put `doc.status == "Interested"` in the conditions textbox. You can also set more complex conditions by combining them.
-
-
-
-The above example will send an Email Alert when a Task is saved with the status "Open" and the Expected End Date for the Task is the date on or before the date on which it was saved on.
-
-
-### Setting a Message
-
-You can use both Jinja Tags (`{% raw %}{{ doc.[field_name] }}{% endraw %}`) and HTML tags in the message textbox.
-
- {% raw %}Order Overdue
-
- Transaction {{ doc.name }} has exceeded Due Date. Please take necessary action.
-
-
- {% if comments %}
- Last comment: {{ comments[-1].comment }} by {{ comments[-1].by }}
- {% endif %}
-
- Details
-
-
- - Customer: {{ doc.customer }}
-
- Amount: {{ doc.total_amount }}
-
{% endraw %}
-
----
-
-### Setting a Value after the Alert is Set
-
-Sometimes to make sure that the email alert is not sent multiple times, you can
-define a custom property (via Customize Form) like "Email Alert Sent" and then
-set this property after the alert is sent by setting the **Set Property After Alert**
-field.
-
-Then you can use that as a condition in the **Condition** rules to ensure emails are not sent multiple times
-
-
-
-### Example
-
-1. Defining the Criteria
- 
-
-1. Setting the Recipients and Message
- 
-
-{next}
diff --git a/foundation/www/docs/user/manual/en/setting-up/index.txt b/foundation/www/docs/user/manual/en/setting-up/index.txt
index 6aae3de3..0323e635 100755
--- a/foundation/www/docs/user/manual/en/setting-up/index.txt
+++ b/foundation/www/docs/user/manual/en/setting-up/index.txt
@@ -3,6 +3,7 @@ users-and-permissions
settings
data
email
+notifications
print
setting-up-taxes
pos-setting
diff --git a/foundation/www/docs/user/manual/en/setting-up/notifications/__init__.py b/foundation/www/docs/user/manual/en/setting-up/notifications/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/foundation/www/docs/user/manual/en/setting-up/notifications/index.md b/foundation/www/docs/user/manual/en/setting-up/notifications/index.md
new file mode 100644
index 00000000..30423ea2
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/setting-up/notifications/index.md
@@ -0,0 +1,140 @@
+
+# Notifications
+
+You can configure various Notifications in your system to remind you of important activities such as:
+
+1. Completion date of a Task.
+2. Expected Delivery Date of a Sales Order.
+3. Expected Payment Date.
+4. Reminder of followup.
+5. If an Order greater than a particular value is received or sent.
+6. Expiry notification for a Contract.
+7. Completion / Status change of a Task.
+
+For this, you need to setup a Notification.
+
+> Setup > Email > Notification
+
+### Setting Up An Alert
+
+To setup a Notification:
+
+1. Select which Document Type you want watch changes on
+2. Define what events you want to watch. Events are:
+ 1. New: When a new document of the selected type is made.
+ 2. Save / Submit / Cancel: When a document of the selected type is saved, submitted, cancelled.
+ 3. Value Change: When a particular value in the selected type changes.
+ 4. Days Before / Days After: Trigger this alert a few days before or after the **Reference Date.** To set the days, set **Days Before or After**. This can be useful in reminding you of upcoming due dates or reminding you to follow up on certain leads of quotations.
+3. Set additional conditions if you want.
+4. Set the recipients of this alert. The recipient could either be a field of the document or a list of fixed Email Addresses.
+5. Compose the message
+
+
+### Setting a Subject
+You can retrieve the data for a particular field by using `doc.[field_name]`. To use it in your subject / message, you have to surround it with `{% raw %}{{ }}{% endraw %}`. These are called [Jinja](http://jinja.pocoo.org/) tags. So, for example to get the name of a document, you use `{% raw %}{{ doc.name }}{% endraw %}`. The below example sends an email on saving a Task with the Subject, "TASK##### has been created"
+
+
+
+### Setting Conditions
+
+Notifications allow you to set conditions according to the field data in your documents. For example, if you want to recieve an Email if a Lead has been saved as "Interested" as it's status, you put `doc.status == "Interested"` in the conditions textbox. You can also set more complex conditions by combining them.
+
+
+
+The above example will send a Notification when a Task is saved with the status "Open" and the Expected End Date for the Task is the date on or before the date on which it was saved on.
+
+
+### Setting a Message
+
+You can use both Jinja Tags (`{% raw %}{{ doc.[field_name] }}{% endraw %}`) and HTML tags in the message textbox.
+
+ {% raw %}Order Overdue
+
+ Transaction {{ doc.name }} has exceeded Due Date. Please take necessary action.
+
+
+ {% if comments %}
+ Last comment: {{ comments[-1].comment }} by {{ comments[-1].by }}
+ {% endif %}
+
+ Details
+
+
+ - Customer: {{ doc.customer }}
+
- Amount: {{ doc.total_amount }}
+
{% endraw %}
+
+---
+
+### Setting a Value after the Alert is Set
+
+Sometimes to make sure that the Notification is not sent multiple times, you can
+define a custom property (via Customize Form) like "Notification Sent" and then
+set this property after the alert is sent by setting the **Set Property After Alert**
+field.
+
+Then you can use that as a condition in the **Condition** rules to ensure emails are not sent multiple times
+
+
+
+### Example
+
+1. Defining the Criteria
+ 
+
+1. Setting the Recipients and Message
+ 
+
+
+---
+
+# Slack Notifications
+
+If you prefer to have your notifications sent to a dedicated Slack channel, you can also choose the option "Slack" in the channel options and select the appropriate Slack Webhook URL.
+
+### Slack Webhook url
+
+A Slack webhook URL is an URL pointing directly to a Slack channel.
+
+In order to generate webhook URLs, you need to create a new Slack App:
+
+1. Go to https://api.slack.com/slack-apps
+2. Click on "Create a Slack App"
+ 
+
+3. Give your App a name and choose the right workspace
+ Once your app is created, go to the "Incoming Webhooks" section and add a new Webhook to Workspace.
+ 
+
+4. Copy the created link, go back to ERPNext and use it to create a new Slack Webhook URL in Integrations > Slack Webhook URL.
+ 
+
+5. Select Slack and your Slack channel in the channel and Slack channel fields within your notification
+
+
+### Message Format
+
+Unlike Email messages, Slack doesn't allow HTML formatting.
+
+Instead you can use markdown formatting: [Slack Documentation](https://get.slack.help/hc/en-us/articles/202288908-Format-your-messages)
+
+Example:
+ {% raw %}
+ *Order Overdue*
+
+ Transaction {{ doc.name }} has exceeded Due Date. Please take necessary action.
+
+
+ {% if comments %}
+ Last comment: {{ comments[-1].comment }} by {{ comments[-1].by }}
+ {% endif %}
+
+ *Details*
+
+ • Customer: {{ doc.customer }}
+ • Amount: {{ doc.grand_total }}
+ {% endraw %}
+
+
+
+{next}
\ No newline at end of file