diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 8bfffa19259..72424f33dbb 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -19,4 +19,4 @@ assignees: '' #### Actual behavior: -If you would like immediate help on this, please email support@sourcegraph.com (you can still create the issue, but there are no [SLAs](https://about.sourcegraph.com/support/) on issues like there are for support requests). +If you would like immediate help on this, please email support@sourcegraph.com (you can still create the issue, but there are no [SLAs](https://sourcegraph.com/support/) on issues like there are for support requests). diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md index 01fc24d524b..3d7dc78dfd9 100644 --- a/.github/ISSUE_TEMPLATE/question.md +++ b/.github/ISSUE_TEMPLATE/question.md @@ -19,4 +19,4 @@ assignees: '' -If you would like immediate help on this, please email support@sourcegraph.com (you can still create the issue, but there are no [SLAs](https://about.sourcegraph.com/support/) on issues like there are for support requests). +If you would like immediate help on this, please email support@sourcegraph.com (you can still create the issue, but there are no [SLAs](https://sourcegraph.com/support/) on issues like there are for support requests). diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9dd61c27544..673c3422189 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -8,7 +8,7 @@ In short, we are open to nearly all contributions! We love feedback in all forms Unless you feel confident your change will be accepted (trivial bug fixes, code cleanup, etc) you should first create an issue or a [Sourcegraph RFC](https://handbook.sourcegraph.com/communication/rfcs#external-contributors) (preferred for bigger changes) to discuss your change with us. This lets us all discuss the design and proposed implementation of your change, which helps ensure your time is well spent and that your contribution will be accepted. -> Exception: If you contribute functionality that already exists as a [paid Sourcegraph feature](https://about.sourcegraph.com/pricing/), we are unlikely to accept it. Consult us beforehand for a definitive answer. (We'll add more details about the process here, and they'll be similar to [GitLab's stewardship principles](https://about.gitlab.com/stewardship/#contributing-an-existing-ee-feature-to-ce).) +> Exception: If you contribute functionality that already exists as a [paid Sourcegraph feature](https://sourcegraph.com/pricing/), we are unlikely to accept it. Consult us beforehand for a definitive answer. (We'll add more details about the process here, and they'll be similar to [GitLab's stewardship principles](https://about.gitlab.com/stewardship/#contributing-an-existing-ee-feature-to-ce).) ## Code of Conduct diff --git a/LICENSE.enterprise b/LICENSE.enterprise index 265dd57b7d0..09b62c838e9 100644 --- a/LICENSE.enterprise +++ b/LICENSE.enterprise @@ -6,7 +6,7 @@ With regard to the Sourcegraph Software: This software and associated documentation files (the "Software") may only be used in production, if you (and any entity that you represent) have agreed to, and are in compliance with, the Sourcegraph Terms of Service, available -at https://about.sourcegraph.com/terms (the “Enterprise Terms”), or other +at https://sourcegraph.com/terms (the “Enterprise Terms”), or other agreement governing the use of the Software, as agreed by you and Sourcegraph, and otherwise have a valid Sourcegraph Enterprise subscription for the correct number of user seats. Subject to the foregoing sentence, you are free to diff --git a/README.md b/README.md index 5f1e08f27f0..a60186da3f4 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@

- + @@ -43,7 +43,7 @@

- + ## Development diff --git a/client/branded/src/search-ui/input/SearchContextMenu.tsx b/client/branded/src/search-ui/input/SearchContextMenu.tsx index c792365ba6e..808976c7267 100644 --- a/client/branded/src/search-ui/input/SearchContextMenu.tsx +++ b/client/branded/src/search-ui/input/SearchContextMenu.tsx @@ -256,7 +256,7 @@ export const SearchContextMenu: FC = props => { To search across your team's private repositories,{' '} telemetryService.log('ClickedOnEnterpriseCTA', { location: 'ContextDropDown', diff --git a/client/browser/src/browser-extension/scripts/backgroundPage.main.ts b/client/browser/src/browser-extension/scripts/backgroundPage.main.ts index 337ab573bad..c37a379b52e 100644 --- a/client/browser/src/browser-extension/scripts/backgroundPage.main.ts +++ b/client/browser/src/browser-extension/scripts/backgroundPage.main.ts @@ -275,7 +275,7 @@ async function main(): Promise { await browser.runtime.setUninstallURL( createURLWithUTM( - new URL('https://about.sourcegraph.com/uninstall'), + new URL('https://sourcegraph.com/uninstall'), IsProductionVersion ? { utm_source: getPlatformName(), diff --git a/client/web/src/auth/CloudSignUpPage.tsx b/client/web/src/auth/CloudSignUpPage.tsx index f7bbf7def18..19a8d6b10fc 100644 --- a/client/web/src/auth/CloudSignUpPage.tsx +++ b/client/web/src/auth/CloudSignUpPage.tsx @@ -194,11 +194,11 @@ export const CloudSignUpPage: React.FunctionComponent By registering, you agree to our{' '} - + Terms of Service {' '} and{' '} - + Privacy Policy . diff --git a/client/web/src/auth/SignUpForm.tsx b/client/web/src/auth/SignUpForm.tsx index 6a05f3cfb75..afbf81e07b6 100644 --- a/client/web/src/auth/SignUpForm.tsx +++ b/client/web/src/auth/SignUpForm.tsx @@ -233,11 +233,11 @@ export const SignUpForm: React.FunctionComponent By signing up, you agree to our{' '} - + Terms of Service {' '} and{' '} - + Privacy Policy . diff --git a/client/web/src/auth/VsCodeSignUpPage.tsx b/client/web/src/auth/VsCodeSignUpPage.tsx index 1047a382a50..8475e414582 100644 --- a/client/web/src/auth/VsCodeSignUpPage.tsx +++ b/client/web/src/auth/VsCodeSignUpPage.tsx @@ -149,11 +149,11 @@ export const VsCodeSignUpPage: React.FunctionComponent By registering, you agree to our{' '} - + Terms of Service {' '} and{' '} - + Privacy Policy . diff --git a/client/web/src/auth/__snapshots__/SignUpPage.test.tsx.snap b/client/web/src/auth/__snapshots__/SignUpPage.test.tsx.snap index d6b53ed6d67..5c1ca3b864d 100644 --- a/client/web/src/auth/__snapshots__/SignUpPage.test.tsx.snap +++ b/client/web/src/auth/__snapshots__/SignUpPage.test.tsx.snap @@ -157,7 +157,7 @@ exports[`SignUpPage > renders sign up page (cloud) 1`] = ` By registering, you agree to our @@ -166,7 +166,7 @@ exports[`SignUpPage > renders sign up page (cloud) 1`] = ` and @@ -346,7 +346,7 @@ exports[`SignUpPage > renders sign up page (server) 1`] = ` By signing up, you agree to our @@ -355,7 +355,7 @@ exports[`SignUpPage > renders sign up page (server) 1`] = ` and diff --git a/client/web/src/cody/components/ChatUI/ChatUi.tsx b/client/web/src/cody/components/ChatUI/ChatUi.tsx index 9c227b1eefa..82855e0bec7 100644 --- a/client/web/src/cody/components/ChatUI/ChatUi.tsx +++ b/client/web/src/cody/components/ChatUI/ChatUi.tsx @@ -426,12 +426,12 @@ const CodyNotEnabledNotice: React.FunctionComponent = React.memo(function CodyNo <> Sign in to get access to Cody. You can learn more about Cody{' '} - here. + here. ) : ( <> Cody isn't available on this instance, but you can learn more about Cody{' '} - here. + here. )} diff --git a/client/web/src/cody/components/CodyMarketingPage/CodyMarketingPage.tsx b/client/web/src/cody/components/CodyMarketingPage/CodyMarketingPage.tsx index aaf39c42674..b28289a08f5 100644 --- a/client/web/src/cody/components/CodyMarketingPage/CodyMarketingPage.tsx +++ b/client/web/src/cody/components/CodyMarketingPage/CodyMarketingPage.tsx @@ -171,7 +171,7 @@ export const CodyMarketingPage: React.FunctionComponent By registering, you agree to our{' '} @@ -180,7 +180,7 @@ export const CodyMarketingPage: React.FunctionComponent and{' '} @@ -205,7 +205,7 @@ export const CodyMarketingPage: React.FunctionComponent

  • Write code faster
    • - Learn more about Cody → + Learn more about Cody → {authenticatedUser?.siteAdmin && ( <> {' '} @@ -243,7 +243,7 @@ export const CodyMarketingPage: React.FunctionComponent

    Overview

    Visit the{' '} - + product page {' '} and see what devs are building with Cody. @@ -255,8 +255,8 @@ export const CodyMarketingPage: React.FunctionComponent - Learn about Cody, Sourcegraph's AI - coding assistant. + Learn about Cody, Sourcegraph's AI coding + assistant. )} @@ -286,7 +286,7 @@ export const CodyMarketingPage: React.FunctionComponent
    diff --git a/client/web/src/cody/components/GettingStarted.tsx b/client/web/src/cody/components/GettingStarted.tsx index 228084f647f..dd7b93e726d 100644 --- a/client/web/src/cody/components/GettingStarted.tsx +++ b/client/web/src/cody/components/GettingStarted.tsx @@ -260,7 +260,7 @@ export const GettingStarted: React.FC< By using Cody, you agree to its{' '} - license and privacy statement. + license and privacy statement.
    diff --git a/client/web/src/components/externalServices/AddExternalServicesPage.tsx b/client/web/src/components/externalServices/AddExternalServicesPage.tsx index 2a6fed2b502..1c4a7adcd26 100644 --- a/client/web/src/components/externalServices/AddExternalServicesPage.tsx +++ b/client/web/src/components/externalServices/AddExternalServicesPage.tsx @@ -129,8 +129,8 @@ export const AddExternalServicesPage: FC = ({ <> Upgrade to{' '} - Sourcegraph Enterprise to add - repositories from other code hosts. + Sourcegraph Enterprise to add repositories + from other code hosts. )} diff --git a/client/web/src/enterprise/app/settings/about/AboutPage.tsx b/client/web/src/enterprise/app/settings/about/AboutPage.tsx index fc86507fb1c..72d21f9c25c 100644 --- a/client/web/src/enterprise/app/settings/about/AboutPage.tsx +++ b/client/web/src/enterprise/app/settings/about/AboutPage.tsx @@ -40,12 +40,12 @@ export const AboutTab: React.FC = ({ version = window.context.ver

    Terms and Conditions

    - + Usage and Privacy Notice
    - + Terms of Service for Sourcegraph Cloud{' '} diff --git a/client/web/src/enterprise/app/setup/steps/AppWelcomeSetupStep.tsx b/client/web/src/enterprise/app/setup/steps/AppWelcomeSetupStep.tsx index 9d9519fffb9..b2b5250b5e7 100644 --- a/client/web/src/enterprise/app/setup/steps/AppWelcomeSetupStep.tsx +++ b/client/web/src/enterprise/app/setup/steps/AppWelcomeSetupStep.tsx @@ -129,7 +129,7 @@ const CodyInfo: FC = () => ( By signing in, you’re connecting Cody to your app and agreeing to Sourcegraph’s Cody Usage Privacy Notice.{' '} eventLogger.log('ClickedOnEnterpriseCTA', { location: 'TryBatchChanges' })} > diff --git a/client/web/src/enterprise/batches/list/BatchChangesListIntro.tsx b/client/web/src/enterprise/batches/list/BatchChangesListIntro.tsx index a442dd8e1d0..5f93969795f 100644 --- a/client/web/src/enterprise/batches/list/BatchChangesListIntro.tsx +++ b/client/web/src/enterprise/batches/list/BatchChangesListIntro.tsx @@ -57,7 +57,7 @@ const BatchChangesUnlicensedAlert: React.FunctionComponent - Contact sales to obtain a trial + Contact sales to obtain a trial license.
    diff --git a/client/web/src/enterprise/batches/list/GettingStarted.tsx b/client/web/src/enterprise/batches/list/GettingStarted.tsx index e487511b1f4..2f7ff563b55 100644 --- a/client/web/src/enterprise/batches/list/GettingStarted.tsx +++ b/client/web/src/enterprise/batches/list/GettingStarted.tsx @@ -19,7 +19,7 @@ export interface GettingStartedProps { className?: string } -const productPageUrl = 'https://about.sourcegraph.com/batch-changes' +const productPageUrl = 'https://sourcegraph.com/batch-changes' export const GettingStarted: React.FunctionComponent> = ({ isSourcegraphDotCom, @@ -95,7 +95,7 @@ export const GettingStarted: React.FunctionComponent To automate changes across your team's private repositories,{' '} eventLogger.log('ClickedOnEnterpriseCTA', { location: 'BatchChangesGettingStarted' }) } diff --git a/client/web/src/enterprise/code-monitoring/CodeMonitorList.tsx b/client/web/src/enterprise/code-monitoring/CodeMonitorList.tsx index b8d049d4db2..b30efbb56b3 100644 --- a/client/web/src/enterprise/code-monitoring/CodeMonitorList.tsx +++ b/client/web/src/enterprise/code-monitoring/CodeMonitorList.tsx @@ -80,7 +80,7 @@ export const CodeMonitorList: React.FunctionComponent To monitor changes across your private repositories,{' '} eventLogger.log('ClickedOnEnterpriseCTA', { location: 'Monitoring' }) } diff --git a/client/web/src/enterprise/code-monitoring/CodeMonitoringGettingStarted.tsx b/client/web/src/enterprise/code-monitoring/CodeMonitoringGettingStarted.tsx index 56d620e4f05..da954ac7ae1 100644 --- a/client/web/src/enterprise/code-monitoring/CodeMonitoringGettingStarted.tsx +++ b/client/web/src/enterprise/code-monitoring/CodeMonitoringGettingStarted.tsx @@ -76,7 +76,7 @@ export const CodeMonitoringGettingStarted: React.FunctionComponent< eventLogger.log('CodeMonitoringExampleMonitorClicked') }, []) - let ctaBannerUrl = 'https://about.sourcegraph.com/get-started?t=enterprise' + let ctaBannerUrl = 'https://sourcegraph.com/get-started?t=enterprise' if (isCodyApp) { ctaBannerUrl = addSourcegraphAppOutboundUrlParameters(ctaBannerUrl, 'monitoring') } diff --git a/client/web/src/enterprise/insights/pages/landing/dot-com-get-started/CodeInsightsDotComGetStarted.tsx b/client/web/src/enterprise/insights/pages/landing/dot-com-get-started/CodeInsightsDotComGetStarted.tsx index 950829a377f..0d94982a153 100644 --- a/client/web/src/enterprise/insights/pages/landing/dot-com-get-started/CodeInsightsDotComGetStarted.tsx +++ b/client/web/src/enterprise/insights/pages/landing/dot-com-get-started/CodeInsightsDotComGetStarted.tsx @@ -44,7 +44,7 @@ export const CodeInsightsDotComGetStarted: React.FunctionComponent< isSourcegraphDotCom ? (