Merge branch 'master' into ticket/OEE-1166

# Conflicts:
#	package/platform-enterprise/src/Oro/Bundle/UserProBundle/Migrations/Schema/OroUserProBundleInstaller.php
#	package/platform-enterprise/src/Oro/Bundle/UserProBundle/Resources/translations/security.en.yml

conf.py

@@ -20,6 +20,7 @@
 
 sys.path.append(os.path.abspath('_exts'))
 sys.path.append('C:\Users\oro\dev\documentation\crm\_exts')
+sys.path.append('C:\Users\oro\sphinx-php')
 
 # adding PhpLexer
 from sphinx.highlighting import lexers

user_guide/index.rst

@@ -170,6 +170,7 @@ guide are most relevant for your work duties.
     * :doc:`/user_guide/mailchimp_integration`
     * :doc:`/user_guide/sending_email_campaign_via_mailchimp`
     * :doc:`/user_guide/dotmailer_integration`
+    * :doc:`/user_guide/sending_email_campaign_via_dotmailer`
     * :doc:`/user_guide/ms_exchange_integration`
     * :doc:`/user_guide/outlook_sync`
     * :doc:`/user_guide/embedded_forms`

user_guide/sales_processes_workflow.rst

@@ -4,10 +4,10 @@
 Sales Processes Workflow
 ========================
 
-To manage sales processes of the company, OroCRM provides the *"Sales Processes"* entity records.
+To manage sales processes of the company, OroCRM provides the **Sales Processes** entity records.
 
 To provide consistent and unified approach within the company, in OroCRM, management of the Sales Processes is
-straightened by the steps of the *"Sales Processes"* :ref:`workflow <user-guide-workflow-management-basics>` that 
+straightened by the steps of the **Sales Processes** :ref:`workflow <user-guide-workflow-management-basics>` that 
 involves the Lead and/or Opportunity records from a B2B Channel.
 
 According to the workflow, the following actions are available for a manager:
@@ -29,10 +29,14 @@ According to the workflow, the following actions are available for a manager:
 3. Any opportunity (whether it was developed or not) may be closed, either as won or lost, subject to the deal 
    outcomes.
 
-4. Any disqualified lead may be reactivated, which means a new lead will be created. A follow-up note can also be 
-   created for every disqualified lead. 
+4. Any disqualified lead may be renewed in the following way:
 
+  - Navigate to the Lead.
+  - Edit its properties.
+  - Change **Status** attribute to **New/Qualified**.
+
 5. Any closed opportunity can be reopened, which will result in creation of a new opportunity.
+
 
 
 .. image:: ./img/sales_process/sales_process_wf.png
@@ -43,4 +47,4 @@ completion.
 .. hint::
 
     You can clone and customize the workflow to correspond to your business-processes or create a new workflow using the 
-    same entities, as described in the :ref:`Workflows Management guide <user-guide-workflow-management-basics>`.
+    same entities, as described in the :ref:`Workflows Management guide <user-guide-workflow-management-basics>`.