Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions CLAUDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -174,12 +174,7 @@ When creating or editing documentation:
## Product names

- We should follow the product names as it appears on the website and in marketing materials
- Current names: Email Live Sending (can be shortened to Live Sending), Email Sandbox (can be shortened to Sandbox), Email Marketing (can be shortened to Marketing)
- Use one set in a sentence: "Email Live Sending, Email Sandbox, Email Marketing" or "Live Sending, Sandbox, Marketing". Do not mix them
- "Email API/SMTP", "API/SMTP", "Email API", "Email Sending" and "Sending" are old names of Email Live Sending. Replace them where they name the product
- Keep "API" and "SMTP" where they name a send method or protocol, for example "Email API or SMTP", "API/SMTP relay", "SMTP credentials" or "API token"
- In UI paths, use the label that the app shows: "Live Sending" in the main menu, "Email Live Sending" as the section title
- Keep the URLs and file paths that contain `email-api-smtp` or `api-smtp`
- Current names: Email API/SMTP (can be shortened to Email API or API/SMTP), Email Sandbox (can be shortened to Sandbox), Email Marketing (can be shortened to Marketing)

## Content guidelines

Expand Down
4 changes: 2 additions & 2 deletions api-docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ The API documentation is organized into the following sections:

{% columns %}
{% column width="33.33333333333333%" %}
**Email Live Sending**
**Email API/SMTP**

Endpoints to send transactional and [bulk](https://docs.mailtrap.io/email-api-smtp/setup/bulk-stream) (promotional) emails, as well as manage sending domains, suppressions, and delivery statistics.
{% endcolumn %}
Expand All @@ -29,7 +29,7 @@ Endpoints to send transactional and [bulk](https://docs.mailtrap.io/email-api-sm
**Email Sandbox**

Endpoints for testing and inspecting emails in a safe environment.\
**Note**: Email Live Sending and Email Sandbox use different base URLs.
**Note**: Email Sending and Email Sandbox use different base URLs.
{% endcolumn %}

{% column %}
Expand Down
2 changes: 1 addition & 1 deletion api-docs/SUMMARY.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* [Rate Limits](rate-limits.md)
* [OpenAPI Specs](openapi-specs.md)

## Email Live Sending <a href="#email-sending" id="email-sending"></a>
## Email Sending

* ```yaml
type: builtin:openapi
Expand Down
6 changes: 3 additions & 3 deletions documentation/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,15 @@ Use one of the official clients to set up Mailtrap and get started quickly.

Choose your product and get up and running quickly with our step-by-step guides.

<table data-view="cards"><thead><tr><th></th><th></th><th></th><th data-hidden data-card-target data-type="content-ref"></th><th data-hidden data-card-cover data-type="files"></th></tr></thead><tbody><tr><td><i class="fa-paper-plane">:paper-plane:</i> <strong>Email Live Sending</strong></td><td>Send Production Emails</td><td><em>Deliver transactional emails reliably with our API or SMTP service. Get detailed analytics and ensure high deliverability.</em></td><td><a href="getting-started/email-api-smtp.md">email-api-smtp.md</a></td><td></td></tr><tr><td><i class="fa-bug">:bug:</i> <strong>Email Sandbox</strong></td><td>Test Before Sending</td><td><em>Catch and inspect emails in a safe testing environment. Preview, analyze, and debug emails before they reach real inboxes.</em></td><td><a href="getting-started/email-sandbox.md">email-sandbox.md</a></td><td></td></tr><tr><td><i class="fa-cart-arrow-up">:cart-arrow-up:</i> <strong>Email Marketing</strong></td><td>Run Email Campaigns</td><td><em>Design, send, and track marketing campaigns. Manage subscribers and analyze campaign performance.</em></td><td><a href="getting-started/email-marketing.md">email-marketing.md</a></td><td></td></tr></tbody></table>
<table data-view="cards"><thead><tr><th></th><th></th><th></th><th data-hidden data-card-target data-type="content-ref"></th><th data-hidden data-card-cover data-type="files"></th></tr></thead><tbody><tr><td><i class="fa-paper-plane">:paper-plane:</i> <strong>Email API/SMTP</strong></td><td>Send Production Emails</td><td><em>Deliver transactional emails reliably with our API or SMTP service. Get detailed analytics and ensure high deliverability.</em></td><td><a href="getting-started/email-api-smtp.md">email-api-smtp.md</a></td><td></td></tr><tr><td><i class="fa-bug">:bug:</i> <strong>Email Sandbox</strong></td><td>Test Before Sending</td><td><em>Catch and inspect emails in a safe testing environment. Preview, analyze, and debug emails before they reach real inboxes.</em></td><td><a href="getting-started/email-sandbox.md">email-sandbox.md</a></td><td></td></tr><tr><td><i class="fa-cart-arrow-up">:cart-arrow-up:</i> <strong>Email Marketing</strong></td><td>Run Email Campaigns</td><td><em>Design, send, and track marketing campaigns. Manage subscribers and analyze campaign performance.</em></td><td><a href="getting-started/email-marketing.md">email-marketing.md</a></td><td></td></tr></tbody></table>

## Explore features

Discover the full range of features and capabilities across our email platform.

{% columns %}
{% column width="33%" %}
<i class="fa-paper-plane">:paper-plane:</i> **Email Live Sending**
<i class="fa-paper-plane">:paper-plane:</i> **Email API/SMTP**

* [API Integration](email-api-smtp/api-integration.md)
* [SMTP Integration](email-api-smtp/smtp-integration.md)
Expand Down Expand Up @@ -115,7 +115,7 @@ Migrating from another solution? Select your provider below and migrate easily:
## Ready to get started?

{% hint style="info" %}
**New to Mailtrap?** Start with our [Email Sandbox](getting-started/email-sandbox.md) to test your emails in a safe environment, then move to [Email Live Sending](getting-started/email-api-smtp.md) for production sending.
**New to Mailtrap?** Start with our [Email Sandbox](getting-started/email-sandbox.md) to test your emails in a safe environment, then move to [Email API/SMTP](getting-started/email-api-smtp.md) for production sending.
{% endhint %}

<table data-card-size="large" data-view="cards"><thead><tr><th></th><th></th><th></th><th data-hidden data-card-cover data-type="files"></th></tr></thead><tbody><tr><td><i class="fa-rocket-launch">:rocket-launch:</i> <strong>Start with a Free plan</strong></td><td><em>Get started with Mailtrap's free plan. No credit card required. Test emails, send up to 4000 emails/m, and explore all features.</em></td><td><a href="https://mailtrap.io/register/signup?utm_source=gitbook&#x26;utm_campaign=article" class="button secondary">Sing up free</a></td><td></td></tr><tr><td><i class="fa-message">:message:</i> <strong>Talk to Sales</strong></td><td><em>Need a custom plan or have enterprise requirements? Our team is ready to help you find the perfect solution.</em></td><td><a href="https://mailtrap.io/talk-to-sales/?utm_source=gitbook&#x26;utm_campaign=article" class="button secondary">Contact Sales</a></td><td></td></tr></tbody></table>
4 changes: 2 additions & 2 deletions documentation/SUMMARY.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

## Getting Started

* [Email Live Sending](getting-started/email-api-smtp.md)
* [Email API/SMTP](getting-started/email-api-smtp.md)
* [Email Sandbox](getting-started/email-sandbox.md)
* [Email Marketing](getting-started/email-marketing.md)

Expand All @@ -18,7 +18,7 @@
* [Prompts](for-ai-agents/tools/prompts.md)
* [AI inbox](for-ai-agents/tools/ai-inbox.md)

## Email Live Sending <a href="#email-api-smtp" id="email-api-smtp"></a>
## Email API/SMTP

* [Overview](email-api-smtp/overview.md)
* [Setup & Configuration](email-api-smtp/setup/README.md)
Expand Down
2 changes: 1 addition & 1 deletion documentation/account-and-organization/billing/edu.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ layout:
For the educational institutions that act without profit-making intentions, such as institutions of primary education, secondary education I / II, chairs at universities, public courses or public libraries, we offer the following benefits:

* **Email Sandbox** – Free access to the Team plan
* **Email Live Sending** – Free access to the Basic 10K plan
* **Email API / SMTP** – Free access to the Basic 10K plan
* **Discounted Billing** – All other paid plans are available at a 50% discount

To activate a non-profit plan, please email us at **support@mailtrap.io** with the following:
Expand Down
14 changes: 7 additions & 7 deletions documentation/account-and-organization/billing/faqs.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ icon: question

### How does Mailtrap pricing work?

We have separate subscription plans for our products: [Email Sandbox](https://mailtrap.io/email-sandbox/) and [Email Live Sending](https://mailtrap.io/email-sending/).
We have separate subscription plans for our products: [Email Sandbox](https://mailtrap.io/email-sandbox/) and [Email API/SMTP](https://mailtrap.io/email-sending/).

Both plans are based on the plans' limits. For example, Email Sandbox plans give you a certain amount of credits you can use for testing, whereas Email Live Sending plans give you monthly email sending limits along with a pre-set number of allowed contacts.
Both plans are based on the plans' limits. For example, Email Sandbox plans give you a certain amount of credits you can use for testing, whereas Email API/SMTP plans give you monthly email sending limits along with a pre-set number of allowed contacts.

### What happens if I hit the email limit in my plan?

When you exhaust your Email Live Sending plan's monthly sending volume, any additional emails you send are counted as overage and billed separately.
When you exhaust your Email API/SMTP plan's monthly sending volume, any additional emails you send are counted as overage and billed separately.

Overage lets you send a limited number of extra emails beyond your plan’s monthly sending limit, giving you extra flexibility. Each plan sets a maximum on these additional emails since it's not intended to be used as an extended allowance.

Expand Down Expand Up @@ -83,11 +83,11 @@ Additionally, you can get 20% off if you opt for an annual subscription.

### Do you offer educational discount?

Yes, we provide the Email Live Sending Basic 10K plan and Email Sandbox Team plan for free or 50% discount for other plans. For more details contact Support Team: <a href="mailto:support@mailtrap.io" class="button secondary" data-icon="envelope">Contact Support</a>
Yes, we provide the Email API/SMTP Basic 10K plan and Email Sandbox Team plan for free or 50% discount for other plans. For more details contact Support Team: <a href="mailto:support@mailtrap.io" class="button secondary" data-icon="envelope">Contact Support</a>

### Do you offer discounts for nonprofit open-source organizations?

Yes, we provide the Email Live Sending Basic 10K plan and Email Sandbox Team plan for free for nonprofit open-source organizations. Additionally, nonprofits can get any other plan at a 50% discount.
Yes, we provide the Email API/SMTP Basic 10K plan and Email Sandbox Team plan for free for nonprofit open-source organizations. Additionally, nonprofits can get any other plan at a 50% discount.

For us to activate a non-profit plan for you, please send us a document (a W-9 form or any other legal document) verifying you are a representative of a nonprofit open-source organization to support@mailtrap.io, and let us know what Mailtrap product you need to use.

Expand Down Expand Up @@ -168,9 +168,9 @@ You can get in touch with the Mailtrap Support team using one of the following w

### How can I cancel my subscription?

#### Email Live Sending
#### Email API/SMTP

Open Email Live Sending plans under Billing. Locate the Free plan and click Select.
Open Email API/SMTP plans under Billing. Locate the Free plan and click Select.

Your subscription will be switched to the free plan at the end of the billing cycle. Until then, you can keep the benefits of the current plan.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ icon: osi
We deeply appreciate the valuable work of non-profit organizations and open-source initiatives. To support your efforts, we offer the following benefits:

* **Email Sandbox** – Free access to the Team plan
* **Email Live Sending** – Free access to the Basic 10K plan
* **Email API / SMTP** – Free access to the Basic 10K plan
* **Email Marketing** - Free access to the Essential 10K plan
* **Discounted Billing** – All other paid plans are available at a 50% discount

Expand Down
Loading
Loading