Skip to content

Commit d13450f

Browse files
authored
Merge pull request #21234 from docker/published-update
publish updates from main
2 parents 2aba00a + c905ce0 commit d13450f

File tree

13 files changed

+15
-14
lines changed

13 files changed

+15
-14
lines changed

content/get-started/docker-concepts/running-containers/sharing-local-files.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ $ docker run -v HOST-DIRECTORY:/CONTAINER-DIRECTORY:rw nginx
5959

6060
Read-only bind mounts let the container access the mounted files on the host for reading, but it can't change or delete the files. With read-write bind mounts, containers can modify or delete mounted files, and these changes or deletions will also be reflected on the host system. Read-only bind mounts ensures that files on the host can't be accidentally modified or deleted by a container.
6161

62-
> **Synchronised File Share**
62+
> **Synchronized File Share**
6363
>
6464
> As your codebase grows larger, traditional methods of file sharing like bind mounts may become inefficient or slow, especially in development environments where frequent access to files is necessary. [Synchronized file shares](/desktop/synchronized-file-sharing/) improve bind mount performance by leveraging synchronized filesystem caches. This optimization ensures that file access between the host and virtual machine (VM) is fast and efficient.
6565

content/guides/golang/build-images.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ build context is the set of files located in the specified path or URL. The
265265
Docker build process can access any of the files located in the context.
266266

267267
The build command optionally takes a `--tag` flag. This flag is used to label
268-
the image with a string value, which is easy for humans to read and recognise.
268+
the image with a string value, which is easy for humans to read and recognize.
269269
If you don't pass a `--tag`, Docker will use `latest` as the default value.
270270

271271
Build your first Docker image.

content/guides/golang/develop.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ func main() {
222222

223223
db, err := initStore()
224224
if err != nil {
225-
log.Fatalf("failed to initialise the store: %s", err)
225+
log.Fatalf("failed to initialize the store: %s", err)
226226
}
227227
defer db.Close()
228228

content/guides/localstack.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ To start the frontend service, open a new terminal and follow these steps:
215215

216216
## Connecting to LocalStack from containerized Node app
217217

218-
Now that you have learnt how to connect a non-containerized Node.js application to LocalStack, it's time to explore the necessary changes to run the complete application stack in a containerised environment. To achieve this, you will create a Compose file specifying all required services - frontend, backend, database, and LocalStack.
218+
Now that you have learnt how to connect a non-containerized Node.js application to LocalStack, it's time to explore the necessary changes to run the complete application stack in a containerized environment. To achieve this, you will create a Compose file specifying all required services - frontend, backend, database, and LocalStack.
219219

220220
1. Examine the Docker Compose file.
221221

content/guides/pre-seeding.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ Assuming that you have an existing Postgres database instance up and running, fo
152152

153153
In Docker, mounting refers to making files or directories from the host system accessible within a container. This let you to share data or configuration files between the host and the container, enabling greater flexibility and persistence.
154154

155-
Now that you have learned how to launch Postgres and pre-seed the database using an SQL script, it’s time to learn how to mount an SQL file directly into the Postgres containers’ initialisation directory (`/docker-entrypoint-initdb.d`). The `/docker-entrypoint-initdb.d` is a special directory in PostgreSQL Docker containers that is used for initializing the database when the container is first started
155+
Now that you have learned how to launch Postgres and pre-seed the database using an SQL script, it’s time to learn how to mount an SQL file directly into the Postgres containers’ initialization directory (`/docker-entrypoint-initdb.d`). The `/docker-entrypoint-initdb.d` is a special directory in PostgreSQL Docker containers that is used for initializing the database when the container is first started
156156

157157
Make sure you stop any running Postgres containers (along with volumes) to prevent port conflicts before you follow the steps:
158158

content/manuals/desktop/dev-environments/create-dev-env.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ If your WSL 2 distribution doesn't have an `ssh-agent` running, you can append t
4848
```bash
4949
SSH_ENV="$HOME/.ssh/agent-environment"
5050
function start_agent {
51-
echo "Initialising new SSH agent..."
51+
echo "Initializing new SSH agent..."
5252
/usr/bin/ssh-agent | sed 's/^echo/#echo/' > "${SSH_ENV}"
5353
echo succeeded
5454
chmod 600 "${SSH_ENV}"

content/manuals/desktop/previous-versions/2.x-windows.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ Docker Desktop 2.4.0.0 contains a Kubernetes upgrade. Your local Kubernetes clus
8787
- Copy container logs without ansi colors to clipboard. Fixes [docker/for-mac#4786](https://github.com/docker/for-mac/issues/4786).
8888
- Fix application startup if `hosts` is specified inside the Docker `daemon.json`. See [docker/for-win#6895](https://github.com/docker/for-win/issues/6895#issuecomment-637429117)
8989
- Fixed DNS resolution of short names. See [docker/for-win#4425](https://github.com/docker/for-win/issues/4425).
90-
- Switched from `chronyd` to `sntpcd` to work around host time synchronisation problems. Fixes [docker/for-win#4526](https://github.com/docker/for-win/issues/4526).
90+
- Switched from `chronyd` to `sntpcd` to work around host time synchronization problems. Fixes [docker/for-win#4526](https://github.com/docker/for-win/issues/4526).
9191
- Avoid blocking startup if "Expose daemon on tcp://localhost:2375 without TLS" is set and `localhost:2375` is in use by another program. See [docker/for-win#6929](https://github.com/docker/for-win/issues/6929) [docker/for-win#6961](https://github.com/docker/for-win/issues/6961).
9292
- Fixed an issue where adding a folder on a non-existing drive in the settings would create an empty entry. See [docker/for-win#6797](https://github.com/docker/for-win/issues/6797).
9393
- Avoid failing with "Function not implemented" during file I/O on shared volumes. Fixes [docker/for-win#5955](https://github.com/docker/for-win/issues/5955)

content/manuals/desktop/previous-versions/edge-releases-mac.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -767,7 +767,7 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus
767767
- Allow orchestrator selection from the UI in the "Kubernetes" pane, to allow "docker stack" commands to deploy to Swarm clusters, even if Kubernetes is enabled in Docker for Mac.
768768

769769
* Bug fixes and minor changes
770-
- Use Simple NTP to minimise clock drift between the virtual machine and the host. Fixes [docker/for-mac#2076](https://github.com/docker/for-mac/issues/2076)
770+
- Use Simple NTP to minimize clock drift between the virtual machine and the host. Fixes [docker/for-mac#2076](https://github.com/docker/for-mac/issues/2076)
771771
- Fix filesystem event notifications for Swarm services and those using the new-style --mount option. Fixes [docker/for-mac#2216](https://github.com/docker/for-mac/issues/2216), [docker/for-mac#2375](https://github.com/docker/for-mac/issues/2375)
772772
- Fix filesystem event delivery to Kubernetes pods when the path to the bind mount is a symlink.
773773
- Fix a race between calling stat on a file and calling close of a file descriptor referencing the file that could result in the stat failing with EBADF (often presented as "File not found"). Fixes [docker/for-mac#2870](https://github.com/docker/for-mac/issues/2870)
@@ -824,7 +824,7 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus
824824

825825
* Bug fixes and minor changes
826826
- Fix support for AUFS. Fixes [docker/for-win#1831](https://github.com/docker/for-win/issues/1831)
827-
- Fix synchronisation between CLI `docker login` and GUI login.
827+
- Fix synchronization between CLI `docker login` and GUI login.
828828

829829
### Docker Community Edition 18.03.0-ce-rc3-mac56 2018-03-13
830830

content/manuals/desktop/release-notes.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ Take a look at the [Docker Public Roadmap](https://github.com/orgs/docker/projec
9494
### Known issues
9595

9696
#### For Mac
97+
9798
- Since version 4.34.0, the toggle "Allow privileged port mapping" in the Advanced settings does not work. For more information, see [docker/for-mac#7460](https://github.com/docker/for-mac/issues/7460).
9899

99100
#### For Windows

content/manuals/desktop/troubleshoot/topics.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ Performance tab on the Task Manager. Alternatively, you can type 'systeminfo' in
296296
If you manually uninstall Hyper-V, WSL 2 or turn off virtualization,
297297
Docker Desktop cannot start.
298298

299-
To turn on nested virtualisation, see [Run Docker Desktop for Windows in a VM or VDI environment](../vm-vdi.md#turn-on-nested-virtualization).
299+
To turn on nested virtualization, see [Run Docker Desktop for Windows in a VM or VDI environment](../vm-vdi.md#turn-on-nested-virtualization).
300300

301301
#### Hypervisor enabled at Windows startup
302302

0 commit comments

Comments
 (0)