docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1365 from docker/master 

Merge September patch relnotes branch
This commit is contained in:
Usha Mandya 2019-10-07 13:20:21 +01:00 committed by GitHub
parent f3363e15fd a279b2dd24
commit ceff564ab9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker-hub/deactivate-account.md
View File

@ -30,6 +30,7 @@ Before deactivating your Docker Hub account, please complete the following:
Once you have completed all the steps above, you may deactivate your account. On Docker Hub, go to **_Your Account_** > **Accounts Settings** > **Deactivate Account**. Once you have completed all the steps above, you may deactivate your account. On Docker Hub, go to **_Your Account_** > **Accounts Settings** > **Deactivate Account**.
> This cannot be undone! Be sure you've gathered all the data you need from your account before deactivating it. > This cannot be undone! Be sure you've gathered all the data you need from your account before deactivating it.
{: .warning }
## Deactivating an organization ## Deactivating an organization
@ -48,3 +49,4 @@ Before deactivating an organization, please complete the following:
Once you have completed all the steps above, you may deactivate your organization. On Docker Hub, go to **Organizations** > **_Your Organization_** > **Settings** > **Deactivate Org**. Once you have completed all the steps above, you may deactivate your organization. On Docker Hub, go to **Organizations** > **_Your Organization_** > **Settings** > **Deactivate Org**.
> This cannot be undone! Be sure you've gathered all the data you need from your organization before deactivating it. > This cannot be undone! Be sure you've gathered all the data you need from your organization before deactivating it.
{: .warning }

2
get-started/part2.md
View File

@ -90,7 +90,7 @@ This `Dockerfile` refers to a couple of files we haven't created yet, namely
Create two more files, `requirements.txt` and `app.py`, and put them in the same Create two more files, `requirements.txt` and `app.py`, and put them in the same
folder with the `Dockerfile`. This completes our app, which as you can see is folder with the `Dockerfile`. This completes our app, which as you can see is
quite simple. When the above `Dockerfile` is built into an image, `app.py` and quite simple. When the above `Dockerfile` is built into an image, `app.py` and
`requirements.txt` is present because of that `Dockerfile`'s `COPY` command, `requirements.txt` are present because of that `Dockerfile`'s `COPY` command,
and the output from `app.py` is accessible over HTTP thanks to the `EXPOSE` and the output from `app.py` is accessible over HTTP thanks to the `EXPOSE`
command. command.