Dd4.16 content (#16497)

* add rosetta beta feature

* Change mac preferences to settings

* updates to the images view

* add info about quick search

* image fix

* image-fix

* Typo fix

_includes/deploy.md

@@ -22,7 +22,7 @@ Docker Desktop includes a standalone Kubernetes server and client, as well as Do
 
 To enable Kubernetes:
 
-1. From the Docker menu, select **Preferences** (**Settings** on Windows).
+1. From the Docker menu, select **Settings**.
 2. Select **Kubernetes** and click **Enable Kubernetes**.
 
     This starts a Kubernetes single-node cluster when Docker Desktop starts.

_includes/desktop-update.md

@@ -1,6 +1,6 @@
 <!-- This text will be included in the Linux, Mac and Windows Install topic -->
 
-When an update is available, Docker Desktop displays an icon on the Docker menu to indicate the availability of a newer version. Additionally, the **Software Updates** section in **Settings** (**Preferences** on Mac) also notifies you of any updates available to Docker Desktop. You can choose to download the update right away, or click the **Release Notes** option to learn what's included in the updated version.
+When an update is available, Docker Desktop displays an icon on the Docker menu to indicate the availability of a newer version. Additionally, the **Software Updates** section in **Settings** also notifies you of any updates available to Docker Desktop. You can choose to download the update right away, or click the **Release Notes** option to learn what's included in the updated version.
 
 Starting with Docker Desktop 4.2.0, the option to turn off the automatic check for updates is available for users on all Docker subscriptions, including Docker Personal and Docker Pro..
 

config/daemon/prometheus.md

@@ -36,7 +36,7 @@ exist, create it.
 - **Linux**: `/etc/docker/daemon.json`
 - **Windows Server**: `C:\ProgramData\docker\config\daemon.json`
 - **Docker Desktop for Mac / Docker Desktop for Windows**: Click the Docker icon in the toolbar,
-  select **Preferences**, then select **Daemon**. Click **Advanced**.
+  select **Settings**, then select **Daemon**. Click **Advanced**.
 
 If the file is currently empty, paste the following:
 

desktop/containerd/index.md

@@ -22,7 +22,7 @@ The containerd image store beta feature is off by default.
 
 To start using the feature:
 
-1. Navigate to **Settings**, or **Preferences** if you’re a Mac user.
+1. Navigate to **Settings**.
 2. Select the **Experimental** features tab.
 3. Next to **Use containerd for pulling and storing images**, select the
    checkbox.

desktop/extensions-sdk/dev/test-debug.md

@@ -55,7 +55,7 @@ $ docker extension dev reset <name-of-your-extensions>
 
 If your extension is composed of one or more services running as containers in the Docker Desktop VM, you can access them easily from the dashboard in Docker Desktop.
 
-1. In Docker Desktop, navigate to **Settings** or **Preferences** if you’re a Mac user.
+1. In Docker Desktop, navigate to **Settings**.
 2. Under the **Extensions** tab, select the **Show Docker Desktop Extensions system containers** option. You can now view your extension containers and their logs.
 
 

desktop/extensions/index.md

@@ -12,7 +12,7 @@ You can seamlessly connect your favorite development tools to your application d
 
 Anyone can use Docker Extensions and there is no limit to the number of extensions you can install.
 
-![Extensions Marketplace](../images/extensions-marketplace.PNG){:width="750px"}
+![Extensions Marketplace](../images/marketplace.png){:width="750px"}
 
 ## What extensions are available?
 

desktop/extensions/non-marketplace.md

@@ -20,7 +20,7 @@ You can install an extension that has been developed by the community or interna
 > **Note**
 >
 > Ensure the option **Allow only extensions distributed through the Docker Marketplace** is disabled. Otherwise, this prevents any extension not listed in the Marketplace, via the Extension SDK tools from, being installed.
-> You can change this option in **Settings**, or **Preferences** if you use macOS. 
+> You can change this option in **Settings**. 
 
 To install an extension which is not present in the Marketplace, you can use the Extensions CLI that is bundled with Docker Desktop.
 

desktop/extensions/settings-feedback.md

@@ -10,7 +10,7 @@ title: Settings and feedback
 
 Docker Extensions is switched on by default. To change your settings:
 
-1. Navigate to **Settings**, or **Preferences** if you're a Mac user.
+1. Navigate to **Settings**.
 2. Select the **Extensions** tab.
 3. Next to **Enable Docker Extensions**, select or clear the checkbox to set your desired state.
 4. In the bottom-right corner, select **Apply & Restart**.
@@ -19,7 +19,7 @@ Docker Extensions is switched on by default. To change your settings:
 
 You can install extensions through the Marketplace or through the Extensions SDK tools. You can choose to only allow published extensions. These are extensions that have been reviewed and published in the Extensions Marketplace.
 
-1. Navigate to **Settings**, or **Preferences** if you're a Mac user.
+1. Navigate to **Settings**.
 2. Select the **Extensions** tab.
 3. Next to **Allow only extensions distributed through the Docker Marketplace**, select or clear the checkbox to set your desired state.
 4. In the bottom-right corner, select **Apply & Restart**.
@@ -29,7 +29,7 @@ You can install extensions through the Marketplace or through the Extensions SDK
 By default, containers created by extensions are hidden from the list of containers in Docker Dashboard and the Docker CLI. To make them visible
 update your settings:
 
-1. Navigate to **Settings**, or **Preferences** if you're a Mac user.
+1. Navigate to **Settings**.
 2. Select the **Extensions** tab.
 3. Next to **Show Docker Extensions system containers**, select or clear the checkbox to set your desired state.
 4. In the bottom-right corner, select **Apply & Restart**.

desktop/faqs/linuxfaqs.md

@@ -168,7 +168,7 @@ Docker Desktop stores Linux containers and images in a single, large "disk image
 
 ### Where is the disk image file?
 
-To locate the disk image file, select **Preferences** from the Docker Dashboard then **Advanced** from the **Resources** tab.
+To locate the disk image file, select **Settings** from the Docker Dashboard then **Advanced** from the **Resources** tab.
 
 The **Advanced** tab displays the location of the disk image. It also displays the maximum size of the disk image and the actual space the disk image is consuming. Note that other tools might display space usage of the file in terms of the maximum file size, and not the actual file size.
 
@@ -184,7 +184,7 @@ If the disk image file is too large, you can:
 
 To move the disk image file to a different location:
 
-1. Select **Preferences** then  **Advanced** from the **Resources** tab.
+1. Select **Settings** then  **Advanced** from the **Resources** tab.
 
 2. In the **Disk image location** section, click **Browse** and choose a new location for the disk image.
 
@@ -246,7 +246,7 @@ In this example, the actual size of the disk is `2333548` KB, whereas the maximu
 
 To reduce the maximum size of the disk image file:
 
-1. From Docker Dashboard select **Preferences** then **Advanced** from the **Resources** tab.
+1. From Docker Dashboard select **Settings** then **Advanced** from the **Resources** tab.
 
 2. The **Disk image size** section contains a slider that allows you to change the maximum size of the disk image. Adjust the slider to set a lower limit.
 

desktop/faqs/macfaqs.md

@@ -33,7 +33,7 @@ Docker Desktop stores Linux containers and images in a single, large "disk image
 
 #### Where is the disk image file?
 
-To locate the disk image file, select **Preferences** from the Docker Dashboard then **Advanced** from the **Resources** tab.
+To locate the disk image file, select **Settings** from the Docker Dashboard then **Advanced** from the **Resources** tab.
 
 The **Advanced** tab displays the location of the disk image. It also displays the maximum size of the disk image and the actual space the disk image is consuming. Note that other tools might display space usage of the file in terms of the maximum file size, and not the actual file size.
 
@@ -49,7 +49,7 @@ If the disk image file is too big, you can:
 
 To move the disk image file to a different location:
 
-1. Select **Preferences** then  **Advanced** from the **Resources** tab.
+1. Select **Settings** then  **Advanced** from the **Resources** tab.
 
 2. In the **Disk image location** section, click **Browse** and choose a new location for the disk image.
 
@@ -111,7 +111,7 @@ In this example, the actual size of the disk is `2333548` KB, whereas the maximu
 
 To reduce the maximum size of the disk image file:
 
-1. Select **Preferences** then  **Advanced** from the **Resources** tab.
+1. Select **Settings** then  **Advanced** from the **Resources** tab.
 
 2. The **Disk image size** section contains a slider that allows you to change the maximum size of the disk image. Adjust the slider to set a lower limit.
 

desktop/get-started.md

@@ -31,7 +31,7 @@ redirect_from:
 
   Once Docker Desktop is installed, the Quick Start Guide launches. It includes a simple exercise to build an example Docker image, run it as a container, push and save the image to Docker Hub.
 
-   ![Docker Quick Start tutorial](images/docker-tutorial-linux.png)
+   ![Docker Quick Start tutorial](images/docker-tutorial.png)
 
 To run the Quick Start Guide on demand, select the Docker menu ![whale menu](images/whale-x.svg){: .inline} and then choose **Quick Start Guide**.
 

desktop/kubernetes.md

@@ -20,7 +20,7 @@ workloads.
 ## Enable Kubernetes
 
 To enable Kubernetes in Docker Desktop:
-1. From the Docker Dashboard, select the **Setting** icon, or **Preferences** icon if you use a macOS.
+1. From the Docker Dashboard, select the **Settings**.
 2. Select **Kubernetes** from the left sidebar. 
 3. Next to **Enable Kubernetes**, select the checkbox.
 4. Select **Apply & Restart** to save the settings and then click **Install** to confirm. This instantiates images required to run the Kubernetes server as containers, and installs the `/usr/local/bin/kubectl` command on your machine.
@@ -74,7 +74,7 @@ For more information about `kubectl`, see the
 ## Disable Kubernetes
 
 To disable Kubernetes in Docker Desktop:
-1. From the Docker Dashboard, select the **Setting** icon, or **Preferences** icon if you use a macOS.
+1. From the Docker Dashboard, select the **Settings** icon.
 2. Select **Kubernetes** from the left sidebar. 
 3. Next to **Enable Kubernetes**, clear the checkbox
 4. Select **Apply & Restart** to save the settings.This stops and removes Kubernetes containers, and also removes the `/usr/local/bin/kubectl` command.

desktop/networking.md

@@ -82,7 +82,7 @@ services:
 
 ### Changing internal IP addresses
 
-The internal IP addresses used by Docker can be changed from the Settings, if you're a Windows user, or Preferences, if you use Mac or Linux. After changing IPs, it is necessary to reset the Kubernetes cluster and to leave any active Swarm.
+The internal IP addresses used by Docker can be changed from **Settings**. After changing IPs, it is necessary to reset the Kubernetes cluster and to leave any active Swarm.
 
 ### There is no docker0 bridge on the host
 

desktop/settings/mac.md

@@ -11,10 +11,10 @@ redirect_from:
 
 This page provides information on how to configure and manage your Docker Desktop settings.
 
-To navigate to **Preferences** either:
+To navigate to **Settings** either:
 
-- Select the Docker menu ![whale menu](../images/whale-x.svg){: .inline} and then **Preferences**
-- Select the **Preferences** icon from the Docker Dashboard.
+- Select the Docker menu ![whale menu](../images/whale-x.svg){: .inline} and then **Settings**
+- Select the **Settings** icon from the Docker Dashboard.
 
 ## General
 
@@ -241,6 +241,10 @@ You can also sign up to the [Developer Preview program](https://www.docker.com/c
 
 Turns on the experimental containerd image store. This brings new features like faster container startup performance by lazy-pulling images, and the ability to run Wasm applications with Docker.
 
+#### Use Rosetta for x86/AMD64 emulation on Apple Silicon. 
+
+Turns on Rosetta to accelerate x86/AMD64 binary emulation on Apple Silicon. This option is only available if you have turned on **Virtualization framework** in the **General** settings tab. 
+
 ### Experimental features
 
 {% include desktop-experimental.md %}

desktop/troubleshoot/known-issues.md

@@ -26,7 +26,7 @@ title: Known issues for Docker Desktop on Mac
   the Activity Monitor, and for some processes to consume a large amount of CPU
   resources. Reboot and restart Docker to resolve these issues.
 
-* Docker does not auto-start on login even when it is enabled in **Preferences**. This is related to a
+* Docker does not auto-start on login even when it is enabled in **Settings**. This is related to a
   set of issues with Docker helper, registration, and versioning.
 
 * Docker Desktop uses the `HyperKit` hypervisor

desktop/use-desktop/images.md

@@ -6,7 +6,7 @@ title: Explore Images
 
 The **Images**  view is a simple interface that lets you manage Docker images without having to use the CLI. By default, it displays a list of all Docker images on your local disk. 
 
-You can also view images in remote repositories, once you have signed in to Docker Hub. This allows you to collaborate with your team and manage your images directly through Docker Desktop.
+You can also view Hub images once you have signed in to Docker Hub. This allows you to collaborate with your team and manage your images directly through Docker Desktop.
 
 The **Images** view allows you to perform core operations such as running an image as a container, pulling the latest version of an image from Docker Hub, pushing the image to Docker Hub, and inspecting images.
 
@@ -16,9 +16,9 @@ The **Images** view displays metadata about the image such as the:
 - Date created
 - Size of the image.
 
-It also displays **In Use** tags next to images used by running and stopped containers.
+It also displays **In Use** tags next to images used by running and stopped containers. You can choose what information you want displayed by selecting the **More options** menu to the right of the search bar, and then use the toggle switches according to your preferences. 
 
-The **Images on disk** status bar displays the number of images and the total disk space used by the images.
+The **Images on disk** status bar displays the number of images and the total disk space used by the images and when this information was last refreshed.
 
 ## Manage your images
 
@@ -26,10 +26,9 @@ Use the **Search** field to search for any specific image.
 
 You can sort images by:
 
-- Name
-- Date created
-- Size
-
+- In use
+- Unused
+- Dangling
 
 ## Run an image as a container
 
@@ -49,7 +48,7 @@ Inspecting an image displays detailed information about the image such as the:
 - Date the image was created
 - Size of the image
 
-To inspect an image, hover over an image, select the **More options** button and then select **Inspect** from the dropdown menu. 
+To inspect an image, hover over an image, select the **More options** button and then select **View details** from the dropdown menu. 
 
 ## Pull the latest image from Docker Hub
 
@@ -93,17 +92,15 @@ The **Images** view also allows you to manage and interact with images in remote
 
 > **Note**
 >
-> If you have a paid Docker subscription and enabled [Vulnerability Scanning](../../docker-hub/vulnerability-scanning.md) in Docker Hub, the scan results appear on the Remote repositories tab.
+> If you have a paid Docker subscription and enabled [Vulnerability Scanning](../../docker-hub/vulnerability-scanning.md) in Docker Hub, the scan results appear on the **Hub** tab.
 The **Pull** option allows you to pull the latest version of the image from Docker Hub. The **View in Hub** option opens the Docker Hub page and displays detailed information about the image, such as the OS architecture, size of the image, the date when the image was pushed, and a list of the image layers.
 
 To interact with remote repositories:
 
-1. select the **Remote repositories** tab.
+1. Select the **Hub** tab.
 2. Select an organization from the drop-down list. This displays a list of repositories in your organization.
 3. Hover over an image from the list and then select **Pull** to pull the latest image from the remote repository.
 
 To view a detailed information about the image in Docker Hub, select the image and then select **View in Hub**.
 
 The **View in Hub** option opens the Docker Hub page and displays detailed information about the image, such as the OS architecture, size of the image, the date when the image was pushed, and a list of the image layers.
-
-If you have a paid Docker subscription and have enabled [Vulnerability Scanning](../../docker-hub/vulnerability-scanning.md) the Docker Hub page also displays a summary of the vulnerability scan report and provides detailed information about the vulnerabilities identified.

desktop/use-desktop/index.md

@@ -18,9 +18,19 @@ The **Volumes** view displays a list of volumes and allows you to easily create
 
 In addition, the Docker Dashboard allows you to:
 
-- Easily navigate to the **Preferences** (**Settings** in Windows) menu to configure Docker Desktop preferences. Select the **Preferences** or **Settings** icon in the Dashboard header.
+- Easily navigate to the **Settings** menu to configure Docker Desktop preferences. Select the **Settings** icon in the Dashboard header.
 - Access the **Troubleshoot** menu to debug and perform restart operations. Select the **Troubleshoot** icon in the Dashboard header.
 
+## Quick search
+
+From the Docker Dashboard you can use Quick Search, which is located in the Dashboard header, to search for:
+
+- Any container or Compose app on your local system. You can see an overview of associated environment variables or perform quick actions, such as start, stop, or delete.
+
+- Public Docker Hub images, local images, and images from remote repositories. Depending on the type of image you select, you can either pull the image by tag, view documentation, go to Docker Hub for more details, or run a new container using the image.
+
+- Extensions. From here, you can learn more about the extension and install it with a single click. Or, if you already have an extension installed, you can open it straight from the search results. 
+
 ## The Docker menu
 
 Docker Desktop also provides an easy-access tray icon that appears in the taskbar and is referred to as the Docker menu ![whale menu](../../assets/images/whale-x.svg){: .inline}.
@@ -28,8 +38,8 @@ Docker Desktop also provides an easy-access tray icon that appears in the taskba
 To display the Docker menu, right-click on the ![whale menu](../../assets/images/whale-x.svg){: .inline} icon. It displays the following options:
 
 - **Dashboard**. This takes you to the Docker Dashboard.
-- **Sign in/Create Dock Id**
-- **Settings**. Takes you to the Settings, or Preferences is you use a macOS.
+- **Sign in/Create Docker ID**
+- **Settings**
 - **Check for updates**
 - **Troubleshoot** 
 - **Switch to Windows containers**

desktop/use-desktop/pause.md

@@ -8,7 +8,7 @@ You can pause your Docker Desktop session when you are not actively using it and
 
 From the Docker menu, select![whale menu](../images/whale-x.svg){: .inline} and then **Pause** to pause Docker Desktop.
 
-Docker Desktop displays the paused status on the Docker menu and on the  **Containers**, **Images**, **Volumes**, and **Dev Environment** screens in Docker Dashboard. You can still access the **Preferences** (or **Settings** if you are a Windows user) and the **Troubleshoot** menu from the Dashboard when you've paused Docker Desktop.
+Docker Desktop displays the paused status on the Docker menu and on the  **Containers**, **Images**, **Volumes**, and **Dev Environment** screens in Docker Dashboard. You can still access the **Settings** and the **Troubleshoot** menu from the Dashboard when you've paused Docker Desktop.
 
 Select ![whale menu](../images/whale-x.svg){: .inline} then **Resume** to resume Docker Desktop.
 

get-started/kube-deploy.md

@@ -9,7 +9,7 @@ description: Learn how to describe and deploy a simple application on Kubernetes
 - Download and install Docker Desktop as described in [Get Docker](../get-docker.md).
 - Work through containerizing an application in [Part 2](02_our_app.md).
 - Make sure that Kubernetes is enabled on your Docker Desktop:
-  - **Mac**: Click the Docker icon in your menu bar, navigate to **Preferences** and make sure there's a green light beside 'Kubernetes'.
+  - **Mac**: Click the Docker icon in your menu bar, navigate to **Settings** and make sure there's a green light beside 'Kubernetes'.
   - **Windows**: Click the Docker icon in the system tray and navigate to **Settings** and make sure there's a green light beside 'Kubernetes'.
 
   If Kubernetes isn't running, follow the instructions in [Orchestration](orchestration.md) of this tutorial to finish setting it up.

get-started/orchestration.md

@@ -29,9 +29,9 @@ Docker Desktop will set up Kubernetes for you quickly and easily. Follow the set
 
 ### Mac
 
-1.  After installing Docker Desktop, you should see a Docker icon in your menu bar. Click on it, and navigate to **Preferences** > **Kubernetes**.
+1.  After installing Docker Desktop, you should see a Docker icon in your menu bar. Click on it, and navigate to **Settings** > **Kubernetes**.
 
-2.  Check the checkbox labeled **Enable Kubernetes**, and click **Apply & Restart**. Docker Desktop will automatically set up Kubernetes for you. You'll know that Kubernetes has been successfully enabled when you see a green light beside 'Kubernetes _running_' in the Preferences menu.
+2.  Check the checkbox labeled **Enable Kubernetes**, and click **Apply & Restart**. Docker Desktop will automatically set up Kubernetes for you. You'll know that Kubernetes has been successfully enabled when you see a green light beside 'Kubernetes _running_' in **Settings**.
 
 3.  In order to confirm that Kubernetes is up and running, create a text file called `pod.yaml` with the following content:
 

registry/insecure.md

@@ -26,7 +26,7 @@ isolated testing or in a tightly controlled, air-gapped environment.
     `/etc/docker/daemon.json` on Linux or
     `C:\ProgramData\docker\config\daemon.json` on Windows Server. If you use
     Docker Desktop for Mac or Docker Desktop for Windows, click the Docker icon, choose
-    **Preferences** (Mac) or **Settings** (Windows), and choose **Docker Engine**.
+    **Settings** and then choose **Docker Engine**.
 
     If the `daemon.json` file does not exist, create it. Assuming there are no
     other settings in the file, it should have the following contents: