From d75aabc5aadf04c622002e1d828651bd9a9a45c0 Mon Sep 17 00:00:00 2001
From: Mark Walkom <markw@campaignmonitor.com>
Date: Mon, 16 Jun 2014 20:52:23 +1000
Subject: [PATCH] Docs: Added tables for directory locations for deb+rpm and
 zip+tar.gz installs

Closes #6508
---
 docs/reference/setup/dir-layout.asciidoc | 67 +++++++++++++++++++-----
 1 file changed, 55 insertions(+), 12 deletions(-)

diff --git a/docs/reference/setup/dir-layout.asciidoc b/docs/reference/setup/dir-layout.asciidoc
index 2971c45e568..5144ac9cab7 100644
--- a/docs/reference/setup/dir-layout.asciidoc
+++ b/docs/reference/setup/dir-layout.asciidoc
@@ -3,23 +3,19 @@
 
 The directory layout of an installation is as follows:
 
-[cols="<,<,<,<",options="header",]
+[cols="<h,<,<m,<m",options="header",]
 |=======================================================================
-|Type |Description |Default Location |Setting
-|*home* |Home of elasticsearch installation | | `path.home`
+| Type | Description | Default Location | Setting
+| home | Home of elasticsearch installation. | | path.home
 
-|*bin* |Binary scripts including `elasticsearch` to start a node | `{path.home}/bin` |
+| bin | Binary scripts including `elasticsearch` to start a node. | {path.home}/bin | | conf | Configuration files including `elasticsearch.yml` | {path.home}/config | path.conf
 
-|*conf* |Configuration files including `elasticsearch.yml` |`{path.home}/config` |`path.conf`
+| data | The location of the data files of each index / shard allocated
+on the node. Can hold multiple locations. | {path.home}/data| path.data
 
-|*data* |The location of the data files of each index / shard allocated
-on the node. Can hold multiple locations. |`{path.home}/data`|`path.data`
+| logs | Log files location. | {path.home}/logs | path.logs
 
-|*work* |Temporal files that are used by different nodes. |`{path.home}/work` |`path.work`
-
-|*logs* |Log files location |`{path.home}/logs` |`path.logs`
-
-|*plugins* |Plugin files location. Each plugin will be contained in a subdirectory. |`{path.home}/plugins` |`path.plugins`
+| plugins | Plugin files location. Each plugin will be contained in a subdirectory. | {path.home}/plugins | path.plugins
 |=======================================================================
 
 The multiple data locations allows to stripe it. The striping is simple,
@@ -45,3 +41,50 @@ Or the in an array format:
 ----------------------------------------
 path.data: ["/mnt/first", "/mnt/second"]
 ----------------------------------------
+
+
+[float]
+[[Default Paths]]
+=== Default Paths
+
+Below are the default paths that elasticsearch will use, if not explictly changed.
+
+==== deb and rpm
+[cols="<h,<,<m,<m",options="header",]
+|=======================================================================
+| Type | Description | Location Debian/Ubuntu | Location RHEL/CentOS
+| home | Home of elasticsearch installation. | /usr/share/elasticsearch | /usr/share/elasticsearch
+
+| bin | Binary scripts including `elasticsearch` to start a node. | /usr/share/elasticsearch/bin | /usr/share/elasticsearch/bin
+
+| conf | Configuration files `elasticsearch.yml` and `logging.yml`. | /etc/elasticsearch | /etc/elasticsearch
+
+| conf | Environment variables including heap size, file descriptors. | /etc/default/elasticseach | /etc/sysconfig/elasticsearch
+
+| data | The location of the data files of each index / shard allocated
+on the node. | /var/lib/elasticsearch/data | /var/lib/elasticsearch
+
+| logs | Log files location | /var/log/elasticsearch | /var/log/elasticsearch
+
+| plugins | Plugin files location. Each plugin will be contained in a subdirectory. | /usr/share/elasticsearch/plugins | /usr/share/elasticsearch/plugins
+|=======================================================================
+
+==== zip and tar.gz
+[cols="<h,<,<m",options="header",]
+|=======================================================================
+| Type | Description | Location
+| home | Home of elasticsearch installation | {extract.path}
+
+| bin | Binary scripts including `elasticsearch` to start a node | {extract.path}/bin
+
+| conf | Configuration files `elasticsearch.yml` and `logging.yml` | {extract.path}/config
+
+| conf | Environment variables including heap size, file descriptors | {extract.path}/config
+
+| data | The location of the data files of each index / shard allocated
+on the node | {extract.path}/data
+
+| logs | Log files location | {extract.path}/logs
+
+| plugins | Plugin files location. Each plugin will be contained in a subdirectory | {extract.path}/plugins
+|=======================================================================