Merge branch 'main' into feature/typography-custom-text-style

Author: pinkeshmars

docs/ff-concepts/design-system/design-system.md

@@ -709,7 +709,7 @@ Make sure you have the proper rights or licenses to use the icons in your applic
 
 **Steps to Generate and Add Custom Icons**
 
-1. Head over to the [iconmoon](https://icomoon.io/app/#/select).
+1. Head over to the [IcoMoon](https://icomoon.io/app/#/select).
 2. Import your custom icon (.svg) or select from the free icons set.
 3. Select the **Generate Font** tab.
 4. Click on the Settings button (gear icon) beside the download text on the bottom right side.
@@ -814,7 +814,7 @@ If you prefer watching a video tutorial, here is the guide for you:
 
 Creating a theme for widgets ensures that your app looks consistent and has a cohesive design. The Theme widgets can be reused, making it easy to update the styles of your app. If you decide to change any property of the widget, such as color scheme or fonts, you can update the theme widget instead of going through every widget individually. This can save a lot of time and effort, especially in larger projects.
 
-For example, creating theme widgets for different types of buttons such as 'primary_button', 'secondary_button', and 'tertairy_button' with specific attributes like width, color, icon, border radius, and padding. Then, these widgets can be directly added to a page or applied to an existing widget.
+For example, creating theme widgets for different types of buttons such as 'primary_button', 'secondary_button', and 'tertiary_button' with specific attributes like width, color, icon, border radius, and padding. Then, these widgets can be directly added to a page or applied to an existing widget.
 
 ### Adding theme widgets
 
@@ -978,4 +978,4 @@ If you prefer watching a video tutorial, here's the one for you:
 <details>
 <summary>How is the theme widget different from creating a template and component?</summary>
 <p>The Theme Widget allows you to customize the visual appearance of a single widget, whereas templates consist of multiple widgets that create a unique UI layout with a specific purpose. On the other hand, components are fully-featured custom widgets that combine multiple widgets and actions to complete a task.</p>
-</details>
+</details>

docs/ff-concepts/navigation-routing/nav-overview.md

@@ -63,12 +63,12 @@ This action involves navigating to a new screen by pushing a new route onto the
 
 **What Happens Under the Hood:**
 
-- When you push a route, a new screen is placed on top of the current stack. This means the current screen is still in the stack but is not visible to the user.
+- When you push a route, a new screen is placed on top of the current stack. This means the previous screen is still in the stack but is not visible to the user.
 - The new screen becomes the active screen that the user interacts with.
 
 :::info
 
-Learn more about adding this action [**here**](../../ff-concepts/navigation-routing/page-navigation.md#navigate-to-action).
+Learn more about adding this action in the [**page navigation guide**](../../ff-concepts/navigation-routing/page-navigation.md#navigate-to-action).
 
 :::
 
@@ -83,7 +83,7 @@ This action involves navigating back to the previous screen by popping the curre
 
 :::info
 
-Learn more about adding this action [**here**](../../ff-concepts/navigation-routing/page-navigation.md#navigate-back-action).
+Learn more about adding this action in the [**page navigation guide**](../../ff-concepts/navigation-routing/page-navigation.md#navigate-back-action).
 
 :::
 
@@ -98,6 +98,6 @@ This action involves replacing the current route with a new route. Unlike pushin
 :::info
 
 - This is useful when you want to prevent the user from navigating back to the previous screen.
-- This action is essentially the **Navigate To** action with the **Replace Route** option enabled. Learn more about adding this action [**here**](../../ff-concepts/navigation-routing/page-navigation.md#navigate-to-action).
+- This action is essentially the **Navigate To** action with the **Replace Route** option enabled. Learn more about adding this action in the [**page navigation guide**](../../ff-concepts/navigation-routing/page-navigation.md#navigate-to-action).
 
-:::
+:::

docs/resources/control-flow/backend-logic/api/rest-api.md

@@ -343,7 +343,7 @@ Let's see how to get the JSON into the Custom Data Type using an example that fe
 Here's how you do it:
 
 1. First, ensure that you [create a custom data type](#create-custom-data-type-matching-to-json-structure) that matches your JSON structure.
-2. Open your API call definition> **Response & Test tab > Response Type >** enablethe **Parse as 
+2. Open your API call definition > **Response & Test tab > Response Type >** enable the **Parse as 
    Data Type**. Select the **Data Type** that you want to convert into. For this example, it's 'AllProducts'.
 
 ![img_1.png](../imgs/img_1.png)
@@ -790,4 +790,4 @@ Why am I getting a “Current variable is not valid” error?
 <p>
 This error typically indicates that the widget isn’t receiving the data type it expects. For example, passing a list of colors directly to a text widget will trigger the error. In such cases, convert or supply the data as a string (or another compatible type) so the widget can properly display it.
 </p>
-</details>
+</details>

docs/resources/projects/libraries.md

@@ -11,7 +11,7 @@ import TabItem from '@theme/TabItem';
 
 # Libraries
 
-Libraries enables you to share and reuse entire FlutterFlow projects as dependencies across multiple projects. This allows teams and developers to modularize their apps by creating shared libraries that include components, API calls, custom code, and more. By using libraries, development becomes more efficient and scalable.
+Libraries enable you to share and reuse entire FlutterFlow projects as dependencies across multiple projects. This allows teams and developers to modularize their apps by creating shared libraries that include components, API calls, custom code, and more. By using libraries, development becomes more efficient and scalable.
 
 :::info
 A **Dependency** refers to an external library or resource that your project relies on to function correctly. When you create a new FlutterFlow project, certain dependencies are automatically added to support the generated code. Also, when you use a [**Custom Widget**](../../ff-concepts/adding-customization/custom-widgets.md), you are essentially adding dependencies to your project. Libraries take this concept further by allowing you to add entire FlutterFlow projects as dependencies.
@@ -386,4 +386,4 @@ We're working on Library Values, which will allow users to set specific values w
 <p>
 Projects can import libraries that themselves have imported other Libraries as dependencies. However, if the project and the library share the same dependency, the version must match exactly to avoid conflicts.
 </p>
-</details>
+</details>