diff --git a/docs/_static/add_interface.png b/docs/_static/add_interface.png
index 43f32020d4edc8c7c09cb24556866c5dc2c49c87..e496d4ae9a94b9c39e14cae3cbd356ce03401b4e 100644
Binary files a/docs/_static/add_interface.png and b/docs/_static/add_interface.png differ
diff --git a/docs/_static/create_item.png b/docs/_static/create_item.png
index c436d923d9349330470875d2b4120f4c6e58899c..5e8cd0a0a61e1ca414524fe6c6e9682818521060 100644
Binary files a/docs/_static/create_item.png and b/docs/_static/create_item.png differ
diff --git a/docs/_static/create_vioc.png b/docs/_static/create_vioc.png
new file mode 100644
index 0000000000000000000000000000000000000000..a55c47ef04c60916b0c0641f5c1fd127d12d1b86
Binary files /dev/null and b/docs/_static/create_vioc.png differ
diff --git a/docs/_static/create_vm.png b/docs/_static/create_vm.png
new file mode 100644
index 0000000000000000000000000000000000000000..33282990d7b599af26adf7e6add6aeaf5a4596bd
Binary files /dev/null and b/docs/_static/create_vm.png differ
diff --git a/docs/_static/create_vm_confirmation.png b/docs/_static/create_vm_confirmation.png
new file mode 100644
index 0000000000000000000000000000000000000000..32f50b5377c3221bd49bc2279dc386aaef3b9ab8
Binary files /dev/null and b/docs/_static/create_vm_confirmation.png differ
diff --git a/docs/_static/csentry-test.png b/docs/_static/csentry-test.png
new file mode 100644
index 0000000000000000000000000000000000000000..dca9493187e324e285f2f58b8b5fe304e889c94d
Binary files /dev/null and b/docs/_static/csentry-test.png differ
diff --git a/docs/_static/edit_item_stack_member.png b/docs/_static/edit_item_stack_member.png
new file mode 100644
index 0000000000000000000000000000000000000000..621ed9a84d1c294da7d901aa8269b1b61f691202
Binary files /dev/null and b/docs/_static/edit_item_stack_member.png differ
diff --git a/docs/_static/item_created.png b/docs/_static/item_created.png
index 715aa1d00e1cf36ae94a03796dfdcc85cd066e4d..ac12d2c674a71d7905260b9abaf44d72c6a08825 100644
Binary files a/docs/_static/item_created.png and b/docs/_static/item_created.png differ
diff --git a/docs/_static/register_host.png b/docs/_static/register_host.png
index e505185d845f4853342cb434a3783d913b70e395..8ae0d4cc9819e2a48d468bc5930e9b7ad02be00f 100644
Binary files a/docs/_static/register_host.png and b/docs/_static/register_host.png differ
diff --git a/docs/_static/view_host_network.png b/docs/_static/view_host_network.png
new file mode 100644
index 0000000000000000000000000000000000000000..4db1aa481f5e932b5ef575724bfbc4fd82b36f26
Binary files /dev/null and b/docs/_static/view_host_network.png differ
diff --git a/docs/index.rst b/docs/index.rst
index afc465791d38d218ff802bd8c6c219f26891c48d..b3f04e90414a57e88630c236001b5764482e3106 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -19,9 +19,12 @@ You need to login with your ESS username to access the application.
.. image:: _static/login.png
-Note that some screenshos might show the https://csentry-test.esss.lu.se address. This is a test instance of CSEntry.
+Note that some screenshots might show the https://csentry-test.esss.lu.se address. This is a test instance of CSEntry.
It can be used by anyone for testing. You can add and edit data. But the database might be erased at any time!
Don't rely on it to keep your data and don't mix it with the official application.
+You can easily identify it by the **CSEntry-test** displayed in red in the navigation bar.
+
+.. image:: _static/csentry-test.png
Please use the navigation sidebar on the left to begin.
diff --git a/docs/network.rst b/docs/network.rst
index a51002b109af18968cb8b9cb12826fd40074a4a2..00a39ee4753846ebbe3e3efd603cddd7c14ca6c2 100644
--- a/docs/network.rst
+++ b/docs/network.rst
@@ -3,12 +3,14 @@
Network
=======
+Overview
+--------
+
CSEntry allows to register networks and hosts.
A **network scope** defines a range of VLAN and a supernet where **networks** can be assigned.
A **host** can be a physical or virtual machine. It includes one or more **interfaces**.
-
.. image:: _static/network.png
Clicking on an **hostname** will take you to the *View host* page.
@@ -18,6 +20,18 @@ Clicking on an **hostname** will take you to the *View host* page.
On that page you can see all the host's details.
You can add extra interfaces, edit the existing interfaces or edit the host information.
+For network switches, you can see the list of stack members.
+
+.. image:: _static/view_host_network.png
+
+Stack members should be defined by linking an item to an host from the inventory *Edit item* page:
+
+.. image:: _static/edit_item_stack_member.png
+
+
+Register a new host
+-------------------
+
To register a new host, you should:
1. Enter a hostname.
@@ -26,10 +40,33 @@ To register a new host, you should:
4. Choose the network for the primary interface. The first available IP address on that network is automatically filled.
You should not modify it except if you have a specific reason.
5. For physical machines, you have to enter the MAC address. A random one is automatically generated for virtual machines.
- 6. Click Submit.
+ 6. If the host is an IOC, you should select the **IOC** tag. It should be selected by default depending on the device type. Unselect it otherwise.
+ 7. Click Submit.
.. image:: _static/register_host.png
If you need more than one interface, you should go to the *Add interface* pane from the *View host* page.
.. image:: _static/add_interface.png
+
+DNS and DHCP update
+-------------------
+
+Any creation or update of an host will automatically trigger an update of the core services on the Technical Network (DNS and DHCP).
+
+VM creation
+-----------
+
+This is currently restricted to admin users!
+
+From the *View host* page, you can trigger the creation of a Virtual machine:
+
+.. image:: _static/create_vm.png
+
+If the host is an IOC (the interface should have the **IOC** tag), the form will be slightly different:
+
+.. image:: _static/create_vioc.png
+
+In both case, a confirmation dialog will be displayed when you submit the form.
+
+.. image:: _static/create_vm_confirmation.png