Skip to content
This repository has been archived by the owner on Aug 27, 2021. It is now read-only.

Commit

Permalink
Merge pull request #1818 from sendgrid/develop
Browse files Browse the repository at this point in the history
5/18/2016 Docs Updates
  • Loading branch information
eschallock committed May 18, 2016
2 parents c99e93c + 212d0b0 commit 3e0155f
Show file tree
Hide file tree
Showing 52 changed files with 560 additions and 141 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ <h3><a href="#Whitelist">Whitelist</a></h3>
{% endcodeblock %}

{% anchor h2 %}Categories{% endanchor %}

{% codeblock %}
"scopes": [
"categories.create",
Expand Down Expand Up @@ -186,6 +187,7 @@ <h3><a href="#Whitelist">Whitelist</a></h3>
{% endcodeblock %}

{% anchor h2 %}Marketing Campaigns{% endanchor %}

{% codeblock %}
"scopes": [
"marketing_campaigns.create",
Expand Down
3 changes: 2 additions & 1 deletion source/API_Reference/Web_API_v3/IP_Management/ip_warmup.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ An IP in warmup will always follow SendGrid’s Warmup Schedule. Please consider
{% anchor h2 %}
GET
{% endanchor %}
Get all IPs that are currently warming up.

Get all IPs that are currently warming up. The value returned for "start_date" represents the date that the IP was entered into warmup, and is always formatted as a Unix timestamp.

{% apiv3example get-all GET https://api.sendgrid.com/v3/ips/warmup %}
{% v3response %}
Expand Down
4 changes: 2 additions & 2 deletions source/API_Reference/Web_API_v3/Mail/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,10 @@
{% api_table_param substitutions "object" No "" "An object following the pattern &#34;substitution_tag&#34;:&#34;value to substitute&#34;. All are assumed to be strings. These substitutions will apply to the content of your email, in addition to the <code>subject</code> and <code>reply-to</code> parameters." 1 %}
{% api_table_param custom_args "object" No "May not exceed 10,000 bytes" "These are values that are specific to this personalization that will be carried along with the email, activity data, and links. Substitutions will not be made on custom arguments. <code>personalizations[x].custom_args</code> will be merged with message level <code>custom_args</code>, overriding any conflicting keys. The combined total size of the resulting custom arguments, after merging, for each personalization may not exceed 10,000 bytes." 1 %}
{% api_table_param send_at integer No "" "A unix timestamp allowing you to specify when you want your email to be sent from SendGrid. <b>This is not necessary if you want the email to be sent at the time of your API request.</b>" 1 %}
{% api_table_param from "array of email objects" No "" "An email object containing the email address and name of the sender." 0 %}
{% api_table_param from "object" No "" "An email object containing the email address and name of the sender." 0 %}
{% api_table_param email string Yes "" "The email address of the sender." 1 %}
{% api_table_param name string No "" "The name of the sender." 1 %}
{% api_table_param reply_to "array of email objects" No "" "An email object containing the email address and name of the individual who should receive responses to your email." 0 %}
{% api_table_param reply_to "object" No "" "An email object containing the email address and name of the individual who should receive responses to your email." 0 %}
{% api_table_param email string Yes "" "The email address to which responses will be sent." 1 %}
{% api_table_param name string No "" "The name of the individual who will receive responses to the email." 1 %}
{% api_table_param subject string Yes "" "The subject of your email. This may be overridden by <code>personalizations[x].subject</code>." 0 %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -751,7 +751,7 @@ Segments may contain multiple condtions, joined by an "and" or "or" in the "and_

+ Body

{"name":"The Millers","list_id":5,"conditions":[{"field":"last_name", "value":"Miller", "operator":"eq", "and_or":""}]}
{"name":"The Millers","conditions":[{"field":"last_name", "value":"Miller", "operator":"eq", "and_or":""}]}

+ Response 200

Expand Down
24 changes: 23 additions & 1 deletion source/API_Reference/Web_API_v3/Settings/mail.apiblueprint
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,28 @@ seo:
keywords: mail settings, address whitelisting, bcc settings, bounce purge settings, event notification settings, footer settings, forward bounce settings, forward spam settings, legacy template settings
---

<ul>
<li><a href="{{root_url}}/API_Reference/Web_API_v3/Settings/mail.html#Get-Mail-Settings-GET">Get Mail Settings - GET</a></li>
<li><a href="{{root_url}}/API_Reference/Web_API_v3/Settings/mail.html#Get-BCC-Settings-GET">Get BCC Settings - GET</a></li>
<li><a href="{{root_url}}/API_Reference/Web_API_v3/Settings/mail.html#Update-BCC-Settings-PATCH">Update BCC Settings - PATCH</a></li>
<li><a href="{{root_url}}/API_Reference/Web_API_v3/Settings/mail.html#Get-Address-Whitelist-Settings-GET">Get Address Whitelist Settings - GET</a></li>
<li><a href="{{root_url}}/API_Reference/Web_API_v3/Settings/mail.html#Update-Address-Whitelist-Settings-PATCH">Update Address Whitelist Settings - PATCH</a></li>
<li><a href="{{root_url}}/API_Reference/Web_API_v3/Settings/mail.html#Get-Footer-Settings-GET">Get Footer Settings - GET</a></li>
<li><a href="{{root_url}}/API_Reference/Web_API_v3/Settings/mail.html#Update-Footer-Settings-PATCH">Update Footer Settings - PATCH</a></li>
<li><a href="{{root_url}}/API_Reference/Web_API_v3/Settings/mail.html#Get-Forward-Spam-Settings-GET">Get Forward Spam Settings - GET</a></li>
<li><a href="{{root_url}}/API_Reference/Web_API_v3/Settings/mail.html#Update-Forward-Spam-Settings-PATCH">Update Forward Spam Settings - PATCH</a></li>
<li><a href="{{root_url}}/API_Reference/Web_API_v3/Settings/mail.html#Get-Plain-Content-Settings-GET">Get Plain Content Settings - GET</a></li>
<li><a href="{{root_url}}/API_Reference/Web_API_v3/Settings/mail.html#Update-Plain-Text-Content-PATCH">Update Plain Text Content - PATCH</a></li>
<li><a href="{{root_url}}/API_Reference/Web_API_v3/Settings/mail.html#Get-Spam-Check-Settings-GET">Get Spam Check Settings - GET</a></li>
<li><a href="{{root_url}}/API_Reference/Web_API_v3/Settings/mail.html#Update-Spam-Check-Settings-PATCH">Update Spam Check Settings - PATCH</a></li>
<li><a href="{{root_url}}/API_Reference/Web_API_v3/Settings/mail.html#Get-Template-Settings-GET">Get Template Settings - GET</a></li>
<li><a href="{{root_url}}/API_Reference/Web_API_v3/Settings/mail.html#Update-Template-Settings-PATCH">Update Template Settings - PATCH</a></li>
<li><a href="{{root_url}}/API_Reference/Web_API_v3/Settings/mail.html#Get-Bounce-Purge-Settings-GET">Get Bounce Purge Settings - GET</a></li>
<li><a href="{{root_url}}/API_Reference/Web_API_v3/Settings/mail.html#Update-Bounce-Purge-Settings-PATCH">Update Bounce Purge Settings [PATCH]</a></li>
<li><a href="{{root_url}}/API_Reference/Web_API_v3/Settings/mail.html#Get-Forward-Bounce-Settings-GET">Get Forward Bounce Settings - GET</a></li>
<li><a href="{{root_url}}/API_Reference/Web_API_v3/Settings/mail.html#Update-Forward-Bounce-Settings-PATCH">Update Forward Bounce Settings - PATCH</a></li>
</ul>

FORMAT: 1A

# Mail Settings
Expand Down Expand Up @@ -187,7 +209,7 @@ The following settings can also be used when sending mail via the [Web API v3 Ma
"enabled": true
}

### Plain Text Content [PATCH]
### Update Plain Text Content [PATCH]

+ Request (application/json)

Expand Down
179 changes: 146 additions & 33 deletions source/API_Reference/Web_API_v3/user.apiblueprint
Original file line number Diff line number Diff line change
Expand Up @@ -4,71 +4,184 @@ weight: 100
title: Users API
seo:
description: View and Manage your user profile via the SendGrid v3 API
title: User API
title: Users API
navigation:
show: true
---
FORMAT: 1A

# Users

## User Profile [/user/profile]

### GET User Profile [GET]
Retrieve your current user profile details.

+ Response 200 (application/json)

+ Body

{
"address":"814 West Chapman Avenue",
"city":"Orange",
"company":"SendGrid",
"country":"US",
"first_name":"Test",
"last_name":"User",
"phone":"555-555-5555",
"state":"CA",
"website":"http://www.sendgrid.com",
"zip":"92868"
}
{
"address":"814 West Chapman Avenue",
"city":"Orange",
"company":"SendGrid",
"country":"US",
"first_name":"Test",
"last_name":"User",
"phone":"555-555-5555",
"state":"CA",
"website":"http://www.sendgrid.com",
"zip":"92868"
}

### PATCH User Profile [PATCH]
Update your user profile.

+ Request (application/json)

+ Body

{
"city": "Orange"
}
{
"city": "Orange"
}

+ Response 200 (application/json)

+ Body

{
"address":"814 West Chapman Avenue",
"city":"Orange",
"company":"SendGrid",
"country":"US",
"first_name":"Test",
"last_name":"User",
"phone":"555-555-5555",
"state":"CA",
"website":"http://www.sendgrid.com",
"zip":"92868"
}
{
"address":"814 West Chapman Avenue",
"city":"Orange",
"company":"SendGrid",
"country":"US",
"first_name":"Test",
"last_name":"User",
"phone":"555-555-5555",
"state":"CA",
"website":"http://www.sendgrid.com",
"zip":"92868"
}

## User Account [/user/account]

### GET User Account [GET]
Retrieve your user account details.

+ Response 200 (application/json)

+ Body

{
"type": "free",
"reputation": 99.7
}


## User Email [/user/email]

### GET User Email [GET]
Retrieve the email address on file for your account.

+ Response 200 (application/json)

+ Body

{
"email": "[email protected]"
}


### PUT User Email [PUT]
Update the email address on file for your account.

+ Request (application/json)

+ Body

{
"email": "[email protected]"
}

+ Response 200 (application/json)

+ Body

{
"email": "[email protected]"
}

## User Username [/user/username]

### GET User Username [GET]
Retrieve your account username.

+ Response 200 (application/json)

+ Body

{
"username": "test_username",
"user_id": 1
}


### PUT User Username [PUT]
Update your account username.

+ Request (application/json)

+ Body

{
"username": "test_username"
}


+ Response 200 (application/json)

+ Body

{
"username": "test_username"
}


## User Credits [/user/credits]

### GET User Credits [GET]
Retrieve the current credit balance for your account.

+ Response 200 (application/json)

+ Body

{
"remain": 200,
"total": 200,
"overage": 0,
"used": 0,
"last_reset": "2013-01-01",
"next_reset": "2013-02-01",
"reset_frequency": "monthly"
}

## User Password [/user/password]

### PUT User Password [PUT]
Update the password for your account.

+ Request (application/json)

+ Body

{
"new_password": "new_password",
"old_password": "old_password"
}


+ Response 200 (application/json)

+ Body

{
"type": "free",
"reputation": 99.7

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
---
st:
published_at: 2016-05-17
type: Utilities
seo:
title: Why can’t I reset my password if my account is not provisioned?
description: Why can’t I reset my password if my account is not provisioned?
keywords: log, don't, username, user, in, name, api_user, ID, forgot, know, my
title: Why can’t I reset my password if my account is not provisioned?
weight: 0
layout: page
navigation:
show: true
---

You will not be able to reset the password for an account where your email address has [not yet been confirmed]({{root_url}}/Classroom/Troubleshooting/Account_Administration/cant_log_in_to_your_account.html). However, you will also not be able confirm your email address and activate the account without knowing your account’s username and the password. So how do you move forward?

As it turns out, the only option would be to [create another account](https://sendgrid.com/pricing). Once the new account is created, please [reach out to support](http://support.sendgrid.com) and let us know what the new username is and what happened, so we can expedite the provisioning process for you. We can then make sure you are not turned down due to signing up for multiple accounts with the same information. Remember, you are only charged for paid accounts after you are sucessfully provisioned, so there is no need to worry when creating a new paid account to get around this scenario.
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
---
st:
published_at: 2016-05-16
type: Classroom
seo:
title: What is Automated Security in the Whitelabel settings?
description: What is Automated Security in the Whitelabel settings?
keywords: automated, security, spf, whitelabel, domain, dkim
title: What is Automated Security in the Whitelabel settings?
weight: 0
layout: page
zendesk_id: 202517236
navigation:
show: true
---

#Automated Security

![]({{root_url}}/images/automate_security_on.png)

By enabling Automatic Security on your [domain whitelabels]({{root_url}}/User_Guide/Settings/Whitelabel/domains.html), SendGrid can manage your [DKIM]({{root_url}}/Glossary/dkim.html) and [SPF]({{root_url}}/Glossary/spf.html) records for you.

Setting up three custom [CNAME records]({{root_url}}/Glossary/cname.html) displayed during whitelabel setup will allow SendGrid to rotate between custom DKIM keys periodically without requiring you to make additional updates to [DNS]({{root_url}}/Glossary/dns.html). We will also generate a custom SPF that includes only the IPs that you'll be sending from (as opposed to ~all sendgrid.net).

To clarify, you will still need to create some DNS records initially to allow us to take over this process. The DNS records you'll need to create will depend on whether you chose automated or manual security, the IP addresses on your account, and the domain you are whitelabeling.



#Manual Security

![]({{root_url}}/images/automated_security_off.png)

If you choose not to have SendGrid manage your DNS records for DKIM, then you’ll be shown all of the manual DNS records that you need to enter at your registrar or host. You will be responsible for making any updates to your DNS for any changes on your account when selecting this options.

The records you are given will be MX, DKIM, and SPF records to enter at your registrar, hosting company, or DNS manager. This will also mean that your SPF record will include all of SendGrid’s IP addresses.

For more information about whitelabeling, please read [All You Need to Know About Whitelabeling]({{root_url}}/Classroom/Deliver/Delivery_Introduction/all_you_need_to_know_about_whitelabeling.html), or visit our [User Guide]({{root_url}}/User_Guide/Settings/Whitelabel/index.html).

1 change: 1 addition & 0 deletions source/Classroom/Send/v3_Mail_Send/personalizations.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ When sending email via the v3 Mail Send endpoint, the various metadata about the
Think of the personalizations section of the request body like the envelope of a letter: the fields defined within personalizations apply to each individual email, not the recipient. Like an envelope, personalizations are used to identify who should receive the email as well as specifics about how you would like the email to be handled. For example, you can define when you would like it to be sent, what headers you would like to include, and any substitutions or custom arguments you would like to be included with the email.

`personalizations` allow you to define:

* "to", "cc", "bcc" - The recipients of your email.
* "subject" - The subject of your email.
* "headers" - Any headers you would like to include in your email.
Expand Down

This file was deleted.

1 change: 0 additions & 1 deletion source/Classroom/Track/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ <h2><a href="#Tracking-Unsubscribes">Tracking Unsubscribes</a></h2>
<div class="col-md-12">
{% anchor h2 %}Introduction to Tracking{% endanchor %}
<ul>
<li><a href="{{root_url}}Introduction/what_do_all_these_delivery_statistics_mean.html">What do all these delivery statistics mean?</a></li>
<li><a href="{{root_url}}Introduction/how_can_i_tell_if_an_email_was_actually_delivered.html">How can I tell if an email was actually delivered?</a></li>
<li><a href="{{root_url}}Introduction/discrepancies_between_requests_and_deliveries.html">Discrepancies Between Requests and Deliveries</a></li>
</ul>
Expand Down
Loading

0 comments on commit 3e0155f

Please sign in to comment.