From e44f4a2d5c26e0998e9ab42e86b33f9561df0efc Mon Sep 17 00:00:00 2001
From: Janet Kuo <chiachenk@google.com>
Date: Wed, 5 Oct 2016 14:24:14 -0700
Subject: [PATCH] Remove third-party page and make one page for all tools

---
 _data/tools.yml                 |  2 --
 docs/tools/index.md             | 37 ++++++++++++++++++++++++++++++---
 docs/tools/third-party-tools.md | 27 ------------------------
 3 files changed, 34 insertions(+), 32 deletions(-)
 delete mode 100644 docs/tools/third-party-tools.md

diff --git a/_data/tools.yml b/_data/tools.yml
index a6c03cdf6f..8993e091bb 100644
--- a/_data/tools.yml
+++ b/_data/tools.yml
@@ -2,5 +2,3 @@ bigheader: "Tools"
 toc:
 - title: Tools
   path: /docs/tools/
-- title: Third-Party Tools
-  path: /docs/tools/third-party-tools/
diff --git a/docs/tools/index.md b/docs/tools/index.md
index 9f4e57ec76..31d5fe985e 100644
--- a/docs/tools/index.md
+++ b/docs/tools/index.md
@@ -1,9 +1,40 @@
 ---
+assignees:
+- janetkuo
+
 ---
 
-The Tools section of the Kubernetes documentation is a work in progress
+* TOC
+{:toc}
 
-#### Third-Party Tools
+## Native Tools
 
-* [Recommended third-party tools, including Helm and Kompose](/docs/tasks/third-party-tools)
+### Kubectl 
 
+[`kubectl`](docs/user-guide/kubectl/) is the command line tool for Kubernetes. It controls the Kubernetes cluster manager.
+
+### Dashboard 
+
+[Dashboard](docs/user-guide/ui/), the web-based user interface of Kubernetes, allows you to deploy containerized applications
+to a Kubernetes cluster, troubleshoot them, and manage the cluster and its resources itself. 
+
+## Third-Party Tools
+
+### Helm
+
+[Kubernetes Helm](https://github.com/kubernetes/helm) is a tool for managing packages of pre-configured
+Kubernetes resources, aka Kubernetes charts.
+
+Use Helm to: 
+
+* Find and use popular software packaged as Kubernetes charts
+* Share your own applications as Kubernetes charts
+* Create reproducible builds of your Kubernetes applications
+* Intelligently manage your Kubernetes manifest files
+* Manage releases of Helm packages
+
+### Kompose 
+
+[`kompose`](https://github.com/skippbox/kompose) is a tool to help users familiar with `docker-compose`
+move to Kubernetes. It takes a Docker Compose file and translates it into Kubernetes objects. `kompose`
+is a convenient tool to go from local Docker development to managing your application with Kubernetes.
diff --git a/docs/tools/third-party-tools.md b/docs/tools/third-party-tools.md
deleted file mode 100644
index dd54a94181..0000000000
--- a/docs/tools/third-party-tools.md
+++ /dev/null
@@ -1,27 +0,0 @@
----
-assignees:
-- janetkuo
-
----
-
-* TOC
-{:toc}
-
-## Helm
-
-[Kubernetes Helm](https://github.com/kubernetes/helm) is a tool for managing packages of pre-configured
-Kubernetes resources, aka Kubernetes charts.
-
-Use Helm to: 
-
-* Find and use popular software packaged as Kubernetes charts
-* Share your own applications as Kubernetes charts
-* Create reproducible builds of your Kubernetes applications
-* Intelligently manage your Kubernetes manifest files
-* Manage releases of Helm packages
-
-## Kompose 
-
-[`kompose`](https://github.com/skippbox/kompose) is a tool to help users familiar with `docker-compose`
-move to Kubernetes. It takes a Docker Compose file and translates it into Kubernetes objects. `kompose`
-is a convenient tool to go from local Docker development to managing your application with Kubernetes.