Merge pull request #1830 from sendgrid/develop

New pages, updates to API

Author: Matt Bernier

source/API_Reference/Web_API_v3/Marketing_Campaigns/contactdb.apiblueprint

@@ -405,6 +405,7 @@ The rate at which recipients may be added to a list is limited to 1 request per
     + Body
 
             "list_id": "Returned if list_id does not exist"
+            "errors": "Returned with message `No more pages` when at the end of the list"
 
 # Group Recipients
 
@@ -512,6 +513,12 @@ the list of recipients. To avoid this issue; iterate over pages until a 404 is r
             "page_size" : "Returned if page_size is not a valid integer"
             "page_size" : "Returned if page_size is less than 1 or greater than 1000"
 
++ Response 404
+
+     + Body
+
+            "errors": "Returned with message `No more pages` when at the end of the list"
+
 ## Recipients [/contactdb/recipients/{recipient_id}]
 
 + Parameters
@@ -614,7 +621,7 @@ the list of recipients. To avoid this issue; iterate over pages until a 404 is r
 
             {"recipient_count": 2}
 
-## Recipients Search [/contactdb/recipients/search/?{field_name}=bob]
+## Recipients Search [/contactdb/recipients/search?{field_name}=bob]
 
 {% info %}
 "field_name"* is a variable that is substituted for your actual custom field name from your recipient.
@@ -661,7 +668,11 @@ Mon, 02 Feb 2015 23:59:59 GMT.
             "" : "Returned if no search params are specified"
             "field" : "Returned if the provided field is invalid or does not exist"
 
++ Response 404
+
+     + Body
 
+            "errors": "Returned with message `No more pages` when at the end of the list"
 
 # Group Segments
 
@@ -744,6 +755,7 @@ Segments may contain multiple condtions, joined by an "and" or "or" in the "and_
      + Body
 
             "segment_id" : "Returned if segment_id does not exist"
+            "errors" : "Returned with message `No more pages` when at the end of the list"
 
 ### Update a Segment [PATCH]
 

source/Classroom/Basics/Billing/alternate_payment_methods.md

@@ -2,7 +2,7 @@
 seo:
   title: Alternate Payment Methods?
   description: Alternate Payment Methods?
-  keywords: payment, pay, alternate, other, money, order, cash, with, invoicing, quarterly, check
+  keywords: payment, pay, alternate, other, money, order, cash, with, invoicing, quarterly, check, annual, ahead, lump
 title: Alternate Payment Methods?
 weight: 0
 layout: page
@@ -11,7 +11,7 @@ navigation:
   show: true
 ---
 
-Currently the only methods of payment we accept are  **credit or check cards**.
+Currently the only methods of payment we accept are  **credit or check cards**. We also charge accounts on a **monthly basis**, we do not offer pre-payment, quartely billing, or annual billing at this time.
 
 We don't accept PayPal, wire transfer, checks, or any card requiring a PIN.  
 Sorry for any inconvenience this may cause!

source/Classroom/Basics/Billing/billing_info_and_faqs.md

@@ -45,14 +45,14 @@ Glad you asked! [Read more about it here]({{root_url}}/Classroom/Basics/Billing/
 
 **I received a Payment Failed message.**
 
-If you receive a _Payment Failed_ message, you can [update your credit card here]({{root_url}}/Classroom/Basics/Billing/update_your_credit_card_and_resubmit_payments.html). You can update the expiration date on an existing card or enter a new card. Also, if you now have sufficient funds on your current card, you can retry an outstanding charge.
+If you receive a _Payment Failed_ message, you can [update your credit card here]({{root_url}}/Classroom/Basics/Billing/update_your_credit_card_and_resubmit_payments.html). You can update the expiration date on an existing card or enter a new card(please re-add the card information to update the expiry date). Also, if you now have sufficient funds on your current card, you can retry an outstanding charge.
 
 
 **How do overages work?**
 
 Depending on your package, you will be charged a small amount per-email for each email that you send beyond the credit limit of your current package. Any overage charges are added to the invoice of the month _after_ the over-limit sending occurred.
 
-Note: Upgrading your account does NOT absorb overage charges already incurred, so make sure you are using the right package for your usage case.
+**Note: Upgrading your account does NOT absorb overage charges already incurred, so make sure you are using the right package for your usage case.**
 
 ![]({{root_url}}/images/pricing_grid.png)
 

source/Classroom/Basics/Misc/support.md

@@ -0,0 +1,31 @@
+---
+seo:
+  title: How to contact SendGrid Support
+  description: SendGrid support contact information
+  keywords: SendGrid support, support contact, sendgrid support chat, sendgrid support phone number
+title: How to contact SendGrid support
+weight: 0
+layout: page
+navigation:
+  show: true
+---
+
+<div class="row">
+  <div class="col-md-4"></div>
+  <div class="col-md-4">
+    <a href="https://support.sendgrid.com/" class="btn btn-large btn-primary center-block">Contact Support</a>
+  </div>
+  <div class="col-md-4"></div>
+</div>
+
+You can contact SendGrid support from the [SendGrid Support Portal](https://support.sendgrid.com).
+
+Paying SendGrid customers have the option to contact support via phone, chat, or by submitting a ticket using our web form.
+
+{% anchor h2 %}
+Support Hours
+{% endanchor %}
+
+* Ticket support - 24/7
+* Chat support - 24/7
+* Phone support is available 7:00AM - 5:00PM MST, Monday - Friday.

source/User_Guide/Marketing_Campaigns/contacts.md

@@ -168,6 +168,16 @@ the same row. You will also see an option to delete the contact, which deletes t
 
 ![]({{root_url}}/images/contacts_4.png "Delete a contact")
 
+{% anchor h3 %}
+Delete All Contacts
+{% endanchor %}
+
+If you would like to delete all of your contacts at once, navigate to your [Contacts page](https://sendgrid.com/marketing_campaigns/contacts) and click on the Action Cog next to All Contacts. Select Delete All Contacts.
+
+This will delete all of your Marketing Campaigns contacts, without deactivating your account.
+
+![]({{root_url}}/images/delete_all_contacts.png)
+
 
 {% anchor h2 %}
 Troubleshooting Contacts Upload

source/_assets/stylesheets/components/buttons.less

@@ -1,6 +1,6 @@
 .btn {
 	font-size: @font-size-small;
-	padding: 11px 45px;
+	padding: @scaledown-1 @scaleup-5;
 }
 
 .btn-primary, .btn-default, .btn-success {
@@ -33,5 +33,9 @@
 
 .btn-small {
 	font-size: @font-size-small;
-	padding: 11px 20px;
-}
+	padding: @scaledown-2 @scaleup-1;
+}
+
+.btn-large {
+	font-size: @font-size-base;
+}

source/_assets/stylesheets/components/footer.less

@@ -1,8 +1,8 @@
 .page-footer {
   background-color: @slate;
   color: @white-80;
-  padding-top: @scale-0;
-  padding-bottom: @scale-0;
+  padding-top: @scaleup-3;
+  padding-bottom: @scaleup-3;
   span:not(:last-child) {
     margin-right: @scaledown-2;
   }

source/_includes/google_analytics.html

@@ -1,3 +1,7 @@
+<!-- Optimizely -->
+<script src="//cdn.optimizely.com/js/72168671.js"></script>
+<!-- End Optimizely -->
+
 <!-- Google Tag Manager -->
 <noscript><iframe src="//www.googletagmanager.com/ns.html?id=GTM-PQC59L"
 height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>