Skip to content

Commit 9fd3de2

Browse files
authored
Merge branch 'master' into update/subprocessors
2 parents 5cb8b8d + 4e0bcd7 commit 9fd3de2

File tree

13 files changed

+3001
-872
lines changed

13 files changed

+3001
-872
lines changed

src/_includes/content/integration-foot.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ To learn more about about Connection Modes and what dictates which we support, [
3333

3434
{% if currentIntegration.platforms.mobile == true %}
3535
{% if currentIntegration.platforms.server == true %}
36-
Segment offers an *optional* **Device-based** Connection Mode for **Mobile** data with {{ currentIntegration.display_name }}. If you'd like to use those features that require client-based functionality, follow the steps above to ensure you have packaged the {{ currentIntegration.display_name }} SDK with Segment's.
36+
Segment offers an *optional* **Device-based** Connection Mode for **Mobile** data with {{ currentIntegration.display_name }}. If you'd like to use those features that require client-based functionality, follow the steps above to ensure you have packaged the {{ currentIntegration.display_name }} SDK with Segment's.
3737
{% else %}
38-
This destination *requires* a **Device-based** Connection Mode for **Mobile** data. Follow the steps above to ensure you have packaged the {{ currentIntegration.display_name }} SDK with Segment's.
38+
This destination *requires* a **Device-based** Connection Mode for **Mobile** data. Follow the steps above to ensure you have packaged the {{ currentIntegration.display_name }} SDK with Segment's.
3939
{% endif %}
4040
{% endif %}
4141
{% endunless %}

src/guides/filtering-data.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ Schema defaults allow you to prevent unexpected or malformed data from a Source
7070

7171
Data blocked using schema defaults is permanently discarded, and cannot be recovered or replayed through Segment. You can forward blocked data to a new Source, but these events count toward your account MTU limits, and may not be worth saving.
7272

73-
Schema Defaults are available to all customers, regardless of Segment plan.
73+
Schema Defaults are only available to Business Tier customers.
7474

7575
You can find the Schema Defaults in the **Settings** tab for each Source, in **Schema Configuration** section.
7676

src/legal/index.md

Lines changed: 976 additions & 210 deletions
Large diffs are not rendered by default.

src/legal/premium-tos-2019.md

Lines changed: 661 additions & 0 deletions
Large diffs are not rendered by default.

src/legal/premium-tos-updates.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
title: Segment Premium Online Terms of Service Updates
3+
hide-feedback: true
4+
hidden: true
5+
---
6+
7+
This page provides an archive of previous versions of the Segment Premium Online Terms of Service. If you have any questions, please contact the [Segment Legal team](mailto:[email protected]).
8+
9+
- [December 19, 2019 - present](/docs/legal/premium-tos/)
10+
- [June 22, 2019 - December 18, 2019.](/docs/legal/premium-tos-2019)

src/legal/premium-tos.md

Lines changed: 1063 additions & 641 deletions
Large diffs are not rendered by default.

src/legal/privacy-04-2018.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
---
22
title: Privacy Policy
33
hidden: true
4-
feedback: false
54
hide-feedback: true
65
---
76

8-
[email]: mailto:[email protected]
7+
This page provides an archive of a previous version of the Segment Privacy Policy. If you have any questions, please contact the [Segment Legal team](mailto:[email protected]).
98

109
> Archived version: Last modified April 30th, 2018.
10+
> Effective April 30th, 2018 to July 17th, 2018.
11+
12+
[Prior versions available here](/docs/legal/privacy-updates/)
13+
14+
---
1115

1216
<br />
1317

src/legal/privacy-2017.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
---
22
title: Privacy Policy - 2016
33
hidden: true
4-
feedback: false
54
hide-feedback: true
65
---
76

8-
[email]: mailto:[email protected]
7+
This page provides an archive of a previous version of the Segment Privacy Policy. If you have any questions, please contact the [Segment Legal team](mailto:[email protected]).
98

109
> Archived version: Last modified on January 16, 2016
10+
> Effective January 16, 2016 to April 29, 2018
11+
12+
[Prior versions available here](/docs/legal/privacy-updates/)
13+
---
1114

1215
Segment commits to strong, secure and transparent privacy practices.
1316
Our Privacy Policy explains:

src/legal/privacy-updates.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
22
title: Updates - Privacy Policy
3-
feedback: false
43
hide-feedback: true
4+
hidden: true
55
---
66

7-
[email]: mailto:[email protected]
7+
This page provides an archive of previous versions of the Segment Privacy Policy. If you have any questions, please contact the [Segment Legal team](mailto:[email protected]).
88

9-
- [July 18, 2018](/docs/legal/privacy)
10-
- [April 30, 2018](/docs/legal/privacy-04-2018)
11-
- [January 16, 2016](/docs/legal/privacy-2017)
9+
- [July 18, 2018 - present](/docs/legal/privacy)
10+
- [April 30, 2018 - July 17th, 2018](/docs/legal/privacy-04-2018)
11+
- [January 16, 2016 - April 29, 2018](/docs/legal/privacy-2017)

src/legal/terms-2016.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,14 @@ feedback: false
55
hide-feedback: true
66
---
77

8-
[email]: mailto:[email protected]
9-
[pricing]: https://segment.com/pricing
8+
This page provides an archive of a previous version of the Segment Terms of Service. If you have any questions, please contact the [Segment Legal team](mailto:[email protected]).
109

1110
> Archived version: Last modified on October 20, 2016
11+
> Effective October 20, 2016 to October 24, 2017.
12+
13+
[Prior versions available here](/docs/legal/terms-updates/)
14+
15+
---
1216

1317
<small>
1418
PLEASE READ THESE TERMS OF SERVICE CAREFULLY. THESE TERMS OF SERVICE CONTAIN IMPORTANT INFORMATION REGARDING YOUR LEGAL RIGHTS, REMEDIES AND OBLIGATIONS. THESE INCLUDE LIMITATIONS ON LIABILITY AND A DISCLAIMER OF ALL WARRANTIES.

0 commit comments

Comments
 (0)