summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2019-01-15 13:43:04 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2019-01-15 13:43:04 +0100
commita9d1b2dbf4a6808bd0d2e841e32802f5bffb362a (patch)
treef5af1f80e4a215d1a5829aa5ea4f4458c4de61af /Documentation
parent53227ec3c16fe50d7a3ca4020d3cb98878eeaa18 (diff)
parent92a1e1b0f19aedcc1ec7b4e34f6597b4340cf96a (diff)
downloadbarebox-a9d1b2dbf4a6808bd0d2e841e32802f5bffb362a.tar.gz
Merge branch 'for-next/net'
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/user/networking.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/user/networking.rst b/Documentation/user/networking.rst
index 6bb99b0..9231ebd 100644
--- a/Documentation/user/networking.rst
+++ b/Documentation/user/networking.rst
@@ -45,8 +45,8 @@ device:
| | | any directly visible subnet. May be set |
| | | automatically by DHCP. |
+------------------------------+--------------+------------------------------------------------+
-| global.net.server | ipv4 host | The default server address. If unspecified, may|
-| | | be set by DHCP |
+| global.net.server | hostname or | The default server. If unspecified, may be set |
+| | ipv4 address | by DHCP |
+------------------------------+--------------+------------------------------------------------+
| global.net.nameserver | ipv4 address | The DNS server used for resolving host names. |
| | | May be set by DHCP |