beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #11244 from ChristopherBiscardi/docs-code-fixes

Browse source 
Fix a few code rendering errors in docs
This commit is contained in:
Phil Estes 2015-03-11 08:34:53 -04:00
commit 95dcb27484
2 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
docs/sources/articles/networking.md
View file

@ -245,13 +245,11 @@ Whether a container can talk to the world is governed by two factors.
Docker will go set `ip_forward` to `1` for you when the server
starts up. To check the setting or turn it on manually:
```
$ cat /proc/sys/net/ipv4/ip_forward
0
$ echo 1 > /proc/sys/net/ipv4/ip_forward
$ cat /proc/sys/net/ipv4/ip_forward
1
```
$ sysctl net.ipv4.conf.all.forwarding
net.ipv4.conf.all.forwarding = 0
$ sysctl net.ipv4.conf.all.forwarding=1
$ sysctl net.ipv4.conf.all.forwarding
net.ipv4.conf.all.forwarding = 1
Many using Docker will want `ip_forward` to be on, to at
least make communication *possible* between containers and
@ -480,9 +478,7 @@ your host's interfaces you should set `accept_ra` to `2`. Otherwise IPv6
enabled forwarding will result in rejecting Router Advertisements. E.g., if you
want to configure `eth0` via Router Advertisements you should set:
```
$ sysctl net.ipv6.conf.eth0.accept_ra=2
```
![](/article-img/ipv6_basic_host_config.svg)

2
docs/sources/reference/run.md
View file

@ -493,7 +493,6 @@ By default, the container will be able to `read`, `write`, and `mknod` these dev
This can be overridden using a third `:rwm` set of options to each `--device` flag:
```
$ sudo docker run --device=/dev/sda:/dev/xvdc --rm -it ubuntu fdisk /dev/xvdc
Command (m for help): q
@ -507,7 +506,6 @@ This can be overridden using a third `:rwm` set of options to each `--device` fl
$ sudo docker run --device=/dev/sda:/dev/xvdc:m --rm -it ubuntu fdisk /dev/xvdc
fdisk: unable to open /dev/xvdc: Operation not permitted
```
In addition to `--privileged`, the operator can have fine grain control over the
capabilities using `--cap-add` and `--cap-drop`. By default, Docker has a default