diff --git a/content/en/docs/reference/command-line-tools-reference/federation-apiserver.md b/content/en/docs/reference/command-line-tools-reference/federation-apiserver.md
index 64e573dede..8b05597c87 100644
--- a/content/en/docs/reference/command-line-tools-reference/federation-apiserver.md
+++ b/content/en/docs/reference/command-line-tools-reference/federation-apiserver.md
@@ -1,21 +1,24 @@
-## federation-apiserver
-
-
-
-### Synopsis
+---
+title: federation-apiserver
+content_template: templates/tool-reference
+weight: 70
+---
 
+{{% capture synopsis %}}
 
 The Kubernetes federation API server validates and configures data
 for the api objects which include pods, services, replicationcontrollers, and
 others. The API Server services REST operations and provides the frontend to the
 cluster's shared state through which all other components interact.
 
+{{% /capture %}}
+
+{{% capture options %}}
+
 ```
 federation-apiserver [flags]
 ```
 
-### Options
-
 ```
       --admission-control-config-file string                    File with admission control configuration.
       --advertise-address ip                                    The IP address on which to advertise the apiserver to members of the cluster. This address must be reachable by the rest of the cluster. If blank, the --bind-address will be used. If --bind-address is unspecified, the host's default interface will be used.
@@ -145,4 +148,4 @@ VolumeScheduling=true|false (ALPHA - default=false)
       --watch-cache-sizes strings                               List of watch cache sizes for every resource (pods, nodes, etc.), comma separated. The individual override format: resource[.group]#size, where resource is lowercase plural (no version), group is optional, and size is a number. It takes effect when watch-cache is enabled. Some resources (replicationcontrollers, endpoints, nodes, pods, services, apiservices.apiregistration.k8s.io) have system defaults set by heuristics, others default to default-watch-cache-size
 ```
 
-###### Auto generated by spf13/cobra on 26-Mar-2019
+{{% /capture %}}
\ No newline at end of file
diff --git a/content/en/docs/reference/command-line-tools-reference/federation-controller-manager.md b/content/en/docs/reference/command-line-tools-reference/federation-controller-manager.md
index 51ae0bcb26..ba9118c1dc 100644
--- a/content/en/docs/reference/command-line-tools-reference/federation-controller-manager.md
+++ b/content/en/docs/reference/command-line-tools-reference/federation-controller-manager.md
@@ -1,9 +1,10 @@
-## federation-controller-manager
-
-
-
-### Synopsis
+---
+title: federation-controller-manager
+content_template: templates/tool-reference
+weight: 80
+---
 
+{{% capture synopsis %}}
 
 The federation controller manager is a daemon that embeds
 the core control loops shipped with federation. In applications of robotics and
@@ -13,12 +14,14 @@ state of the federation cluster through the apiserver and makes changes attempti
 to move the current state towards the desired state. Examples of controllers that
 ship with federation today is the cluster controller.
 
+{{% /capture %}}
+
+{{% capture options %}}
+
 ```
 federation-controller-manager [flags]
 ```
 
-### Options
-
 ```
       --address ip                             The IP address to serve on (set to 0.0.0.0 for all interfaces) (default 0.0.0.0)
       --cluster-monitor-period duration        The period for syncing ClusterStatus in ClusterController. (default 40s)
@@ -51,4 +54,4 @@ federation-controller-manager [flags]
       --zone-name string                       Zone name, like example.com.
 ```
 
-###### Auto generated by spf13/cobra on 26-Mar-2019
+{{% /capture %}}