Code drop from //branches/cupcake/...@124589

1 files changed, 27 insertions, 9 deletions

diff --git a/dhcpcd.conf.5.in b/dhcpcd.conf.5.in
index 5ba825f..899aea3 100644
--- a/dhcpcd.conf.5.in
+++ b/dhcpcd.conf.5.in
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd Jun 30, 2008
+.Dd August 18, 2008
 .Dt DHCPCD.CONF 5 SMM
 .Sh NAME
 .Nm dhcpcd.conf
@@ -43,9 +43,10 @@ Blank lines and lines starting with # are ignored.
 .Pp
 Here's a list of available options:
 .Bl -tag -width indent
-.It Ic classid Ar string
-Change the default classid sent from dhcpcd-version.
-If not set then none is sent.
+.It Ic background
+Background immediately.
+This is useful for startup scripts which don't disable link messages for
+carrier status.
 .It Ic clientid Ar string
 Change the default clientid sent from the interface hardware address.
 If the string is of the format 01:02:03 then it is encoded as hex.
@@ -71,10 +72,13 @@ if a FQDN (ie, contains a .) then it will be encoded as such.
 none disables FQDN encoding, ptr just asks the DHCP server to update the PTR
 record of the host in DNS whereas both also updates the A record.
 The current hostname or the hostname specified using the
-.Fl h , -hostname
+.Ic hostname
 option must be a FQDN.
 .Nm dhcpcd
 itself never does any DNS updates.
+.Nm dhcpcd
+encodes the FQDN hostname as specified in
+.Li RFC1035 .
 .It Ic interface Ar interface
 Subsequent options are only parsed for this
 .Ar interface .
@@ -96,14 +100,25 @@ See
 .Rs
 .%T "RFC 3927"
 .Re
-.It Ic option Ar dhcp-option
+.It Ic nolink
+Don't receive link messages about carrier status.
+You should only set this for buggy interface drivers.
+.It Ic option Ar option
 Requests the
-.Ar dhcp-option
+.Ar option
 from the server.
 It can be a variable to be used in
 .Xr dhcpcd-run-hooks 8
 or the numerical value.
-You can specify more seperated by commas, spaces or more option lines.
+You can specify more options seperated by commas, spaces or more option lines.
+.It Ic require Ar option
+Requires the
+.Ar option
+to be present in all DHCP messages, otherwise the message is ignored.
+It can be a variable to be used in
+.Xr dhcpcd-run-hooks 8
+or the numerical value.
+You can specify more options seperated by commas, spaces or more require lines.
 .It Ic script Ar script
 Use
 .Ar script
@@ -115,7 +130,7 @@ be too long or too short and can be changed here.
 .It Ic userclass Ar string
 Tag the DHCP messages with the userclass.
 You can specify more than one.
-.It vendor Ar code , Ns Ar value
+.It Ic vendor Ar code , Ns Ar value
 Add an enscapulated vendor option.
 .Ar code
 should be between 1 and 254 inclusive.
@@ -127,6 +142,9 @@ Set the vendor option 02 with a hex code.
 .D1 vendor 02,01:02:03:04:05
 Set the vendor option 03 with an IP address as a string.
 .D1 vendor 03,\e"192.168.0.2\e"
+.It Ic vendorclassid Ar string
+Change the default vendorclassid sent from dhcpcd-version.
+If not set then none is sent.
 .El
 .Sh SEE ALSO
 .Xr dhcpcd-run-hooks 8 ,