diff --git a/doc.zih.tu-dresden.de/docs/application/Access.md b/doc.zih.tu-dresden.de/docs/application/Access.md
index f673950adf912e0428acaaca7e72d693f8a05f68..b3bc9340471c02fd49153f25b8f3ed03b7d06a11 100644
--- a/doc.zih.tu-dresden.de/docs/application/Access.md
+++ b/doc.zih.tu-dresden.de/docs/application/Access.md
@@ -1,138 +1,111 @@
# Project Application for using the High Performance Computers
-In order to use the HPC systems installed at ZIH, an application form
-has to be filled in. The project applications are reviewed by the
-[Scientific Advisory
-Board](https://tu-dresden.de/zih/die-einrichtung/wissenschaftlicher-beirat)
-of the ZIH. The approval of the requested resources is always valid for
-one year. The project duration for your project can span more than one
-year, but the resources will be granted for each year individually.
-
-**The HPC project manager should hold a professorship (university) or
-head a research group. The project manager is called to inform the ZIH
-about any changes according the staff of the project (retirements, a
-change to another institute).\<br /> (That is also regarding trial
-accounts. And also trial accounts have to fill in the application
-form.)\<br />**
-
-It is invariably possible to apply for more/different resources. Whether
-additional resources are granted or not depends on the current
-allocations and on the availablility of the installed systems.
-
-The terms of use of the HPC systems are only \<a href="TermsOfUse"
-target="\_blank" title="NutzungsbedingungenHPC">available in German\</a>
-- at the moment.
+In order to use the HPC systems installed at ZIH, an application form has to be filled in. The
+project applications are reviewed by the
+[Scientific Advisory Board](https://tu-dresden.de/zih/die-einrichtung/wissenschaftlicher-beirat)
+of the ZIH. The approval of the requested resources is always valid for one year. The project
+duration for your project can span more than one year, but the resources will be granted for each
+year individually.
+
+**The HPC project manager should hold a professorship (university) or head a research group. The
+project manager is called to inform the ZIH about any changes according the staff of the project
+(retirements, a change to another institute).\<br /> (That is also regarding trial accounts. And
+also trial accounts have to fill in the application form.)\<br />**
+
+It is invariably possible to apply for more/different resources. Whether additional resources are
+granted or not depends on the current allocations and on the availablility of the installed systems.
+
+The terms of use of the HPC systems are only [available in German](TermsOfUse.md) - at the
+moment.
## Online Project Application
-You may also apply for the "Schnupperaccount" (trial account) of up to
-43.000 CPU hours for one year (3500 CPUh per month). If you would like
-to continue after this, a **complete project application** is required
-(see below).
-
-For obtaining access to the machines, the following forms have to be
-filled in: 1 an [online
-application](https://hpcprojekte.zih.tu-dresden.de/) form for the
-project (one form per project). The data will be stored automatically in
-a database.\<br />\<br /> 1 Users/guests at TU Dresden without a
-ZIH-login have to fill in the following \<a
-href="<http://tu-dresden.de/die_tu_dresden/zentrale_einrichtungen/zih/dienste/formulare/projektantrag/dateien/ZIH_HPC_login_eng.pdf>"
-target="\_blank" title="Login High Performance Computers">pdf\</a>
-additionally. \<br />TUD-external Users fill please \<a
-href="<http://tu-dresden.de/die_tu_dresden/zentrale_einrichtungen/zih/dienste/formulare/projektantrag/dateien/ZIH_HPC_login_externe_eng.pdf>"
-target="\_blank" title="HPClogin-externe">this form (pdf)\</a> to get a
-login.\<br />Please sign and stamp it and send it by fax to +49 351
-46342328, or by mail to TU Dresden, ZIH - Service Desk, 01062 Dresden,
-Germany.\<br />\<br />To add members with a valid ZIH-login to your
-project(s), please use this website:
-<https://hpcprojekte.zih.tu-dresden.de/managers/> \<br />(Access for
-proposers with valid ZIH-login after submission of the online
-application (see1.) )
-
-** \<u>**subsequent applications / view for project leader:**\</u>\<br
-/>**
+You may also apply for the "Schnupperaccount" (trial account) of up to 43.000 CPU hours for one year
+(3500 CPUh per month). If you would like to continue after this, a **complete project application**
+is required (see below).
-Subsequent applications will be neccessary,
+For obtaining access to the machines, the following forms have to be filled in:
+
+1. an [online application](https://hpcprojekte.zih.tu-dresden.de/) form for the project (one form
+ per project). The data will be stored automatically in a database.
-- if the end of project is reached
-- if the applied resources won't be sufficient
+1. Users/guests at TU Dresden without a ZIH-login have to fill in the following
+ [pdf] **todo** additionally. TUD-external Users fill please [this form (pdf)] **todo**
+ to get a login. Please sign
+ and stamp it and send it by fax to +49 351 46342328, or by mail to TU Dresden, ZIH - Service
+ Desk, 01062 Dresden, Germany. To add members with a valid ZIH-login to your
+ project(s), please use this website: (https://hpcprojekte.zih.tu-dresden.de/managers/)
+ (Access for proposers with valid ZIH-login after submission of the online application (see1.))
-The project leader and one person instructed by him, the project
-administrator, should use \<a
-href="<https://hpcprojekte.zih.tu-dresden.de/managers/>"
-target="\_blank">this website\</a>.\<br /> (ZIH-login neccessary)\<br />
-\<br /> At this website you have an overview of your projects, the usage
-of resources, you can submit subsequent applications, and you are able
-to add staff members to your project.
+### Subsequent applications / view for project leader
-
+Subsequent applications will be neccessary,
+
+- if the end of project is reached
+- if the applied resources won't be sufficient
+
+The project leader and one person instructed by him, the project administrator, should use
+[this website](https://hpcprojekte.zih.tu-dresden.de/managers/) (ZIH-login neccessary). At this
+website you have an overview of your projects, the usage of resources, you can submit subsequent
+applications, and you are able to add staff members to your project.
## Complete Project Application
Some reference points for an extended description of the application
form are:
-- Presentation of the problem and description of project content (with
- references of publications)
-- Description of achieved preliminary work, pre-studies with results,
- experiences
-- Description of target objectives and target cognitions
-- Description of physical and mathematical methods or solutions
-- An idea of resources you need (time, number of CPUs, parallel use of
- CPUs)
-- 1-2 figures are helpful to understand the description
-
-
+- Presentation of the problem and description of project content (with
+ references of publications)
+- Description of achieved preliminary work, pre-studies with results,
+ experiences
+- Description of target objectives and target cognitions
+- Description of physical and mathematical methods or solutions
+- An idea of resources you need (time, number of CPUs, parallel use of
+ CPUs)
+- 1-2 figures are helpful to understand the description
-#### Here are some templates in German/English and Word/LaTeX.
+### Here are some templates in German/English and Word/LaTeX.
Word-template(
[German](http://tu-dresden.de/die_tu_dresden/zentrale_einrichtungen/zih/dienste/formulare/projektantrag/dateien/zih-projektantrag-lang.doc),
-[English](http://tu-dresden.de/die_tu_dresden/zentrale_einrichtungen/zih/dienste/formulare/projektantrag/dateien/zih-application-long.doc))
+[English](http://tu-dresden.de/die_tu_dresden/zentrale_einrichtungen/zih/dienste/formulare/projektantrag/dateien/zih-application-long.doc))
LaTeX-template(
[German](http://tu-dresden.de/die_tu_dresden/zentrale_einrichtungen/zih/dienste/formulare/projektantrag/dateien/zih-projektantrag-lang.tex),
[English](http://tu-dresden.de/die_tu_dresden/zentrale_einrichtungen/zih/dienste/formulare/projektantrag/dateien/zih-application-long.tex))
-#### A small petition:
+#### A small petition
-If you plan to publish a paper with results based on the used CPU hours
-of our machines, please insert in the acknowledgement an small part with
-thank for the support by the machines of the ZIH/TUD. (see example
-below) Please send us a link/reference to the paper if it was puplished.
-It will be very helpfull for the next acquirement of compute power.
-Thank you very much.
+If you plan to publish a paper with results based on the used CPU hours of our machines, please
+insert in the acknowledgement an small part with thank for the support by the machines of the
+ZIH/TUD. (see example below) Please send us a link/reference to the paper if it was puplished. It
+will be very helpfull for the next acquirement of compute power. Thank you very much.
Two examples:
-- The computations were performed on an Bull Cluster TAURUS at the
- Center for Information Services and High Performance Computing (ZIH)
- at TU Dresden.
-- or We thank the Center for Information Services and High Performance
- Computing (ZIH) at TU Dresden for generous allocations of computer
- time.
-
-###
-
-
+- The computations were performed on an Bull Cluster TAURUS at the
+ Center for Information Services and High Performance Computing (ZIH)
+ at TU Dresden.
+- or We thank the Center for Information Services and High Performance
+ Computing (ZIH) at TU Dresden for generous allocations of computer
+ time.
## Access for Lectures/Courses
-You would like to use the clusters at ZIH for your courses? No
-problem.\<br />Please initiate a normal project application (see above),
-where you can tell us your wishes. In addition we need an application
-for an HPC-login for the head of the course (also via link above).
-
-Boundary conditions: 1 Teaching has uncomplicated access - but is
-subordinate to research projects when resource problems occurs. 1 As
-with all other projects, access is only possible with online project
-application\<br
-/><https://tu-dresden.de/zih/hochleistungsrechnen/zugang/projektantrag>.
-1 For courses, there is no need to deliver additional detailed project
-description.\<br />(In exceptional cases, the ZIH reserves the right to
-require a more detailed abstract.) 1 5.000 CPUh / month are possible
-without additional communication. 1 More than 5.000h / month should be
-possible after consulting the HPCSupport. 1 Post-iterations for 2.+3.
-are also possible at any time by arrangement. 1 For immediate job
-processing during classroom sessions (lecture, seminar) reservations are
-absolutely necessary. \<br />They have to be submitted at least 8 days
-before the appointment - via hpcsupport @ zih. tu-dresden. de
+You would like to use the clusters at ZIH for your courses? No problem. Please initiate a normal
+project application (see above), where you can tell us your wishes. In addition we need an
+application for an HPC-login for the head of the course (also via link above).
+
+Boundary conditions:
+
+1. Teaching has uncomplicated access - but is subordinate to research projects
+when resource problems occurs.
+1. As with all other projects, access is only possible with
+[online project application](https://tu-dresden.de/zih/hochleistungsrechnen/zugang/projektantrag).
+1. For courses, there is no need to deliver additional detailed project description. (In exceptional
+ cases, the ZIH reserves the right to require a more detailed abstract.)
+1. 5.000 CPUh / month are possible without additional communication.
+1. More than 5.000h / month should be possible after consulting the HPCSupport.
+1. Post-iterations for 2.+3. are also possible at any time by arrangement.
+1. For immediate job processing during classroom sessions (lecture, seminar) reservations are
+ absolutely necessary. They have to be submitted at least 8 days before the appointment -
+ via [mail to hpcsupport](mailto:hpcsupport@zih.tu-dresden.de).
diff --git a/doc.zih.tu-dresden.de/docs/application/TermsOfUse.md b/doc.zih.tu-dresden.de/docs/application/TermsOfUse.md
new file mode 100644
index 0000000000000000000000000000000000000000..ec4d90aa2a8c2e7b6b94a34619c207c11afa33e3
--- /dev/null
+++ b/doc.zih.tu-dresden.de/docs/application/TermsOfUse.md
@@ -0,0 +1,43 @@
+# Nutzungsbedingungen / Terms Of Use
+
+**Attention:** Only the German version of the Terms of Use is binding.
+
+These new Terms of Use are valid from April 1, 2018:
+[HPC-Nutzungsbedingungen_20180305.pdf]**todo** %ATTACHURL%/HPC-Nutzungsbedingungen_20180305.pdf?t=1520317028
+
+**The key points are are:** \* For support reasons, we store your contact data according to our IDM.
+(Will be anonymized at least 15 months after the cancellation of the HPC login.) The data of the HPC
+project (incl. contact of project leader) will be kept for further reference. \*Our HPC systems may
+only be used according to the project description. \* Responsibilities for the project leader: \*
+She has to assign a team member with an HPC login as the technical project administrator. She can do
+this herself if she has a login at our systems. \* The project leader or the administrator will have
+to add/remove members to their project. She has access to accounting data for her project. \* These
+issues cover the data storage in our systems: \* Please work in th escratch file systems. \* Upon
+request, the project leader or the administrator can be given access to a user's directory. \* The
+scratch file systems (/tmp, /scratch, /fastfs, /fasttemp) are for temporary use only. After a
+certain time, files may be removed automatically (for /tmp after 7 days, parallel scratch: after 100
+days). \* Before a user leaves a project the leader/administrator has to store away worthy data.
+For this, the storage services of ZIH (long term storage, intermediate archive) can be used. \*
+Project termination (**new**) \* At project's end, jobs cannot be submitted and started any longer.
+\* Logins are valid for 30 more days for saving data. \* Hundred days after project termination,
+it's files will be deleted in the HPC file systems. \* The HPC user agrees to follow the
+instructions and hints of the support team. In case of non-compliance, she can be disabled for the
+batch system or banned from the system.
+
+- Working with logs and HPC performance data (**new**)
+ - For HPC related research ZIH will collect and analyze
+ performance data. Anonymized, it might be shared with research partners.
+ - Log data will be kept for long term analyzes.
+
+These key points are only a brief summary. If in doubt, please consult the German original.
+
+## Historie / History
+
+| Valid | Document |
+|:--------------------------------|:------------------------------------------------------------------------------------------------------|
+| 1 April 2018 - | [HPC-Nutzungsbedingungen_20180305.pdf]**todo** %ATTACHURL%/HPC-Nutzungsbedingungen_20180305.pdf?t=1520317028 |
+| 1 October 2016 - 31 March 2018 | [HPC-Nutzungsbedingungen_20160901.pdf]**todo** %ATTACHURL%/HPC-Nutzungsbedingungen_20160901.pdf |
+| 5 June 2014 - 30 September 2016 | [HPC-Nutzungsbedingungen_20140606.pdf]**todo** %ATTACHURL%/HPC-Nutzungsbedingungen_20140606.pdf |
+
+- [Terms-of-use-HPC-20180305-engl.pdf]**todo** %ATTACHURL%/Terms-of-use-HPC-20180305-engl.pdf:
+ Not binding translation in english
diff --git a/doc.zih.tu-dresden.de/mkdocs.yml b/doc.zih.tu-dresden.de/mkdocs.yml
index 77dd8cd06220241e5197ee7766dccd72553a1be5..d1e789517ff3eabe3d592aab855cf3aa9ff9275c 100644
--- a/doc.zih.tu-dresden.de/mkdocs.yml
+++ b/doc.zih.tu-dresden.de/mkdocs.yml
@@ -3,6 +3,7 @@ nav:
- Application for HPC Login:
- Overview: application.md
- Access: application/Access.md
+ - Terms: application/TermsOfUse.md
- Request for Resources:
- Overview: req_resources.md
- Project Request Form: req_resources/ProjectRequestForm.md
diff --git a/twiki2md/root/TermsOfUse.md b/twiki2md/root/TermsOfUse.md
deleted file mode 100644
index 92a0fa4c29ca3b3a6c3b0e6a7cb410f0f4bbeef5..0000000000000000000000000000000000000000
--- a/twiki2md/root/TermsOfUse.md
+++ /dev/null
@@ -1,54 +0,0 @@
-# Nutzungsbedingungen / Terms Of Use
-
-**Attention:** Only the German version of the Terms of Use is binding.
-
-These new Terms of Use are valid from April 1, 2018:
-[HPC-Nutzungsbedingungen_20180305.pdf](%ATTACHURL%/HPC-Nutzungsbedingungen_20180305.pdf?t=1520317028)
-
-**The key points are are:** \* For support reasons, we store your
-contact data according to our IDM. (Will be anonymized at least 15
-months after the cancellation of the HPC login.) The data of the HPC
-project (incl. contact of project leader) will be kept for further
-reference. \*Our HPC systems may only be used according to the project
-description. \* Responsibilities for the project leader: \* She has to
-assign a team member with an HPC login as the technical project
-administrator. She can do this herself if she has a login at our
-systems. \* The project leader or the administrator will have to
-add/remove members to their project. She has access to accounting data
-for her project. \* These issues cover the data storage in our systems:
-\* Please work in th escratch file systems. \* Upon request, the project
-leader or the administrator can be given access to a user's directory.
-\* The scratch file systems (/tmp, /scratch, /fastfs, /fasttemp) are for
-temporary use only. After a certain time, files may be removed
-automatically (for /tmp after 7 days, parallel scratch: after 100 days).
-\* Before a user leaves a project the leader/administrator has to store
-away worthy data. For this, the storage services of ZIH (long term
-storage, intermediate archive) can be used. \* Project termination
-(**new**) \* At project's end, jobs cannot be submitted and started any
-longer. \* Logins are valid for 30 more days for saving data. \* Hundred
-days after project termination, it's files will be deleted in the HPC
-file systems. \* The HPC user agrees to follow the instructions and
-hints of the support team. In case of non-compliance, she can be
-disabled for the batch system or banned from the system.
-
-- Working with logs and HPC performance data (**new**)\<br />
- - For HPC related research ZIH will collect and analyze
- performance data. Anonymized, it might be shared with research
- partners.
- - Log data will be kept for long term analyzes.
-
-These key points are only a brief summary. If in doubt, please consult
-the German original.
-
-# Historie / History
-
-| Valid | Document |
-|:--------------------------------|:------------------------------------------------------------------------------------------------------|
-| 1 April 2018 - | [HPC-Nutzungsbedingungen_20180305.pdf](%ATTACHURL%/HPC-Nutzungsbedingungen_20180305.pdf?t=1520317028) |
-| 1 October 2016 - 31 March 2018 | [HPC-Nutzungsbedingungen_20160901.pdf](%ATTACHURL%/HPC-Nutzungsbedingungen_20160901.pdf) |
-| 5 June 2014 - 30 September 2016 | [HPC-Nutzungsbedingungen_20140606.pdf](%ATTACHURL%/HPC-Nutzungsbedingungen_20140606.pdf) |
-
--- Main.MatthiasKraeusslein - 2016-09-01
-
-- [Terms-of-use-HPC-20180305-engl.pdf](%ATTACHURL%/Terms-of-use-HPC-20180305-engl.pdf):
- Not binding translation in english\</verbatim>