Merge branch 'main' into cbonif/connect-api-to-db

Author: renebrandel

src/pages/gen2/index.tsx

@@ -92,8 +92,8 @@ const Gen2Overview = () => {
         </Heading>
         <Text className="max-inline-content">
           Amplify has reimagined the way frontend developers build fullstack
-          applications on AWS. This next generation of Amplify’s backend
-          building experience lets you author your frontend and backend
+          applications on AWS. With this next generation of Amplify’s backend-building
+          experience, you can author your frontend and backend
           definition completely with TypeScript, a file convention, and Git
           branch-based environments.
         </Text>
@@ -151,7 +151,7 @@ const Gen2Overview = () => {
                 Fullstack Git deployments
               </Heading>
               <Text>
-                Full-stack deployments from your Git branch. Deploy your
+                Fullstack deployments from your Git branch. Deploy your
                 frontend and backend together on every code commit.
               </Text>
             </Flex>
@@ -189,21 +189,21 @@ const Gen2Overview = () => {
             linkText="Real-time data for modern apps"
             href="/gen2/build-a-backend/data/set-up-data/"
           >
-            Sync frontend state to realtime backend updates. Just write TypeScript without thinking about WebSockets.
+            Sync frontend state to real-time backend updates. Just write TypeScript without thinking about WebSockets.
           </FeatureItem>
           <FeatureItem
             linkText="Authn and authz for secure apps"
             href="/gen2/build-a-backend/auth/set-up-auth/"
           >
-            Choose the auth strategy (e.g. passwords, social, email links) and
-            control data access based on users/groups.
+            Choose the auth strategy (such as passwords, social, email links) and
+            control data access based on users and groups.
           </FeatureItem>
           <FeatureItem
             linkText="Auto-generate CRUD forms wired to data"
             href="/gen2/build-ui/"
           >
-            CRUD forms that map to your data model with form-level validations
-            and error states built-in.
+            Map CRUD forms to your data model with form-level validations
+            and error states built in.
           </FeatureItem>
         </Columns>
       </FeatureList>
@@ -228,7 +228,7 @@ const Gen2Overview = () => {
             linkText="SSR/SSG/ISR hosting support"
             href="/gen2/deploy-and-host/hosting/"
           >
-            Deploy Next.js, Nuxt.js, Gatsby, React, Vue, Angular (and more) apps
+            Deploy apps in Next.js, Nuxt.js, Gatsby, React, Vue, Angular (and more)
             by simply connecting your Git repository.
           </FeatureItem>
           <FeatureItem
@@ -242,14 +242,14 @@ const Gen2Overview = () => {
             linkText="Zero-config fullstack branches"
             href="/gen2/deploy-and-host/fullstack-branching/branch-deployments/"
           >
-            Full-stack deployments from your Git branch. Autodeploy git branches
-            to set up staging, development and production environments
+            Fullstack deployments from your Git branch. Autodeploy Git branches
+            to set up staging, development, and production environments.
           </FeatureItem>
           <FeatureItem
             linkText="GUI to manage your data"
             href="/gen2/how-amplify-works/concepts/#unified-management-console"
           >
-            Console to manage your app data, users/groups, and files.
+            Manage your app data, users and groups, and files in a single console.
           </FeatureItem>
         </FeatureList>
 
@@ -261,18 +261,18 @@ const Gen2Overview = () => {
             Extend or customize with AWS CDK to access 200+ AWS services.
           </FeatureItem>
           <FeatureItem
-            linkText="Bring your your own pipelines"
+            linkText="Bring your own pipelines"
             href="/gen2/deploy-and-host/fullstack-branching/custom-pipelines/"
           >
-            Use your own pipelines to set up cross-account or multi-region
+            Use your own pipelines to set up cross-account or multi-region,
             stage-based deployments.
           </FeatureItem>
           <FeatureItem
             linkText="Monorepo and multi-repo support"
             href="/gen2/deploy-and-host/fullstack-branching/mono-and-multi-repos/"
           >
-            Support for all types of fullstack team workflows - monorepos,
-            microfrontends, multi-repos and more.
+            Enable support for all types of fullstack team workflows—monorepos,
+            micro frontends, multi-repos, and more.
           </FeatureItem>
         </FeatureList>
         <MDXCode

src/pages/gen2/reference/telemetry/index.mdx

@@ -13,9 +13,9 @@ export function getStaticProps(context) {
 
 {/* inspired by https://nextjs.org/telemetry */}
 
-Amplify (Gen 2) collects anonymous telemetry data about general usage of the CLI. Participation is optional, and you may [opt-out](#how-do-i-opt-out) by using `amplify configure telemetry disable`.
+Amplify (Gen 2) collects anonymous telemetry data about general usage of the CLI. Participation is optional, and you may [opt out](#how-do-i-opt-out) by using `amplify configure telemetry disable`.
 
-Your decision to opt-out is stored for your user, meaning all Amplify apps you work with on that computer will not send telemetry data.
+Your decision to opt out is stored for your user, meaning all Amplify apps you work with on that computer will not send telemetry data.
 
 {/* ## Why is telemetry collected? */}
 
@@ -25,21 +25,21 @@ Your decision to opt-out is stored for your user, meaning all Amplify apps you w
 
 {/* @TODO */}
 
-## How do I opt-out?
+## How do I opt out?
 
-You may opt-out by using the `configure telemetry disable` command from the root of your Amplify app:
+You may opt out by using the `configure telemetry disable` command from the root of your Amplify app:
 
 ```bash
 npx amplify configure telemetry disable
 ```
 
-You can opt back into the program by running the following from the root of your Amplify app:
+You can opt back in to the program by running the following from the root of your Amplify app:
 
 ```bash
 npx amplify configure telemetry enable
 ```
 
-In the event you would like to disable telemetry ad-hoc, you can opt-out by defining an environment variable:
+In the event you would like to disable telemetry on a one-time basis, you can opt out by defining an environment variable:
 
 ```bash
 AMPLIFY_DISABLE_TELEMETRY=1