Victor Hu b2d87962a3 Merge branch 'master' into skeleton ...

Conflicts:
	docs/source/guides/admin-guides/basic_concepts/network_planning/network_service/index.rst
	docs/source/guides/admin-guides/basic_concepts/xcat_object/index.rst
	docs/source/guides/admin-guides/basic_concepts/xcat_object/node.rst

Merging code added by commit d13fd1bd9e1334ba52b6707a8181e0beb244c59f

2015-08-13 23:13:31 -04:00

..

global_cfg

Add the doc skeleton for \'Admin Guide\'->\'Basic Concept\'

2015-08-13 10:19:55 -04:00

network_planning

Refine the doc skeleton in the Basic Concept part

2015-08-13 22:32:05 -04:00

xcat_db

Refine the doc skeleton in the Basic Concept part

2015-08-13 22:32:05 -04:00

xcat_object

Merge branch 'master' into skeleton

2015-08-13 23:13:31 -04:00

index.rst

Add the doc skeleton for \'Admin Guide\'->\'Basic Concept\'

2015-08-13 10:19:55 -04:00