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

Merge pull request #6611 from SvenDowideit/remove-spurious-dollar-signs 

Remove `$` leaders from examples of editing text in a file
This commit is contained in:
James Turnbull 2014-06-23 01:13:42 -04:00
parent ad19e5e133 4d7e28a7d7
commit 09e694aa7d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs/sources/installation/ubuntulinux.md
View File

@ -244,18 +244,18 @@ To install the latest version of docker, use the standard
If you want to enable memory and swap accounting, you must add the If you want to enable memory and swap accounting, you must add the
following command-line parameters to your kernel: following command-line parameters to your kernel:
$ cgroup_enable=memory swapaccount=1 cgroup_enable=memory swapaccount=1
On systems using GRUB (which is the default for Ubuntu), you can add On systems using GRUB (which is the default for Ubuntu), you can add
those parameters by editing `/etc/default/grub` and those parameters by editing `/etc/default/grub` and
extending `GRUB_CMDLINE_LINUX`. Look for the extending `GRUB_CMDLINE_LINUX`. Look for the
following line: following line:
$ GRUB_CMDLINE_LINUX="" GRUB_CMDLINE_LINUX=""
And replace it by the following one: And replace it by the following one:
$ GRUB_CMDLINE_LINUX="cgroup_enable=memory swapaccount=1" GRUB_CMDLINE_LINUX="cgroup_enable=memory swapaccount=1"
Then run `sudo update-grub`, and reboot. Then run `sudo update-grub`, and reboot.
@ -283,7 +283,7 @@ forwarding:
# Change: # Change:
# DEFAULT_FORWARD_POLICY="DROP" # DEFAULT_FORWARD_POLICY="DROP"
# to # to
$ DEFAULT_FORWARD_POLICY="ACCEPT" DEFAULT_FORWARD_POLICY="ACCEPT"
Then reload UFW: Then reload UFW:
@ -316,7 +316,7 @@ Docker daemon for the containers:
$ sudo nano /etc/default/docker $ sudo nano /etc/default/docker
--- ---
# Add: # Add:
$ DOCKER_OPTS="--dns 8.8.8.8" DOCKER_OPTS="--dns 8.8.8.8"
# 8.8.8.8 could be replaced with a local DNS server, such as 192.168.1.1 # 8.8.8.8 could be replaced with a local DNS server, such as 192.168.1.1
# multiple DNS servers can be specified: --dns 8.8.8.8 --dns 192.168.1.1 # multiple DNS servers can be specified: --dns 8.8.8.8 --dns 192.168.1.1