anchor.diff:  
   <%=vars.GSG_intro_sentence%>
   
  -This guide is intended to walk you through deploying a Ruby on Rails (RoR) app to <%=vars.product_full%>. You can choose whether to push a sample app, your own app, or both.
  -
  -If at any time you experience a problem following the steps below, try checking the <%=vars.known_issues%> topic, or refer to the [Troubleshooting Application Deployment and Health](./../../devguide/deploy-apps/troubleshoot-app-health.html) topic for more tips.
  -
  -
  -## <a id='deploy-yourapp'></a>Deploy Your RoR Application ##
  -
  -This section describes how to deploy your RoR application to <%=vars.product_short%>.
  -
  +This guide is intended to walk you through deploying a Ruby on Rails (RoR) app to <%=vars.product_full%>. If at any time you experience a problem following the steps below, check the <%=vars.known_issues%> topic, or refer to the [Troubleshooting Application Deployment and Health](./../../devguide/deploy-apps/troubleshoot-app-health.html) topic for more tips.
  +
  +
  +## <a id='deploy-yourapp'></a>Deploy a RoR Application ##
  +
  +This section describes how to deploy a RoR application to <%=vars.product_short%>, and uses output from a sample app to show specific steps of the deployment process. 
  +
  +<p class="tip"><strong>Sample App Step</strong><br />If you want to go through this tutorial using the sample app, run <code>git clone https://github.com/cloudfoundry-samples/rails_sample_app</code> to clone the <code>rails_sample_app</code> from GitHub, and follow the instructions in the Sample App Step boxes.</p>
  +	
   ### Prerequisites ###
   
  +* A Rails 4.x app that runs locally on your workstation
   * [Bundler](http://bundler.io) configured on your workstation
  -- (**Optional**) [Git](http://git-scm.com) configured on your workstation and a [GitHub](https://github.com) account
   * Intermediate to advanced RoR knowledge
  +* The [cf Command Line Interface (CLI)](../../devguide/installcf/install-go-cli.html)
   - (**Optional**) Robust production web server for Ruby and RoR apps, such as Unicorn
  -* Your Rails 4.x app that runs locally on your workstation
   
   ### Step 1: Add the rails_12factor Gem to Your Gemfile ###
   
  
positive.code: Example process type syntax:
      <pre class="code">
      PROCESS_TYPE: COMMAND
      </pre>
  
  To set a different production web server for your app:
  
  1. Add the gem for the web server to your Gemfile. 
  
  1. (**Optional**) In the `config/` directory of your app, create a new configuration file or modify an existing file.
  
      Refer to your web server documentation for how to configure this file.
  
  
negative.code: The example shows three of the available managed database-as-a-service providers and their offered plans: `cleardb` MySQL, `elephantsql` PostgreSQL as a Service, and `mongolab` MongoDB-as-a-Service.
  
  <pre class="terminal">
  $  cf marketplace
  Getting services from marketplace in org Cloud-Apps / space development as clouduser@example.com...
  OK
  
  service          plans 	description
  ...
  cleardb          spark, boost, amp, shock  	Highly available MySQL for your Apps
  ...
  elephantsql      turtle, panda, hippo, elephant   PostgreSQL as a Service
  ...
  