diff --git a/_sources/crisk.txt b/_sources/crisk.txt
index 0fdb656..acfdb73 100644
--- a/_sources/crisk.txt
+++ b/_sources/crisk.txt
@@ -1,11 +1,59 @@
-The crisk Module
-================
+The ``crisk`` Package
+=====================
-.. module:: crisk
+.. automodule:: crisk
-.. module:: crisk.mainview
+.. currentmodule:: crisk.model
+.. automodule:: crisk.model
-The crisk.reports Module
-========================
+.. autoclass:: Basic
+ :members:
+
+.. autoclass:: Asset
+ :members:
+
+.. autoclass:: Vulnerability
+ :members:
+
+.. autoclass:: Threat
+ :members:
+
+.. autoclass:: Owner
+ :members:
+
+.. currentmodule:: crisk.mainview
+.. automodule:: crisk.mainview
+
+.. autoclass:: Step
+ :members:
+
+.. autoclass:: MainView
+ :members:
+
+.. automodule:: crisk.basicsview
+.. currentmodule:: crisk.basicsview
+
+.. autoclass:: BasicsView
+ :members:
+
+.. automodule:: crisk.inventoryview
+.. currentmodule:: crisk.inventoryview
+
+.. autoclass:: InventoryView
+ :members:
+
+.. autoclass:: InventoryAddEdit
+ :members:
+
+.. autoclass:: vuln
+ :members:
+
+.. autoclass:: TempModel
+ :members:
+
+.. automodule:: crisk.vulnerabilitiesview
+.. currentmodule:: crisk.vulnerabilitiesview
+
+.. autoclass:: VulnerabilitiesView
+ :members:
-.. automodule:: crisk.reports
diff --git a/_sources/index.txt b/_sources/index.txt
index e8a253d..1cd258a 100644
--- a/_sources/index.txt
+++ b/_sources/index.txt
@@ -26,10 +26,10 @@ Contents
.. toctree::
:maxdepth: 2
- crisk
screenshots
using
-
+ todo
+ crisk
Indices and tables
==================
diff --git a/_sources/todo.txt b/_sources/todo.txt
new file mode 100644
index 0000000..8314218
--- /dev/null
+++ b/_sources/todo.txt
@@ -0,0 +1,15 @@
+Stuff to do
+===========
+
+You can suggest more features or report bugs on our `issue tracking system `_
+
+Next features
+-------------
+
+* Vulnerability per asset report
+* Import `OpenVAS `_ reports
+
+Future features
+---------------
+
+* Adding controls funcionality
diff --git a/_sources/using.txt b/_sources/using.txt
index 25c0425..b1aa015 100644
--- a/_sources/using.txt
+++ b/_sources/using.txt
@@ -4,9 +4,17 @@ Using Crisk
Analyzing servers and computers
-------------------------------
+This is the most direct way to use Crisk. Assign each server/computer an owner on the asset screen, and make sure to include its value. You can consider the hardware value only or add the value of the information stored on that asset.
+
+You can also add other assets like network appliances, routers, etc. and consider the value as how important those items are for the network as a whole.
+
+
Analyzing information
---------------------
-Analyzing software
-------------------
+This works the same way as above, but consider information only while adding to the assets. This way of working is more independent of hardware and computers and can facilitate analysis of processes.
+
+The Risk Matrix
+---------------
+The Vulnerabilities report includes a Risk Matrix. The risk matrix is a scatter graphic that shows where the risks are concentrated on the analysis. The bigger the circle, the most vulnerabilities are concentrated on that point. The green area shows where vulnerabilities are hard to occur (low probability) and/or have less impact (low severity). On the other hand, the red area shows where the vulnerabilities are more likely to happen (high probability) and/or have more impact (high severity).
diff --git a/_static/criskicon.ico b/_static/criskicon.ico
new file mode 100644
index 0000000..421389b
Binary files /dev/null and b/_static/criskicon.ico differ
diff --git a/_static/default.css b/_static/default.css
index ed177c5..eaad6d1 100644
--- a/_static/default.css
+++ b/_static/default.css
@@ -5,7 +5,7 @@
body {
font-family: sans-serif;
font-size: 100%;
- background-color: #11303d;
+ background-color: #dbecac;
color: #000;
margin: 0;
padding: 0;
diff --git a/_static/logo.png b/_static/logo.png
new file mode 100644
index 0000000..7a91792
Binary files /dev/null and b/_static/logo.png differ
diff --git a/_static/sidebarlogo.png b/_static/sidebarlogo.png
new file mode 100644
index 0000000..e078ddf
Binary files /dev/null and b/_static/sidebarlogo.png differ
diff --git a/_static/sphinxdoc.css b/_static/sphinxdoc.css
index 2c63178..168a152 100644
--- a/_static/sphinxdoc.css
+++ b/_static/sphinxdoc.css
@@ -10,7 +10,7 @@ body {
line-height: 150%;
text-align: center;
/*background-color: #AFC1C4; */
- background-color: #BFD1D4;
+ background-color: #dbecac;
color: black;
padding: 0;
border: 1px solid #aaa;
diff --git a/crisk.html b/crisk.html
index 41d15f1..a40e9b8 100644
--- a/crisk.html
+++ b/crisk.html
@@ -2,8 +2,8 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
The Kiwi BaseView, using GladeDelegate. Provides the main tree, menu bars and
+status bar. Also provides the placeholder frame on the right where the kiwi
+SlaveViews will be shown.
This class is a temporary model copy of the Asset defined in crisk.model.Asset,
+used to block direct alterations to the DB while adding or editing assets (thus
+giving the option to cancel).
+
+
+
+
+
Parameters:
+
name (String) – The name of the asset
+
description (String) – The short description of the asset
This is the most direct way to use Crisk. Assign each server/computer an owner on the asset screen, and make sure to include its value. You can consider the hardware value only or add the value of the information stored on that asset.
+
You can also add other assets like network appliances, routers, etc. and consider the value as how important those items are for the network as a whole.
This works the same way as above, but consider information only while adding to the assets. This way of working is more independent of hardware and computers and can facilitate analysis of processes.
The Vulnerabilities report includes a Risk Matrix. The risk matrix is a scatter graphic that shows where the risks are concentrated on the analysis. The bigger the circle, the most vulnerabilities are concentrated on that point. The green area shows where vulnerabilities are hard to occur (low probability) and/or have less impact (low severity). On the other hand, the red area shows where the vulnerabilities are more likely to happen (high probability) and/or have more impact (high severity).