From e88bb075fac8c16e5fea29182be036cce11ea10f Mon Sep 17 00:00:00 2001
From: Victor Hu <whowutwut@gmail.com>
Date: Thu, 13 Aug 2015 16:17:54 -0400
Subject: [PATCH] Made some changes to the basic_concepts, mostly what I had
 discussed with Xiao Peng through xcat2/xcat-doc pull request #14

---
 .../basic_concepts/.index.rst.swp             | Bin 12288 -> 0 bytes
 .../network_service/index.rst                 |   6 +++--
 .../basic_concepts/xcat_db/index.rst          |  25 ++++++++++++------
 .../basic_concepts/xcat_object/index.rst      |  17 +++++-------
 .../basic_concepts/xcat_object/node.rst       |   6 +++++
 .../basic_concepts/xcat_object/nodegroup.rst  |   2 ++
 .../basic_concepts/xcat_object/osimage.rst    |   2 ++
 7 files changed, 38 insertions(+), 20 deletions(-)
 delete mode 100644 source/guides/admin-guides/basic_concepts/.index.rst.swp
 create mode 100644 source/guides/admin-guides/basic_concepts/xcat_object/node.rst
 create mode 100644 source/guides/admin-guides/basic_concepts/xcat_object/nodegroup.rst
 create mode 100644 source/guides/admin-guides/basic_concepts/xcat_object/osimage.rst

diff --git a/source/guides/admin-guides/basic_concepts/.index.rst.swp b/source/guides/admin-guides/basic_concepts/.index.rst.swp
deleted file mode 100644
index 5e9b341daae6fbc3805c0b84facdaf1895e3c713..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeI&y-ve05C`xpBNF0kWHB%|DFq2B5(`WW3=CyMkz<=S(Arhvh%AU#VBsZr4Hy}D
z0eFK-JOGy}NNtyPV4?b3I=MbyD*LxZxukV<ej$#7BjT|^ls&z7zDJvMdCk9_^HqA@
zD3XDlS5xhW%4rjJQ{O9+uvF4FwNrtXHdV%yX~?TQ%w3Twt}0S(@=)qQYMb>Uk$I|O
z<*YJ8pNFZ{rVO%tp))RWKGZ;9xdqnfuzk>~?zq3VE4H^f%Y9wk4gwH>00bZa0SG_<
z0uY!I@WTc@a%QE@uGVv7X0Df*AOHafKmY;|fB*y_009U<00I#BhXPU)?W_~U9M$*#
z-}nC!ufI4xIX*bvI9@qkIG#BkIL6QX!#m^15P$##AOHafKmY;|fB*y_0D(Ui5JFhv
z?_G8m5Bt*E)OIKO)_J$vcZuxB>SiWiwa3RgnJykDU2<!bpV%P&n`j_Q&0X=mNVF*k
Ygm=nk#zYa($<(0Js)=5l)lKyD1EmRUQvd(}

diff --git a/source/guides/admin-guides/basic_concepts/network_planning/network_service/index.rst b/source/guides/admin-guides/basic_concepts/network_planning/network_service/index.rst
index 54dd662bd..3500770e1 100644
--- a/source/guides/admin-guides/basic_concepts/network_planning/network_service/index.rst
+++ b/source/guides/admin-guides/basic_concepts/network_planning/network_service/index.rst
@@ -1,2 +1,4 @@
-Network Services which are used in xCAT
-==================================
+Network Services
+================
+
+The following network services are used by xCAT...
diff --git a/source/guides/admin-guides/basic_concepts/xcat_db/index.rst b/source/guides/admin-guides/basic_concepts/xcat_db/index.rst
index a202a8c9f..d3d4212fd 100644
--- a/source/guides/admin-guides/basic_concepts/xcat_db/index.rst
+++ b/source/guides/admin-guides/basic_concepts/xcat_db/index.rst
@@ -1,11 +1,20 @@
-xCAT Database
-=============
+Database
+========
 
-Definition of xCAT DB
----------------------
+xCAT stores all the persistent data used to manage clusters in a database. 
 
-How to Manipulate xCAT DB
--------------------------
+As the administrator, you can use a set of table oriented commands to modify the data (**recommended**), or directly modify the table using the ``tabedit`` command.
 
-How to Use Regular Expression in xCAT DB
-----------------------------------------
+For a more indepth overview see the manpage for xcatdb: ``man xcatdb``
+
+Commands
+--------
+
+Object Definitions
+------------------
+
+Node Groups
+-----------
+
+Regular Expressions
+-------------------
diff --git a/source/guides/admin-guides/basic_concepts/xcat_object/index.rst b/source/guides/admin-guides/basic_concepts/xcat_object/index.rst
index a9eb888ce..18d20f912 100644
--- a/source/guides/admin-guides/basic_concepts/xcat_object/index.rst
+++ b/source/guides/admin-guides/basic_concepts/xcat_object/index.rst
@@ -1,12 +1,9 @@
-xCAT Object
-===========
+Objects
+=======
 
-Node Object
------------
-Node Range
+.. toctree::
+   :maxdepth: 2
 
-OSimage Object
---------------
-
-Group Object
-------------
+   node.rst
+   osimage.rst
+   nodegroup.rst 
diff --git a/source/guides/admin-guides/basic_concepts/xcat_object/node.rst b/source/guides/admin-guides/basic_concepts/xcat_object/node.rst
new file mode 100644
index 000000000..556ff1f59
--- /dev/null
+++ b/source/guides/admin-guides/basic_concepts/xcat_object/node.rst
@@ -0,0 +1,6 @@
+``node``
+========
+
+Node Range
+----------
+
diff --git a/source/guides/admin-guides/basic_concepts/xcat_object/nodegroup.rst b/source/guides/admin-guides/basic_concepts/xcat_object/nodegroup.rst
new file mode 100644
index 000000000..ff17a64c9
--- /dev/null
+++ b/source/guides/admin-guides/basic_concepts/xcat_object/nodegroup.rst
@@ -0,0 +1,2 @@
+``nodegroup``
+=============
diff --git a/source/guides/admin-guides/basic_concepts/xcat_object/osimage.rst b/source/guides/admin-guides/basic_concepts/xcat_object/osimage.rst
new file mode 100644
index 000000000..c4549b949
--- /dev/null
+++ b/source/guides/admin-guides/basic_concepts/xcat_object/osimage.rst
@@ -0,0 +1,2 @@
+``osimage``
+===========