2
0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-07 14:00:07 +00:00

4 Commits

Author SHA1 Message Date
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
wangxiaopeng
af9368827a Refine the doc skeleton in the Basic Concept part
Since it has been discussed with Victor, I check it in directly
2015-08-13 22:32:05 -04:00
Victor Hu
e88bb075fa Made some changes to the basic_concepts, mostly what I had discussed with Xiao Peng
through xcat2/xcat-doc pull request #14
2015-08-13 16:17:54 -04:00
wangxiaopeng
3044e9c6cf Add the doc skeleton for \'Admin Guide\'->\'Basic Concept\'
If we all agree with the format, we will add others
2015-08-13 10:19:55 -04:00