anchor.diff:  
       </pre>
   
  -<<<<<<< HEAD
  +
   For information on how to configure a manifest file, refer to [Step 4: Configure the Manifest File](#yourapp-step4). 
   
   ### <a id='yourapp-step3'></a>Step 3: Create and Bind a Service Instance for Your RoR Application ###
  -=======
  -### Step 3: Configure a Service Instance for Your RoR Application ###
  ->>>>>>> 0869bc7ecb81ae7f2a5880c4e6edf01e15005375
   
   This section describes using the CLI to configure a PostgreSQL managed service instance for your app. <%=vars.dev_console_1%>
   
   <%=vars.product_short%> supports two types of service instances:
   
  -<<<<<<< HEAD
   * Managed services integrate with <%=vars.product_short%> through service brokers that offer services and plans and manage the service calls between <%=vars.product_short%> and a service provider. 
   * User-provided service instances enable you to connect your application to pre-provisioned external service instances.
   
  
positive.code: When you bind an app to a service instance, <%=vars.product_short%> writes information about the service instance to the VCAP_SERVICES app environment variable. The app can use this information to integrate with the service instance.
  
  Most services support bindable service instances. Refer to your service provider's documentation to confirm if they support this functionality.
  
  ### Step 4: Configure the Manifest File  ###
  
  You can specify deployment options in a manifest that the `cf push` command uses.
  
  For example, this section describes how to configure the manifest to bind the service that you created in the previous step. For more information about application manifests and supported attributes, refer to the [Deploying with Application Manifests](./../../devguide/deploy-apps/manifest.html) topic.
  
  You can bind a service to an application with the command `cf bind-service APPLICATION SERVICE_INSTANCE`.
  
  
negative.code: #### Create a Service Instance ####
  
  Run `cf marketplace` to view managed and user-provided services and plans available to you. 
  
  * Managed services integrate with <%=vars.product_short%> through service brokers that offer services and plans and manage the service calls between <%=vars.product_short%> and a service provider.
  * User-provided service instances enable you to bind your application to pre-provisioned external service instances.
  
  For more information on creating and using service instances, refer to the [Services Overview](./../../devguide/services/index.html) topic.
  
  Run `cf marketplace` to view managed and user-provided services and plans available to you.
  
  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.
  
  