1 files changed, 37 insertions, 13 deletions
diff --git a/bin/nsupdate/nsupdate.html b/bin/nsupdate/nsupdate.html
index 276d4af6fbe1d..2e71ec1b1a479 100644
--- a/bin/nsupdate/nsupdate.html
+++ b/bin/nsupdate/nsupdate.html
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2004-2012 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004-2012, 2014 Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000-2003 Internet Software Consortium.
  - 
  - Permission to use, copy, modify, and/or distribute this software for any
@@ -29,10 +29,10 @@
 </div>
 <div class="refsynopsisdiv">
 <h2>Synopsis</h2>
-<div class="cmdsynopsis"><p><code class="command">nsupdate</code>  [<code class="option">-d</code>] [<code class="option">-D</code>] [[<code class="option">-g</code>] |  [<code class="option">-o</code>] |  [<code class="option">-l</code>] |  [<code class="option">-y <em class="replaceable"><code>[<span class="optional">hmac:</span>]keyname:secret</code></em></code>] |  [<code class="option">-k <em class="replaceable"><code>keyfile</code></em></code>]] [<code class="option">-t <em class="replaceable"><code>timeout</code></em></code>] [<code class="option">-u <em class="replaceable"><code>udptimeout</code></em></code>] [<code class="option">-r <em class="replaceable"><code>udpretries</code></em></code>] [<code class="option">-R <em class="replaceable"><code>randomdev</code></em></code>] [<code class="option">-v</code>] [filename]</p></div>
+<div class="cmdsynopsis"><p><code class="command">nsupdate</code>  [<code class="option">-d</code>] [<code class="option">-D</code>] [[<code class="option">-g</code>] |  [<code class="option">-o</code>] |  [<code class="option">-l</code>] |  [<code class="option">-y <em class="replaceable"><code>[<span class="optional">hmac:</span>]keyname:secret</code></em></code>] |  [<code class="option">-k <em class="replaceable"><code>keyfile</code></em></code>]] [<code class="option">-t <em class="replaceable"><code>timeout</code></em></code>] [<code class="option">-u <em class="replaceable"><code>udptimeout</code></em></code>] [<code class="option">-r <em class="replaceable"><code>udpretries</code></em></code>] [<code class="option">-R <em class="replaceable"><code>randomdev</code></em></code>] [<code class="option">-v</code>] [<code class="option">-V</code>] [filename]</p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2543464"></a><h2>DESCRIPTION</h2>
+<a name="id2543479"></a><h2>DESCRIPTION</h2>
 <p><span><strong class="command">nsupdate</strong></span>
       is used to submit Dynamic DNS Update requests as defined in RFC 2136
       to a name server.
@@ -113,7 +113,13 @@
       [<span class="optional"><em class="parameter"><code>hmac:</code></em></span>]<em class="parameter"><code>keyname:secret.</code></em>
       <em class="parameter"><code>keyname</code></em> is the name of the key, and
       <em class="parameter"><code>secret</code></em> is the base64 encoded shared secret.
-      Use of the <code class="option">-y</code> option is discouraged because the
+      <em class="parameter"><code>hmac</code></em> is the name of the key algorithm;
+      valid choices are <code class="literal">hmac-md5</code>,
+      <code class="literal">hmac-sha1</code>, <code class="literal">hmac-sha224</code>,
+      <code class="literal">hmac-sha256</code>, <code class="literal">hmac-sha384</code>, or
+      <code class="literal">hmac-sha512</code>.  If <em class="parameter"><code>hmac</code></em>
+      is not specified, the default is <code class="literal">hmac-md5</code>.
+      NOTE: Use of the <code class="option">-y</code> option is discouraged because the
       shared secret is supplied as a command line argument in clear text.
       This may be visible in the output from
       <span class="citerefentry"><span class="refentrytitle">ps</span>(1)</span>
@@ -190,9 +196,13 @@
       <code class="filename">keyboard</code> indicates that keyboard input
       should be used.  This option may be specified multiple times.
     </p>
+<p>
+      The -V option causes <span><strong class="command">nsupdate</strong></span> to print the
+      version number and exit.
+    </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2543796"></a><h2>INPUT FORMAT</h2>
+<a name="id2543849"></a><h2>INPUT FORMAT</h2>
 <p><span><strong class="command">nsupdate</strong></span>
       reads input from
       <em class="parameter"><code>filename</code></em>
@@ -296,14 +306,16 @@
             </p></dd>
 <dt><span class="term">
               <span><strong class="command">key</strong></span>
-               {name}
+               [hmac:] {keyname}
                {secret}
             </span></dt>
 <dd><p>
               Specifies that all updates are to be TSIG-signed using the
-              <em class="parameter"><code>keyname</code></em> <em class="parameter"><code>keysecret</code></em> pair.
-              The <span><strong class="command">key</strong></span> command
-              overrides any key specified on the command line via
+              <em class="parameter"><code>keyname</code></em> <em class="parameter"><code>secret</code></em> pair.
+              If <em class="parameter"><code>hmac</code></em> is specified, then it sets the
+              signing algorithm in use; the default is
+              <code class="literal">hmac-md5</code>.  The <span><strong class="command">key</strong></span>
+              command overrides any key specified on the command line via
               <code class="option">-y</code> or <code class="option">-k</code>.
             </p></dd>
 <dt><span class="term">
@@ -472,6 +484,18 @@
 <dd><p>
               Turn on debugging.
             </p></dd>
+<dt><span class="term">
+              <span><strong class="command">version</strong></span>
+            </span></dt>
+<dd><p>
+              Print version number.
+            </p></dd>
+<dt><span class="term">
+              <span><strong class="command">help</strong></span>
+            </span></dt>
+<dd><p>
+              Print a list of commands.
+            </p></dd>
 </dl></div>
 <p>
     </p>
@@ -480,7 +504,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2544725"></a><h2>EXAMPLES</h2>
+<a name="id2544823"></a><h2>EXAMPLES</h2>
 <p>
       The examples below show how
       <span><strong class="command">nsupdate</strong></span>
@@ -534,7 +558,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2544769"></a><h2>FILES</h2>
+<a name="id2544867"></a><h2>FILES</h2>
 <div class="variablelist"><dl>
 <dt><span class="term"><code class="constant">/etc/resolv.conf</code></span></dt>
 <dd><p>
@@ -557,7 +581,7 @@
 </dl></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2542121"></a><h2>SEE ALSO</h2>
+<a name="id2544950"></a><h2>SEE ALSO</h2>
 <p>
       <em class="citetitle">RFC 2136</em>,
       <em class="citetitle">RFC 3007</em>,
@@ -572,7 +596,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2542179"></a><h2>BUGS</h2>
+<a name="id2542004"></a><h2>BUGS</h2>
 <p>
       The TSIG key is redundantly stored in two separate files.
       This is a consequence of nsupdate using the DST library