Merge pull request #3930 from edx/markhoeber/documentation/doc-446

Studio Welcome, Sign Up, and Sign In pages Help and text fixes

cms/templates/howitworks.html

@@ -1,4 +1,5 @@
 <%inherit file="base.html" />
+<%def name="online_help_token()"><% return "welcome" %></%def>
 <%namespace name='static' file='static_content.html'/>
 <%!
   from django.core.urlresolvers import reverse
@@ -15,7 +16,7 @@
     <header>
       ## "edX Studio" should not be translated
       <h1><span class="wrapper-text-welcome">${_('Welcome to')}</span><span class="logo">edX Studio</span></h1>
-      <p class="tagline">${_("Studio helps manage your courses online, so you can focus on teaching them")}</p>
+      <p class="tagline">${_("Studio helps manage your online courses, so you can focus on teaching them")}</p>
     </header>
   </section>
 </div>
@@ -50,7 +51,7 @@
 
             <li class="proofpoint">
               <h4 class="title">${_("Change Your Mind Anytime")}</h4>
-              <p>${_("Draft your outline and build content anywhere. Simple drag and drop tools let your reorganize quickly.")}</p>
+              <p>${_("Draft your outline and build content anywhere. Simple drag and drop tools let you reorganize quickly.")}</p>
             </li>
 
             <li class="proofpoint">
@@ -74,12 +75,12 @@
 
         <div class="copy">
           <h3>${_("Learning is More than Just Lectures")}</h3>
-          <p>${_("Studio lets you weave your content together in a way that reinforces learning &mdash; short video lectures interleaved with exercises and more. Insert videos and author a wide variety of exercise types with just a few clicks.")} </p>
+          <p>${_("Studio lets you weave your content together in a way that reinforces learning. Insert videos, discussions, and a wide variety of exercises with just a few clicks.")} </p>
 
           <ul class="list-proofpoints">
             <li class="proofpoint">
               <h4 class="title">${_("Create Learning Pathways")}</h4>
-              <p>${_("Help your students understand a small interactive piece at a time with multimedia, HTML, and exercises.")}</p>
+              <p>${_("Help your students understand one concept at a time with multimedia, HTML, and exercises.")}</p>
             </li>
 
             <li class="proofpoint">
@@ -89,7 +90,7 @@
 
             <li class="proofpoint">
               <h4 class="title">${_("A Broad Library of Problem Types")}</h4>
-              <p>${_("It's more than just multiple choice. Studio has nearly a dozen types of problems to challenge your learners.")}</p>
+              <p>${_("It's more than just multiple choice. Studio supports more than a dozen types of problems to challenge your learners.")}</p>
             </li>
           </ul>
         </div>
@@ -113,7 +114,7 @@
           <ul class="list-proofpoints">
             <li class="proofpoint">
               <h4 class="title">${_("Instant Changes")}</h4>
-              <p>${_("Caught a bug? No problem. When you want, your changes to live when you hit Save.")}</p>
+              <p>${_("Caught a bug? No problem. When you want, your changes go live when you click Save.")}</p>
             </li>
 
             <li class="proofpoint">

cms/templates/login.html

@@ -1,4 +1,5 @@
 <%inherit file="base.html" />
+<%def name="online_help_token()"><% return "login" %></%def>
 <%!
 from django.core.urlresolvers import reverse
 from django.utils.translation import ugettext as _

cms/templates/register.html

@@ -1,5 +1,6 @@
 <%! from django.utils.translation import ugettext as _ %>
 <%inherit file="base.html" />
+<%def name="online_help_token()"><% return "register" %></%def>
 <%! from django.core.urlresolvers import reverse %>
 
 <%block name="title">${_("Sign Up")}</%block>

cms/templates/widgets/header.html

@@ -150,11 +150,8 @@
       <nav class="nav-not-signedin nav-pitch">
         <h2 class="sr">${_("You're not currently signed in")}</h2>
         <ol>
-          <li class="nav-item nav-not-signedin-hiw">
-            <a href="/">${_("How Studio Works")}</a>
-          </li>
           <li class="nav-item nav-not-signedin-help">
-            <a href="http://help.edge.edx.org/" rel="external">${_("Studio Help")}</a>
+            <a href="${get_online_help_info(online_help_token)['doc_url']}" title="${_("Contextual Online Help")}" target="${_("_blank")}">${_("Help")}</a>
           </li>
           <li class="nav-item nav-not-signedin-signup">
             <a class="action action-signup" href="${reverse('signup')}">${_("Sign Up")}</a>

docs/config.ini

@@ -30,6 +30,9 @@ advanced = index.html
 checklist = building_course/creating_new_course.html#use-the-course-checklist
 import = building_course/export_import_course.html#import-a-course
 export = building_course/export_import_course.html#export-a-course
+welcome = getting_started/get_started.html
+login = getting_started/get_started.html
+register = getting_started/get_started.html
 
 # below are the language directory names for the different locales
 [locales]