jango2015
diff --git a/‎applications.rst
Lines changed: 1 addition & 1 deletion b/‎applications.rst
Lines changed: 1 addition & 1 deletion
diff --git a/‎discuss.rst
Lines changed: 6 additions & 1 deletion b/‎discuss.rst
Lines changed: 6 additions & 1 deletion
diff --git a/‎discuss/getting_started.rst
Lines changed: 0 additions & 190 deletions b/‎discuss/getting_started.rst
Lines changed: 0 additions & 190 deletions
diff --git a/‎discuss/integrations.rst
Lines changed: 10 additions & 0 deletions b/‎discuss/integrations.rst
Lines changed: 10 additions & 0 deletions
diff --git a/‎discuss/integrations/mail_twitter.rst
Lines changed: 3 additions & 0 deletions b/‎discuss/integrations/mail_twitter.rst
Lines changed: 3 additions & 0 deletions
diff --git a/‎discuss/mentions.rst
Lines changed: 10 additions & 0 deletions b/‎discuss/mentions.rst
Lines changed: 10 additions & 0 deletions
diff --git a/‎discuss/media/discuss06.png renamed to ‎discuss/mentions/media/discuss06.png b/‎discuss/media/discuss06.png renamed to ‎discuss/mentions/media/discuss06.png
diff --git a/‎discuss/mentions/mentions.rst
Lines changed: 38 additions & 0 deletions b/‎discuss/mentions/mentions.rst
Lines changed: 38 additions & 0 deletions
diff --git a/‎discuss/monitoring.rst
Lines changed: 10 additions & 0 deletions b/‎discuss/monitoring.rst
Lines changed: 10 additions & 0 deletions
diff --git a/‎discuss/media/discuss04.png renamed to ‎discuss/monitoring/media/discuss04.png b/‎discuss/media/discuss04.png renamed to ‎discuss/monitoring/media/discuss04.png
diff --git a/‎discuss/media/discuss05.png renamed to ‎discuss/monitoring/media/discuss05.png b/‎discuss/media/discuss05.png renamed to ‎discuss/monitoring/media/discuss05.png
diff --git a/‎discuss/monitoring/monitoring.rst
Lines changed: 27 additions & 0 deletions b/‎discuss/monitoring/monitoring.rst
Lines changed: 27 additions & 0 deletions
diff --git a/‎discuss/overview.rst
Lines changed: 10 additions & 0 deletions b/‎discuss/overview.rst
Lines changed: 10 additions & 0 deletions
diff --git a/‎discuss/media/discuss01.png renamed to ‎discuss/overview/media/discuss01.png b/‎discuss/media/discuss01.png renamed to ‎discuss/overview/media/discuss01.png
diff --git a/‎discuss/overview/overview.rst
Lines changed: 15 additions & 0 deletions b/‎discuss/overview/overview.rst
Lines changed: 15 additions & 0 deletions
diff --git a/‎discuss/team_communication.rst
Lines changed: 10 additions & 0 deletions b/‎discuss/team_communication.rst
Lines changed: 10 additions & 0 deletions
diff --git a/‎discuss/media/discuss02.png renamed to ‎discuss/team_communication/media/discuss02.png b/‎discuss/media/discuss02.png renamed to ‎discuss/team_communication/media/discuss02.png
diff --git a/‎discuss/media/discuss03.png renamed to ‎discuss/team_communication/media/discuss03.png b/‎discuss/media/discuss03.png renamed to ‎discuss/team_communication/media/discuss03.png
@@ -10,7 +10,7 @@ Applications
    sales
    website
    ecommerce
-   discuss/getting_started
+   discuss
    purchase
    inventory
    manufacturing
 
@@ -7,4 +7,9 @@ Discuss
 .. toctree::
    :titlesonly:
 
-   discuss/getting_started
+   discuss/overview
+   discuss/team_communication
+   discuss/monitoring
+   discuss/mentions
+   discuss/tracking
+   discuss/integrations
@@ -0,0 +1,10 @@
+:banner: banners/discuss.jpg
+
+============
+Integrations
+============
+
+.. toctree::
+   :titlesonly:
+
+   integrations/mail_twitter
@@ -0,0 +1,3 @@
+======================================
+Integrating Twitter Feed with Channels
+======================================
@@ -0,0 +1,10 @@
+:banner: banners/discuss.jpg
+
+========
+Mentions
+========
+
+.. toctree::
+   :titlesonly:
+
+   mentions/mentions
@@ -0,0 +1,38 @@
+====================================================
+Grabbing Attention with Direct Messages and Mentions
+====================================================
+
+You can **mention** a user in a channel or chatter by typing
+**@user-name**. Mentioning a user in the chatter will set them as a
+follower of the item (if they are not already) and send a message to
+their inbox. The item containing the mention will also be bolded in the
+list view. Mentioning a user in a channel will send a message to their
+inbox. You cannot mention a user in a channel who is not subscribed to
+the channel. Typing **#channel-name** will provide a link to the
+mentioned channel in either a chatter or another channel.
+
+Direct Messaging a User
+=======================
+
+**Direct messages** are private messages viewable only by the sender
+and recipient. You can send direct messages to other users from
+within the Discuss module by creating a new conversation or
+selecting an existing one from the sidebar. Direct messages can be
+sent from anywhere in Odoo using the speech bubble icon in the top
+bar. The online status of other users is displayed to the left of
+their name. A **green dot** indicates that a user is Online, an
+**orange dot** that they are Idle, and a **grey dot** that they are
+offline.
+
+Desktop Notifications from Discuss
+==================================
+
+You can choose to see **desktop notifications** when you receive a
+new direct message. The notification shows you the sender and a
+brief preview of the message contents. These can be configured or
+disabled by clicking on the gear icon in the corner of the
+notification..
+
+.. image:: media/discuss06.png
+    :align: center
+
@@ -0,0 +1,10 @@
+:banner: banners/discuss.jpg
+
+==========
+Monitoring
+==========
+
+.. toctree::
+   :titlesonly:
+
+   monitoring/monitoring
@@ -0,0 +1,27 @@
+========================================
+Monitoring Your Messages Using the Inbox
+========================================
+
+.. image:: media/discuss04.png
+    :align: center
+
+Use the **inbox** to monitor updates and progress on everything you do
+in Odoo. Notifications from everything you follow and conversations in
+which you are mentioned appear in your inbox.
+
+.. image:: media/discuss05.png
+    :align: center
+
+Marking an item with a check sets the message to **read** and removes it
+from your inbox. If you would like to save an item for future reference
+or action, mark it with a star to add it to the **Starred** box. You can
+star any message or notification in Discuss or any of the item-specific
+chatters throughout Odoo to keep tabs on it here.
+
+Sending Emails
+==============
+
+You can **send emails** from the inbox of Odoo Discuss. In addition
+to the usual email features, you can select a template that you have
+already created, or create one on the fly and save it for later use.
+
@@ -0,0 +1,10 @@
+:banner: banners/discuss.jpg
+
+========
+Overview
+========
+
+.. toctree::
+   :titlesonly:
+
+   overview/overview
@@ -0,0 +1,15 @@
+========
+Overview
+========
+
+Odoo Discuss is an easy to use messaging app for teams that brings all
+your organization's communication into one place and seamlessly
+integrates with the Odoo platform. Discuss lets you send and receive
+messages from wherever you are in Odoo as well as manage your messages
+and notifications easily from within the app. Discuss allows you to
+create **channels** for team chats, conversations about projects,
+meeting coordination, and more in one simple and searchable
+interface.
+
+.. image:: media/discuss01.png
+    :align: center
@@ -0,0 +1,10 @@
+:banner: banners/discuss.jpg
+
+=============
+Communication
+=============
+
+.. toctree::
+   :titlesonly:
+
+   team_communication/team_communication