Merge branch 'main' into tjroach/gen2-android-updates2

src/components/Layout/LayoutHeader.tsx

@@ -3,17 +3,17 @@ import { useRouter } from 'next/router';
 import { Button, Flex, View, VisuallyHidden } from '@aws-amplify/ui-react';
 import classNames from 'classnames';
 import { Platform } from '@/data/platforms';
-// import {
-//   ALGOLIA_API_KEY,
-//   ALGOLIA_INDEX_NAME,
-//   ALGOLIA_APP_ID
-// } from '../../constants/algolia';
+import {
+  ALGOLIA_API_KEY,
+  ALGOLIA_INDEX_NAME,
+  ALGOLIA_APP_ID
+} from '../../constants/algolia';
 import { IconMenu, IconDoubleChevron } from '@/components/Icons';
 import { Menu } from '@/components/Menu';
 import { LayoutContext } from '@/components/Layout';
 import { PlatformNavigator } from '@/components/PlatformNavigator';
 import flatDirectory from 'src/directory/flatDirectory.json';
-// import { DocSearch } from '@docsearch/react';
+import { DocSearch } from '@docsearch/react';
 import '@docsearch/css';
 import { PageLastUpdated } from '../PageLastUpdated';
 import Feedback from '../Feedback';
@@ -72,7 +72,7 @@ export const LayoutHeader = ({
           )}
         >
           <View className="layout-search__search__container">
-            {/* <DocSearch
+            <DocSearch
               appId={process.env.ALGOLIA_APP_ID || ALGOLIA_APP_ID}
               indexName={process.env.ALGOLIA_INDEX_NAME || ALGOLIA_INDEX_NAME}
               apiKey={process.env.ALGOLIA_API_KEY || ALGOLIA_API_KEY}
@@ -82,7 +82,7 @@ export const LayoutHeader = ({
                   `gen:${isGen1 ? 'gen1' : 'gen2'}`
                 ]
               }}
-            /> */}
+            />
           </View>
         </View>
       </Flex>

src/pages/[platform]/build-a-backend/add-aws-services/geo/amazon-location-sdk/index.mdx

@@ -225,7 +225,7 @@ Log.i("MyAmplifyApp", response.entries.toString())
 
 If you need functionality in the AWSLocation framework used by the Amplify Geo category that isn't available, we provide an escape hatch so you can reference it directly.
 
-Note: If you provisioned your Geo resources, then the IAM policy will be specifically scoped to only allow actions required by the library. Please [adjust your authorization permissions](/[platform]/build-a-backend/more-features/geo/existing-resources/) accordingly for your escape hatch use-cases.
+Note: If you provisioned your Geo resources, then the IAM policy will be specifically scoped to only allow actions required by the library. Please [adjust your authorization permissions](/[platform]/build-a-backend/add-aws-services/geo/existing-resources/) accordingly for your escape hatch use-cases.
 
 ```swift
 import AWSLocation

src/pages/[platform]/build-a-backend/troubleshooting/library-not-configured/index.mdx

@@ -40,7 +40,7 @@ Make sure you are calling `Amplify.configure` in the root file of your project.
 
 <Callout>
 
-If you are using the Next.js App Router, you can follow the suggestions in our [Next.js documentation](/[platform]/build-a-backend/server-side-rendering/nextjs/#configure-amplify-library-for-client-side-usage) for root-level configuration. Keep in mind that if you are calling any APIs at the module-level (i.e. at the top of your file) in any of the Child components, you may still run into this issue. Continue on the [Check 2](/[platform]/build-a-backend/troubleshooting/library-not-configured/#check-2-move-module-level-amplify-api-invocations) if this is the case.
+If you are using the Next.js App Router, you can follow the suggestions in our [Next.js documentation](/[platform]/build-a-backend/server-side-rendering/#configure-amplify-apis-for-server-side-usage) for root-level configuration. Keep in mind that if you are calling any APIs at the module-level (i.e. at the top of your file) in any of the Child components, you may still run into this issue. Continue on the [Check 2](/[platform]/build-a-backend/troubleshooting/library-not-configured/#check-2-move-module-level-amplify-api-invocations) if this is the case.
 
 </Callout>
 

src/pages/[platform]/how-amplify-works/faq/index.mdx

@@ -65,7 +65,7 @@ You can stay with Amplify no matter how big your application grows. Amplify is l
 
 You can read all about Amplify's pricing on our [pricing page](https://aws.amazon.com/amplify/pricing/).
 
-**Can I use any other database storage other than Amazon DynamoDB? Does it have to be noSQL?**
+{/* **Can I use any other database storage other than Amazon DynamoDB? Does it have to be noSQL?**
 
-You can also use an [existing MySQL or PostgreSQL database](/[platform]/build-a-backend/data/connect-api-to-existing-database/) in an Amplify app. With Gen 2's [custom query and mutation support](/[platform]/build-a-backend/data/custom-business-logic), you can integrate with any existing data source through a Lambda function as well.
+You can also use an [existing MySQL or PostgreSQL database](/[platform]/build-a-backend/data/connect-api-to-existing-database/) in an Amplify app. With Gen 2's [custom query and mutation support](/[platform]/build-a-backend/data/custom-business-logic), you can integrate with any existing data source through a Lambda function as well. */}
 

src/pages/[platform]/start/quickstart/index.mdx

@@ -315,7 +315,7 @@ Now that the repository has been created, deploy it with Amplify.
 Deploy to AWS
 </ExternalLinkButton>
 
-Select **Start with an existing app** > **GitHub**. After you give Amplify access to your GitHub account via the popup window, pick the repository and `main` branch to deploy. Make no other changes and click through the flow to **Save and deploy**.
+Select **GitHub**. After you give Amplify access to your GitHub account via the popup window, pick the repository and `main` branch to deploy. Make no other changes and click through the flow to **Save and deploy**.
 
 <video autoPlay={true} muted={true} loop={true} width="100%" playsInline={true}>
   <source src="/images/gen2/getting-started/react/deploy.mp4" />
@@ -366,7 +366,7 @@ Now let's set up our local development environment to add features to the fronte
   <source src="/images/gen2/getting-started/react/branch-details.mp4" />
 </video>
 
-At the bottom of the page you will see a tab for **Deployed backend resources**. Click on the tab and then click the **Download outputs file** button.
+At the bottom of the page you will see a tab for **Deployed backend resources**. Click on the tab and then click the **Download amplify_outputs.json file** button. 
 
 ![outputs](/images/gen2/getting-started/react/amplify-outputs-download.png)
 
@@ -651,7 +651,7 @@ Now that the repository has been created, deploy it with Amplify.
 Deploy to AWS
 </ExternalLinkButton>
 
-Select **Start with an existing app** > **GitHub**. After you give Amplify access to your GitHub account via the popup window, pick the repository and `main` branch to deploy. Make no other changes and click through the flow to **Save and deploy**.
+Select **GitHub**. After you give Amplify access to your GitHub account via the popup window, pick the repository and `main` branch to deploy. Make no other changes and click through the flow to **Save and deploy**.
 
 <video autoPlay={true} muted={true} loop={true} width="100%" playsInline={true}>
   <source src="/images/gen2/getting-started/react/deploy.mp4" />
@@ -703,7 +703,7 @@ Now let's set up our local development environment to add features to the fronte
   <source src="/images/gen2/getting-started/react/branch-details.mp4" />
 </video>
 
-At the bottom of the page you will see a tab for **Deployed backend resources**. Click on the tab and then click the **Download outputs file** button.
+At the bottom of the page you will see a tab for **Deployed backend resources**. Click on the tab and then click the **Download amplify_outputs.json file** button. 
 
 ![outputs](/images/gen2/getting-started/react/amplify-outputs-download.png)
 
@@ -985,10 +985,10 @@ Now that the repository has been created, deploy it with Amplify.
 Deploy to AWS
 </ExternalLinkButton>
 
-Select **Start with an existing app** > **GitHub**. After you give Amplify access to your GitHub account via the popup window, pick the repository and `main` branch to deploy. Make no other changes and click through the flow to **Save and deploy**.
+Select **GitHub**. After you give Amplify access to your GitHub account via the popup window, pick the repository and `main` branch to deploy. Make no other changes and click through the flow to **Save and deploy**.
 
 <video autoPlay={true} muted={true} loop={true} width="100%" playsInline={true}>
-  <source src="/images/gen2/getting-started/react/deploy.mp4" />
+  <source src="/images/gens2/getting-started/react/deploy.mp4" />
 </video>
 
 ### 3. View deployed app
@@ -1036,7 +1036,7 @@ Now let's set up our local development environment to add features to the fronte
   <source src="/images/gen2/getting-started/react/branch-details.mp4" />
 </video>
 
-At the bottom of the page you will see a tab for **Deployed backend resources**. Click on the tab and then click the **Download outputs file** button.
+At the bottom of the page you will see a tab for **Deployed backend resources**. Click on the tab and then click the **Download amplify_outputs.json file** button.
 
 ![outputs](/images/gen2/getting-started/react/amplify-outputs-download.png)
 
@@ -2177,7 +2177,7 @@ Now that the repository has been created, deploy this to Amplify's CI/CD pipelin
 Deploy to AWS
 </ExternalLinkButton>
 
-Select **Start with an existing app** > **GitHub**, pick the starter repository, and hit "Save and Deploy".
+Select **GitHub**, pick the starter repository, and hit "Save and Deploy".
 
 <video autoPlay={true} muted={true} loop={true} width="100%" playsInline={true}>
   <source src="/images/gen2/getting-started/react/deploy.mp4" />

src/pages/[platform]/start/quickstart/nextjs-app-router-client-components/index.mdx

@@ -99,7 +99,7 @@ Let's take a tour of the project structure in this starter repository by opening
 
 In the Amplify Console, navigate to the Data manager to see the data entered in your database.
 
-TK IMAGE
+![Amplify data manager user interface showing the ToDo model with two to do instances](/images/gen2/getting-started/data-manager.png)
 
 
 ## Make frontend updates
@@ -114,7 +114,7 @@ Now let's set up our local development environment to add features to the fronte
   <source src="/images/gen2/getting-started/react/branch-details.mp4" />
 </video>
 
-At the bottom of the page you will see a tab for **Deployed backend resources**. Click on the tab and then click the **Download outputs file** button. 
+At the bottom of the page you will see a tab for **Deployed backend resources**. Click on the tab and then click the **Download amplify_outputs.json file** button. 
 
 ![outputs](/images/gen2/getting-started/react/amplify-outputs-download.png)
 

src/pages/[platform]/start/quickstart/nextjs-pages-router/index.mdx

@@ -100,7 +100,7 @@ Let's take a tour of the project structure in this starter repository by opening
 
 In the Amplify Console, navigate to the Data manager to see the data entered in your database.
 
-TK IMAGE
+![Amplify data manager user interface showing the ToDo model with two to do instances](/images/gen2/getting-started/data-manager.png)
 
 
 ## Make frontend updates
@@ -115,7 +115,7 @@ Now let's set up our local development environment to add features to the fronte
   <source src="/images/gen2/getting-started/react/branch-details.mp4" />
 </video>
 
-At the bottom of the page you will see a tab for **Deployed backend resources**. Click on the tab and then click the **Download outputs file** button. 
+At the bottom of the page you will see a tab for **Deployed backend resources**. Click on the tab and then click the **Download amplify_outputs.json file** button. 
 
 ![outputs](/images/gen2/getting-started/react/amplify-outputs-download.png)