diff --git a/website/source/docs/agent/configuration/client.html.md b/website/source/docs/agent/configuration/client.html.md
index 601a255c6..e06b05aab 100644
--- a/website/source/docs/agent/configuration/client.html.md
+++ b/website/source/docs/agent/configuration/client.html.md
@@ -46,7 +46,7 @@ client {
   job is allowed to wait to exit. Individual jobs may customize their own kill
   timeout, but it may not exceed this value.
 
-- `meta` <code>([Meta][]: nil)</code> - Specifies a key-value map that annotates
+- `meta` `(map[string]string: nil)` - Specifies a key-value map that annotates
   with user-defined metadata.
 
 - `network_interface` `(string: "lo | lo0")` - Specifies the name of the
@@ -299,5 +299,3 @@ client {
   }
 }
 ```
-
-[meta]: /docs/job-specification/meta.html "Nomad meta Job Specification"
diff --git a/website/source/docs/job-specification/constraint.html.md b/website/source/docs/job-specification/constraint.html.md
index eb7c87014..bbafbb7d6 100644
--- a/website/source/docs/job-specification/constraint.html.md
+++ b/website/source/docs/job-specification/constraint.html.md
@@ -24,9 +24,9 @@ description: |-
 </table>
 
 The `constraint` allows restricting the set of eligible nodes. Constraints may
-filter on [attributes][interpolation] or [metadata][meta]. Additionally
-constraints may be specified at the [job][job], [group][group], or [task][task]
-levels for ultimate flexibility.
+filter on [attributes][interpolation] or [client metadata][client-meta].
+Additionally constraints may be specified at the [job][job], [group][group], or
+[task][task] levels for ultimate flexibility.
 
 ```hcl
 job "docs" {
@@ -46,7 +46,7 @@ job "docs" {
     task "server" {
       # All tasks must run where "my_custom_value" is greater than 3.
       constraint {
-        attribute = "${meta.my_custom_value}"
+        attribute = "${node.meta.my_custom_value}"
         operator  = ">"
         value     = "3"
       }
@@ -217,6 +217,6 @@ constraint {
 
 [job]: /docs/job-specification/job.html "Nomad job Job Specification"
 [group]: /docs/job-specification/group.html "Nomad group Job Specification"
-[meta]: /docs/job-specification/meta.html "Nomad meta Job Specification"
+[client-meta]: /docs/agent/configuration/client.html#meta "Nomad meta Job Specification"
 [task]: /docs/job-specification/task.html "Nomad task Job Specification"
 [interpolation]: /docs/runtime/interpolation.html "Nomad interpolation"
diff --git a/website/source/docs/job-specification/job.html.md b/website/source/docs/job-specification/job.html.md
index e703aed1c..844dba133 100644
--- a/website/source/docs/job-specification/job.html.md
+++ b/website/source/docs/job-specification/job.html.md
@@ -219,5 +219,4 @@ $ VAULT_TOKEN="..." nomad run example.nomad
 [task]: /docs/job-specification/task.html "Nomad task Job Specification"
 [update]: /docs/job-specification/update.html "Nomad update Job Specification"
 [vault]: /docs/job-specification/vault.html "Nomad vault Job Specification"
-[meta]: /docs/job-specification/meta.html "Nomad meta Job Specification"
 [scheduler]: /docs/runtime/schedulers.html "Nomad Scheduler Types"
diff --git a/website/source/docs/runtime/interpolation.html.md b/website/source/docs/runtime/interpolation.html.md
index e8da3a22c..531dcb92a 100644
--- a/website/source/docs/runtime/interpolation.html.md
+++ b/website/source/docs/runtime/interpolation.html.md
@@ -92,12 +92,12 @@ driver.
     <td><tt>linux-64bit</tt></td>
   </tr>
   <tr>
-    <td><tt>${attr.&lt;property&gt;}</tt></td>
+    <td><tt>${node.attr.&lt;property&gt;}</tt></td>
     <td>Property given by <tt>property</tt> on the client</td>
     <td><tt>${attr.arch} => amd64</tt></td>
   </tr>
   <tr>
-    <td><tt>${meta.&lt;key&gt;}</tt></td>
+    <td><tt>${node.meta.&lt;key&gt;}</tt></td>
     <td>Metadata value given by <tt>key</tt> on the client</td>
     <td><tt>${meta.foo} => bar</tt></td>
   </tr>