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

minor edits.

Browse source 
Signed-off-by: Simei He <hesimei@zju.edu.cn>
This commit is contained in:
Simei He 2015-04-03 14:43:21 +08:00
parent 8d3d34d5e3
commit 8c578b8190
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -122,15 +122,17 @@ Finally, several networking options can only be provided when calling
[Binding container ports](#binding-ports)
To supply networking options to the Docker server at startup, use the
`DOCKER_OPTS` in the Docker upstart configuration file. For Ubuntu, edit the
variable in `/etc/default/docker` and `/etc/sysconfig/docker` for Centos.
`DOCKER_OPTS` variable in the Docker upstart configuration file. For Ubuntu, edit the
variable in `/etc/default/docker` or `/etc/sysconfig/docker` for CentOS.
The following example illustrates how to configure Docker on Ubuntu to recognize a
newly build bridge. Edit the `/etc/default/docker` file:
newly built bridge.
Edit the `/etc/default/docker` file:
$ echo 'DOCKER_OPTS="-b=bridge0"' >> /etc/default/docker
Then, restart the Docker server.
Then restart the Docker server.
$ sudo service docker start

2
docs/sources/reference/commandline/cli.md
View file

@ -2195,7 +2195,7 @@ available in the default container, you can set these using the `--ulimit` flag.
> If you do not provide a `hard limit`, the `soft limit` will be used for both
values. If no `ulimits` are set, they will be inherited from the default `ulimits`
set on the daemon.
> `as` option is disabled for now. In other words, the following script is not supported:
> `as` option is disabled now. In other words, the following script is not supported:
> `$docker run -it --ulimit as=1024 fedora /bin/bash`
## save