summaryrefslogtreecommitdiffstats
path: root/wiki/src/doc/advanced_topics.index.mdwn
diff options
context:
space:
mode:
authorsajolida <sajolida@pimienta.org>2015-03-12 21:04:38 +0000
committersajolida <sajolida@pimienta.org>2015-03-12 21:04:38 +0000
commit9521041358d810a84b68c95737bb8c38b941b58d (patch)
tree6cdd787e676ca49fe6ca26a2299cdbc273dca162 /wiki/src/doc/advanced_topics.index.mdwn
parent21cb50b78231659077c82df50a59495fec38af55 (diff)
parentae5801509508d14d1b431bb648f3348b36297ce6 (diff)
Merge branch 'doc/5685-new_software' (Closes: #5685)
Conflicts: wiki/src/doc/first_steps/startup_options/administration_password.mdwn
Diffstat (limited to 'wiki/src/doc/advanced_topics.index.mdwn')
-rw-r--r--wiki/src/doc/advanced_topics.index.mdwn1
1 files changed, 1 insertions, 0 deletions
diff --git a/wiki/src/doc/advanced_topics.index.mdwn b/wiki/src/doc/advanced_topics.index.mdwn
index 24f1e1b..e650e00 100644
--- a/wiki/src/doc/advanced_topics.index.mdwn
+++ b/wiki/src/doc/advanced_topics.index.mdwn
@@ -1,3 +1,4 @@
+ - [[!traillink Install_additional_software|advanced_topics/additional_software]]
- [[!traillink Protection_against_cold_boot_attacks|advanced_topics/cold_boot_attacks]]
- [[!traillink Virtualization|advanced_topics/virtualization]]
- [[!traillink <span_class="application">VirtualBox</span>|advanced_topics/virtualization/virtualbox]]