From f561264e6bf1611b2421ae4fe32fb273319c141f Mon Sep 17 00:00:00 2001
From: Mike Olund <michaelo@openroad.ca>
Date: Wed, 15 Mar 2017 11:34:05 -0700
Subject: [PATCH] DIV-182, DIV-194, DIV-206

---
 edivorce/apps/core/templates/question/02_claimant.html     | 2 +-
 edivorce/apps/core/templates/question/03_respondent.html   | 2 +-
 edivorce/apps/core/templates/question/05_separation.html   | 7 +++----
 edivorce/apps/core/templates/question/07_property.html     | 4 ++--
 .../apps/core/templates/question/12_uncategorized.html     | 2 +-
 openshift/README.md                                        | 2 +-
 6 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/edivorce/apps/core/templates/question/02_claimant.html b/edivorce/apps/core/templates/question/02_claimant.html
index d74b4620..f74a7416 100644
--- a/edivorce/apps/core/templates/question/02_claimant.html
+++ b/edivorce/apps/core/templates/question/02_claimant.html
@@ -52,7 +52,7 @@
                         </label>
     </div>
 
-    <p>This could be an abbreviaton of your legal name, a maiden name, or any alias's you use for business or legal matters.</p>
+    <p>This could be an abbreviaton of your legal name, a maiden name, or any aliases you use for business or legal matters.</p>
 
     <div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="false" data-target="#collapse_other_name" aria-controls="collapse_other_name">
         <div>
diff --git a/edivorce/apps/core/templates/question/03_respondent.html b/edivorce/apps/core/templates/question/03_respondent.html
index f0d0cefe..cd6072ea 100644
--- a/edivorce/apps/core/templates/question/03_respondent.html
+++ b/edivorce/apps/core/templates/question/03_respondent.html
@@ -61,7 +61,7 @@
         </label>
     </div>
 
-    <p>This could be an abbreviaton of your legal name, a maiden name, or any alias's they use for business
+    <p>This could be an abbreviaton of your legal name, a maiden name, or any aliases they use for business
         or legal matters.</p>
 
     <div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="false" data-target="#collapse_other_name" aria-controls="collapse_other_name">
diff --git a/edivorce/apps/core/templates/question/05_separation.html b/edivorce/apps/core/templates/question/05_separation.html
index 3c944c1c..7f6d9344 100644
--- a/edivorce/apps/core/templates/question/05_separation.html
+++ b/edivorce/apps/core/templates/question/05_separation.html
@@ -50,14 +50,13 @@
 
 <div class="question-well">
     <p>
-        We’re legally required to ask that you confirm that you and {% if responses.name_spouse %} {{ responses.name_spouse }} {% else %} your spouse {% endif %}
-        haven’t lied or tried to deceive the court in any way. This is called “collusion
+        We are legally required to ask whether or not you and {% if name_spouse %} {{ name_spouse }} {% else %} your spouse {% endif %}
+         have agreed to deceive the court. This is called “collusion
         <i class="fa fa-question-circle" data-toggle="tooltip" data-placement="right" data-html="true"
        title="<b>Collusion</b><br /><br />Basically this statement confirms that you and your spouse haven’t lied or tried to deceive the court in any way
        (for example, saying that you’ve been separated for longer than you have been). It is a legal requirement that you confirm you are providing accurate
        and complete information. Apologies if you are offended with this question." aria-hidden="true"></i>
-        ”. An example of collusion is both
-        of you saying that you’ve been separated for longer than you actually have been.
+        ”. An example of collusion is when a couple agrees to lie about the date of separation to speed up the divorce process.
     </p>
     <div class="checkbox-group">
         <div class="checkbox">
diff --git a/edivorce/apps/core/templates/question/07_property.html b/edivorce/apps/core/templates/question/07_property.html
index ca69425a..417f8520 100644
--- a/edivorce/apps/core/templates/question/07_property.html
+++ b/edivorce/apps/core/templates/question/07_property.html
@@ -14,10 +14,10 @@
 <div class="intro">
     <p>After you separate, the law says that all <span class="tooltip-link" data-toggle="tooltip" data-placement="right" data-html="true" title="<b>Family property</b><br /><br />The assest acquired by either spouse during the course of the relationship,
    plus any increase in the value of excluded property. The law assumes that you're both entitled to an equal share of family property unless an equal division would be significantly unfair."> family property
-        <i class="fa fa-question-circle" aria-hidden="true"></i></span> and <span class="tooltip-link" data-toggle="tooltip" data-placement="right" data-html="true" title="<b>Family debt</b><br /><br />Money owned to others accumulated during a relationship or to maintain
+        <i class="fa fa-question-circle" aria-hidden="true"></i></span> and <span class="tooltip-link" data-toggle="tooltip" data-placement="right" data-html="true" title="<b>Family debt</b><br /><br />Money owed to others accumulated during a relationship or to maintain
        family property after separation. The law assumes that both spouses are equally responsible for the debt
        unless an equal division would be &quot;significantly unfair.&quot;">  family debt
-        <i class="fa fa-question-circle" aria-hidden="true"></i></span> must be divided equally between you and your spouse, unless you have<span class="tooltip-link" data-toggle="tooltip" data-placement="right" data-html="true" title="<b>Family debt</b><br /><br />A written document that sets out how you and your spouse have agreed
+        <i class="fa fa-question-circle" aria-hidden="true"></i></span> must be divided equally between you and your spouse, unless you have<span class="tooltip-link" data-toggle="tooltip" data-placement="right" data-html="true" title="<b>An agreement</b><br /><br />A written document that sets out how you and your spouse have agreed
        to deal with parenting, support, and/or property." > an agreement
         <i class="fa fa-question-circle" aria-hidden="true"></i></span> that says you'll divide them differently.
     </p>
diff --git a/edivorce/apps/core/templates/question/12_uncategorized.html b/edivorce/apps/core/templates/question/12_uncategorized.html
index 630496ab..a8e81257 100644
--- a/edivorce/apps/core/templates/question/12_uncategorized.html
+++ b/edivorce/apps/core/templates/question/12_uncategorized.html
@@ -82,7 +82,7 @@
                 </label>
             </div>
         </div>
-        {% if responses.original_marriage_certificate == 'NO' %}
+        {% if original_marriage_certificate == 'NO' %}
         <div>
             <h3>Name of a person who was present at the marriage ceremony(show if no to provide marriage certificate</h3>
             <div>{% input_field type="text" name="form38_dummy_witness" class="form-block input-wide response-textbox" %}</div>
diff --git a/openshift/README.md b/openshift/README.md
index d9018d94..297df0af 100644
--- a/openshift/README.md
+++ b/openshift/README.md
@@ -53,7 +53,7 @@ There are several environments set up for different purposes within OpenShift. T
 
 # How to access Jenkins for eDivorce
 
-- Login to https://edivorce-jenkins-edivorce.pathfinder.gov.bc.ca with the username/password that was provided to you.
+- Login to https://edivorce-jenkins.pathfinder.gov.bc.ca with the username/password that was provided to you.
 
 # How to access OpenShift for eDivorce