Skip to content

Commit

Permalink
Merge pull request #1046 from p-l-/pre-release
Browse files Browse the repository at this point in the history
Update doc
  • Loading branch information
p-l- committed Dec 8, 2020
2 parents a66bf31 + 03fbe03 commit f4da564
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 4 deletions.
12 changes: 11 additions & 1 deletion MANIFEST
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ doc/index.rst
doc/license-external.rst
doc/license.rst
doc/dev/index.rst
doc/dev/linting.rst
doc/dev/tests.rst
doc/dev/web-api.rst
doc/install/agents.rst
Expand Down Expand Up @@ -75,9 +76,13 @@ ivre/utils.py
ivre/view.py
ivre/xmlnmap.py
ivre/zgrabout.py
ivre/active/__init__.py
ivre/active/cpe.py
ivre/active/data.py
ivre/analyzer/__init__.py
ivre/analyzer/dicom.py
ivre/analyzer/ike.py
ivre/analyzer/ntlm.py
ivre/db/__init__.py
ivre/db/elastic.py
ivre/db/http.py
Expand Down Expand Up @@ -187,6 +192,7 @@ web/static/doc/_sources/index.rst.txt
web/static/doc/_sources/license-external.rst.txt
web/static/doc/_sources/license.rst.txt
web/static/doc/_sources/dev/index.rst.txt
web/static/doc/_sources/dev/linting.rst.txt
web/static/doc/_sources/dev/tests.rst.txt
web/static/doc/_sources/dev/web-api.rst.txt
web/static/doc/_sources/install/agents.rst.txt
Expand All @@ -211,7 +217,7 @@ web/static/doc/_static/doctools.js
web/static/doc/_static/documentation_options.js
web/static/doc/_static/file.png
web/static/doc/_static/graphviz.css
web/static/doc/_static/jquery-3.4.1.js
web/static/doc/_static/jquery-3.5.1.js
web/static/doc/_static/jquery.js
web/static/doc/_static/language_data.js
web/static/doc/_static/logo.png
Expand Down Expand Up @@ -252,9 +258,13 @@ web/static/doc/_static/fonts/RobotoSlab/roboto-slab-v7-regular.eot
web/static/doc/_static/fonts/RobotoSlab/roboto-slab-v7-regular.ttf
web/static/doc/_static/fonts/RobotoSlab/roboto-slab-v7-regular.woff
web/static/doc/_static/fonts/RobotoSlab/roboto-slab-v7-regular.woff2
web/static/doc/_static/js/badge_only.js
web/static/doc/_static/js/html5shiv-printshiv.min.js
web/static/doc/_static/js/html5shiv.min.js
web/static/doc/_static/js/modernizr.min.js
web/static/doc/_static/js/theme.js
web/static/doc/dev/index.html
web/static/doc/dev/linting.html
web/static/doc/dev/tests.html
web/static/doc/dev/web-api.html
web/static/doc/install/agents.html
Expand Down
2 changes: 1 addition & 1 deletion tests/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -4882,7 +4882,7 @@ def parse_env():
)
# Elasticsearch insertion is asynchronous, this hack "ensures" the
# data has been inserted before continuing.
ELASTIC_INSERT_TEMPO = int(os.getenv("ES_INSERT_TEMPO", 1))
ELASTIC_INSERT_TEMPO = int(os.getenv("ES_INSERT_TEMPO", 2))


if __name__ == '__main__':
Expand Down
7 changes: 6 additions & 1 deletion web/static/doc/_static/pygments.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
pre { line-height: 125%; margin: 0; }
td.linenos pre { color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px; }
span.linenos { color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px; }
td.linenos pre.special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; }
span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; }
.highlight .hll { background-color: #ffffcc }
.highlight { background: #f8f8f8; }
.highlight { background: #f8f8f8; }
.highlight .c { color: #408080; font-style: italic } /* Comment */
.highlight .err { border: 1px solid #FF0000 } /* Error */
.highlight .k { color: #008000; font-weight: bold } /* Keyword */
Expand Down
1 change: 1 addition & 0 deletions web/static/doc/install/config.html
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,7 @@ <h2>Nmap scan templates<a class="headerlink" href="#nmap-scan-templates" title="
<span class="c1"># &quot;resolve&quot;: 1,</span>
<span class="c1"># &quot;verbosity&quot;: 2,</span>
<span class="c1"># &quot;ports&quot;: None,</span>
<span class="c1"># &quot;top_ports&quot;: None,</span>
<span class="s2">&quot;host_timeout&quot;</span><span class="p">:</span> <span class="s2">&quot;15m&quot;</span><span class="p">,</span> <span class="c1"># default value: None</span>
<span class="s2">&quot;script_timeout&quot;</span><span class="p">:</span> <span class="s2">&quot;2m&quot;</span><span class="p">,</span> <span class="c1"># default value: None</span>
<span class="s2">&quot;scripts_categories&quot;</span><span class="p">:</span> <span class="p">[</span><span class="s1">&#39;default&#39;</span><span class="p">,</span> <span class="s1">&#39;discovery&#39;</span><span class="p">,</span>
Expand Down
2 changes: 1 addition & 1 deletion web/static/doc/searchindex.js

Large diffs are not rendered by default.

0 comments on commit f4da564

Please sign in to comment.