Merge branch 'main' into repo_sync_working_branch

Author: rmca14

.openpublishing.redirection.json

@@ -7210,6 +7210,31 @@
       "source_path": "docs/user-guide/about-azure-devops-services-tfs.md",
       "redirect_url": "/azure/devops/user-guide/what-is-azure-devops",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/boards/plans/safe-concepts.md",
+      "redirect_url": "/azure/devops/boards/plans/safe-configure-boards#safe-concepts",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/boards/plans/safe-customize.md",
+      "redirect_url": "/azure/devops/boards/plans/safe-configure-boards#customization",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/boards/plans/safe-plan-track-boards.md",
+      "redirect_url": "/azure/devops/boards/plans/safe-configure-boards#plan-track",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/boards/plans/safe-review-roadmaps-progress.md",
+      "redirect_url": "/azure/devops/boards/plans/safe-configure-boards#roadmaps",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/boards/plans/scaled-agile-framework-.md",
+      "redirect_url": "/azure/devops/boards/plans/safe-configure-boards",
+      "redirect_document_id": false
     }
   ]
 }

docs/artifacts/artifact-storage.md

@@ -65,6 +65,39 @@ The project-level view provides an overview of your total storage usage as well
 
 [!INCLUDE [](includes/increase-storage-limit.md)]
 
+## FAQs
+
+#### Q: What counts toward my total billed storage?
+
+A: All package types: npm, NuGet, Python, Maven, Cargo, and Universal Packages are included in your billed storage. Packages saved from upstream sources also count toward your billed storage. However, Pipeline Artifacts and Pipeline Caching do not contribute to storage charges.
+
+#### Q: Do packages in the recycle bin affect my storage usage?
+
+A: Yes, packages in the recycle bin still count toward your total storage. They are automatically deleted after 30 days, but you can manually remove them earlier by deleting them from the recycle bin.
+
+#### Q: What happens if I remove my Azure Subscription from my Azure DevOps organization?
+
+A: Removing your Azure Subscription from your Azure DevOps organization limits your access to the free tier. If your storage usage exceeds 2 GiB, you will have read-only access to packages. To publish new packages, you must reduce your storage usage below 2 GiB, or reconnect your Azure subscription and set up billing to [upgrade your storage tier](#increase-artifacts-storage-limit).
+
+#### Q: Why does my storage usage show as 0 GiB even though I have artifacts stored?
+
+A: The smallest unit of storage measurement is 1 GiB. If your usage is below that threshold, it will display as 0 GiB.
+
+#### Q: How long does it take for deleted artifacts to reflect in billed storage?
+
+A: Storage metrics typically update within 24 hours, but it may take up to 48 hours. If you're unable to upload artifacts, a temporary workaround is to increase your usage level and reduce it again once metrics refresh.
+
+> [!NOTE]
+> The **Used** column in your **Organization settings** > **Billing** page is updated once a day, so changes may not be reflected right away. However, the **Artifacts** > **Storage** page in your **Organization settings** is updated more frequently, which could result in a slight discrepancy between the two pages.
+
+#### Q: How can I manage retention for outdated packages?
+
+A: You can configure retention policies to automatically delete outdated packages. However, packages promoted to a view are exempt from these policies. See [How to use retention policies to delete old packages](how-to/delete-and-recover-packages.md#delete-packages-automatically-with-retention-policies) for more details.
+
+#### Q: How do I manually delete specific packages?
+
+A: See [Delete and recover packages](how-to/delete-and-recover-packages.md) for step-by-step instructions.
+
 ## Related articles
 
 - [Get started with NuGet packages in Azure Artifacts](get-started-nuget.md)

docs/artifacts/artifacts-key-concepts.md

@@ -62,9 +62,7 @@ You must be a feed owner also to delete feeds. Deleted feeds remain in the recyc
 
 ## Related content
 
-- [What are feeds?](./concepts/feeds.md)
-
-- [Feed views](./concepts/views.md)
+- [Azure Artifacts best practices](concepts/best-practices.md) 
 
 - [Azure Artifacts Upstream Sources](./concepts/upstream-sources.md)
 

docs/artifacts/cargo/cargo-upstream-source.md

@@ -1,65 +1,58 @@
 ---
 title: Consume Cargo packages from Crates.io
-description: How to consume Crates from Crates.io with Azure Artifacts
+description: Learn how to consume Crates from Crates.io with Azure Artifacts.
 ms.service: azure-devops-artifacts
 ms.author: rabououn
 author: ramiMSFT
 ms.topic: quickstart
-ms.date: 12/13/2023
+ms.date: 10/01/2025
 monikerRange: '>= azure-devops-2022'
 "recommendations": "true"
 ---
 
-# Use packages from Crates.io
+# Use Cargo packages from Crates.io
 
 [!INCLUDE [version-gt-eq-2022](../../includes/version-gt-eq-2022.md)]
 
 Azure Artifacts upstream sources enable developers to consume packages from public registries like Crates.io and nuget.org. This article will guide you through setting up your project and using the command line to consume Crates from Crates.io. 
 
-This article will guide you through how to:
-
-> [!div class="checklist"]  
-> * Create an Azure Artifacts feed 
-> * Connect to your feed
-> * Consume crates from upstream
-
 ## Prerequisites
 
-- An Azure DevOps organization. [Create an organization](../../organizations/accounts/create-organization.md) if you haven't already.
-
-- An Azure DevOps project. [Create a project](../../organizations/projects/create-project.md#create-a-project) if you don't have one.
-
-- Download and install [rustup](https://rustup.rs/).
+|     **Product**    |  **Requirements**  |
+|--------------------|--------------------|
+| **Azure DevOps**   | - An Azure DevOps [organization](../../organizations/accounts/create-organization.md).<br>- An Azure DevOps [project](../../organizations/projects/create-project.md).<br> - Download and install [rustup](https://rustup.rs/). You'll need Cargo version 1.74.0 or later. |
 
 ## Create a feed
 
-Azure Artifacts recommends having a dedicated feed for consuming crates from crates.io and a separate feed exclusively for publishing internal crates. 
+Azure Artifacts recommends having a dedicated feed for consuming crates from crates.io and a separate feed exclusively for publishing internal crates. If you already have an Azure Artifacts feed, skip to the next section. Otherwise, create a new one as follows:
 
-1. Sign in to your Azure DevOps organization, and then navigate to your project.
+1. Sign in to your Azure DevOps organization, then navigate to your project.
 
 1. Select **Artifacts**, and then select **Create Feed**.
 
-1. Enter a **Name** for your feed, define its **Visibility**, and then select your **Scope**. Make sure to check the **Upstream sources** checkbox to include packages from public registries. 
+1. Provide a **Name** for your feed, select the **Visibility** to define who can view your packages, and choose the feed **Scope**. Check the **Include packages from common public sources** checkbox to enable upstream sources on your feed.
 
 1. Select **Create** when you're done.
 
-    :::image type="content" source="media/create-cargo-upstream-feed.png" alt-text="A screenshot showing how to create a feed for cargo upstream.":::
+    :::image type="content" source="media/cargo-crates-feed.png" alt-text="A screenshot displaying how to create a feed to consume crates from Crates.io upstream.":::
 
 ## Connect to your feed
 
+Now that you have a feed, you need to set up your *config.toml* file, configure a credential provider, then log in to the registry to authenticate with your feed. 
+
+#### Project setup
+
 ::: moniker range="azure-devops"
 
 #### [Private feed](#tab/privatefeed/)
 
-1. Sign in to your Azure DevOps organization, and then navigate to your project.
-
-1. Select **Artifacts**, and then select your feed from the dropdown menu.
+1. Sign in to your Azure DevOps organization, then navigate to your project.
 
-1. Select **Connect to feed**, and then select **Cargo** from the left navigation pane.
+1. Select **Artifacts**, then select your feed from the dropdown menu.
 
-1. If this is the first time using Cargo with Azure Artifacts, make sure you have installed [rustup](https://rustup.rs/).
+1. Select **Connect to feed**, then select **Cargo** from the left navigation pane.
 
-1. Add the provided snippet from the **Project setup** section to your *.cargo/config.toml* file in your source repository:
+1. Copy the snippet from the **Project setup** section and paste it into your *.cargo/config.toml* file in your source repository. It should look similar to the following:
 
     - **Project-scoped feed**:
 
@@ -83,15 +76,15 @@ Azure Artifacts recommends having a dedicated feed for consuming crates from cra
 
 #### [Public feed](#tab/publicfeed/)
 
-1. Sign in to your Azure DevOps organization, and then navigate to your project.
+1. Sign in to your Azure DevOps organization, then navigate to your project.
 
-1. Select **Artifacts**, and then select your feed from the dropdown menu.
+1. Select **Artifacts**, then select your feed from the dropdown menu.
 
-1. Select **Connect to feed**, and then select **Cargo** from the left navigation pane.
+1. Select **Connect to feed**, then select **Cargo** from the left navigation pane.
 
-1. If this is the first time using Cargo with Azure Artifacts, make sure you have installed [rustup](https://rustup.rs/).
+1. If this is the first time using Cargo with Azure Artifacts, select **Get the tools** and install [rustup](https://rustup.rs/).
 
-1. Add the provided snippet from the **Project setup** section to your *.cargo/config.toml* file in your source repository depending on your scenario. See [Feed roles and permissions](../feeds/feed-permissions.md#feed-roles-and-permissions) to learn more about the different roles and their permissions:
+1. Copy the following snippet and paste it into your *.cargo/config.toml* file in your source repository, depending on your role. See [Feed roles and permissions](../feeds/feed-permissions.md#feed-roles-and-permissions) to learn more about the different roles and their permissions:
 
     - **Feed Readers and anonymous users**:
     
@@ -103,7 +96,7 @@ Azure Artifacts recommends having a dedicated feed for consuming crates from cra
         replace-with = "<FEED_NAME>"
         ```
 
-    - **Feed and Upstream Readers, Feed Publishers, and Feed Owners**: Be sure to include the additional flag (*~force-auth*) for proper authentication with your feed, as shown below:
+    - **Feed and Upstream Readers, Feed Publishers, and Feed Owners**: Be sure to include the additional flag `~force-auth` for proper authentication with your feed, as shown below:
     
         ```
         [registries]
@@ -117,15 +110,13 @@ Azure Artifacts recommends having a dedicated feed for consuming crates from cra
 
 ::: moniker range="azure-devops-2022"
 
-1. Sign in to your Azure DevOps collection, and then navigate to your project.
+1. Sign in to your Azure DevOps collection, then navigate to your project.
 
-1. Select **Artifacts**, and then select your feed from the dropdown menu.
+1. Select **Artifacts**, then select your feed from the dropdown menu.
 
-1. Select **Connect to feed**, and then select **Cargo** from the left navigation pane.
+1. Select **Connect to feed**, then select **Cargo** from the left navigation pane.
 
-1. If this is the first time using Cargo with Azure Artifacts, make sure you have installed [rustup](https://rustup.rs/).
-
-1. Add the provided snippet from the **Project setup** section to your *.cargo/config.toml* file in your source repository:
+1. Copy the snippet from the **Project setup** section and paste it into your *.cargo/config.toml* file in your source repository. It should look similar to:
 
     - **Project-scoped feed**:
     
@@ -149,13 +140,13 @@ Azure Artifacts recommends having a dedicated feed for consuming crates from cra
 
 ::: moniker-end
 
-## Configure a credential provider
+#### Configure a credential provider
 
-To use Cargo with Azure Artifacts, you need to set up a credential provider. The provided settings will configure a default credential helper for the current user:
+To use Cargo with Azure Artifacts, you need to set up a [credential provider](https://doc.rust-lang.org/nightly/cargo/reference/credential-provider-protocol.html#credential-provider-protocol). The following settings will set a default credential helper for the user:
 
 #### [Windows](#tab/Windows/)
 
-Paste the following snippet in your %USERPROFILE%\.cargo\config.toml:
+Paste the following snippet in your *%USERPROFILE%\.cargo\config.toml*:
 
 ```
 [registry]
@@ -164,7 +155,7 @@ global-credential-providers = ["cargo:token", "cargo:wincred"]
 
 #### [Linux](#tab/Linux/)
 
-Paste the following snippet in your ~/.cargo/config.toml:
+Paste the following snippet in your *~/.cargo/config.toml*:
 
 ```
 [registry]
@@ -173,7 +164,7 @@ global-credential-providers = ["cargo:token", "cargo:libsecret"]
 
 #### [macOS](#tab/macOS/)
 
-Paste the following snippet in your ~/.cargo/config.toml:
+Paste the following snippet in your *~/.cargo/config.toml*:
 
 ```
 [registry]
@@ -182,11 +173,11 @@ global-credential-providers = ["cargo:token", "cargo:macos-keychain"]
 
 * * *
 
-## Log in to your registry
+#### Log in to your registry
 
 1. Create a [Personal access token](../../organizations/accounts/use-personal-access-tokens-to-authenticate.md#create-a-pat) with **Packaging** > **Read & write** scopes to authenticate with your feed.
 
-1. Run the following command to log in to your registry. Replace the placeholder with your feed's name, and paste the personal access token you created in the previous step when prompted:
+1. Run the following command to log in to your registry. Replace *<FEED_NAME>* with your feed name, and when promoted, paste the personal access token you created earlier.
 
     #### [PowerShell ](#tab/PowerShell/)
     
@@ -211,16 +202,14 @@ global-credential-providers = ["cargo:token", "cargo:macos-keychain"]
 
 ## Save packages from Crates.io
 
-[!INCLUDE [save-requires-collaborator](../includes/save-requires-collaborator.md)]
-
-Now that we have set up our project, configured a credential provider, and logged into our feed, we can begin consuming packages from upstream. Azure Artifacts saves a copy of any package you install from upstream to your feed.
+Now that your project is set up, the credential provider is configured, and you're authenticated with your feed, you can begin consuming packages from upstream sources. Azure Artifacts automatically saves a copy of any package you install from upstream to your feed.
 
-In this example, we consume the `serde` crate, a serialization/deserialization framework:
+The following example demonstrates how to consume the `reqwest` crate, an HTTP client library used for making HTTP requests:
 
-1. Run the following command in your project directory to add the crate to your *cargo.toml*:
+1. Add the crate to your *Cargo.toml* by running the following command in your project directory:
 
     ```
-    cargo add serde
+    cargo add reqwest
     ``` 
 
 1. Run the following command to build your project and consume your crate:
@@ -229,12 +218,16 @@ In this example, we consume the `serde` crate, a serialization/deserialization f
     cargo build
     ```
 
-Once your package is installed, a copy will be saved to your feed. Navigate to your feed to verify its presence. Your package should be available in your feed, as shown below:
+Once the package is installed, a copy will be saved to your feed. You can verify this by navigating to your feed in Azure DevOps. The package should be available in your feed, as shown below:
+
+:::image type="content" source="media/consume-crate-from-cargo-upstream.png" alt-text="A screenshot displaying the reqwest crate listed in an Azure Artifacts feed after being saved from Crates.io." lightbox="media/consume-crate-from-cargo-upstream.png":::
+
+[!INCLUDE [save-requires-collaborator](../includes/save-requires-collaborator.md)]
+
+## Related content
 
-:::image type="content" source="media/crate-from-upstream.png" alt-text="A screenshot showing the *serde* crate consumed from upstream.":::
+- [Publish Cargo packages from the command line](cargo-publish.md)
 
-## Related articles
+- [Publish Cargo packages with Azure Pipelines YAML/Classic](../../pipelines/artifacts/cargo-pipelines.md)
 
-- [Publish Cargo packages with Azure Pipelines](../../pipelines/artifacts/cargo-pipelines.md)
-- [Delete and recover packages](../how-to/delete-and-recover-packages.md)
 - [Configure permissions](../feeds/feed-permissions.md)

docs/artifacts/cargo/media/cargo-crates-feed.png

@@ -63,7 +63,7 @@ This section outlines best practices for consuming packages with Azure Artifacts
 
 - **Ensure the order of sources reflects your desired package resolution strategy**:
 
-    The feed checks upstream sources sequentially and will return the package from the first source that contains it. Be mindful of the order to ensure your feed resolves packages from the correct source. See [Order your upstream sources intentionally](upstream-sources.md#2-order-your-upstream-sources-intentionally) and [Search order](upstream-sources.md#search-order) for more details.
+    The feed checks upstream sources sequentially and will return the package from the first source that contains it. Be mindful of the order to ensure your feed resolves packages from the correct source. See [Order your upstream sources intentionally](upstream-sources.md#order-your-upstream-sources-intentionally) and [Search order](upstream-sources.md#search-order) for more details.
 
 - **Add external sources using the feed locator**: