From 3b00b24f8d6d1ba5b0aa05217f22b61a754d9de6 Mon Sep 17 00:00:00 2001
From: mxmehl <mail@mehl.mx>
Date: Thu, 17 Mar 2016 13:52:31 +0100
Subject: [PATCH] unify datasheet template

---
 uber-datenblatt-template.txt | 39 ++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/uber-datenblatt-template.txt b/uber-datenblatt-template.txt
index 97e05ec..5b58aed 100644
--- a/uber-datenblatt-template.txt
+++ b/uber-datenblatt-template.txt
@@ -1,11 +1,12 @@
 ## > DOMAIN
 Domain:     SEDDOMAIN
 IP Address: SEDIP
+
 ## < DOMAIN
 
 ## > WEBPANEL
-https://uberspace.de/login
-
+Login:    https://uberspace.de/login
+--
 User:     SEDUSER
 Pass:     SEDSSHPASS
 
@@ -13,14 +14,15 @@ Pass:     SEDSSHPASS
 
 ## > SSH
 Server:   SEDHOSTNAME
-
+--
 User:     SEDUSER
 Pass:     SEDSSHPASS
+
 ## < SSH
 
 ## > SFTP
 Server:   SEDHOSTNAME
-
+--
 User:     SEDUSER
 Pass:     SEDSSHPASS
 
@@ -30,7 +32,7 @@ Pass:     SEDSSHPASS
 PHPMyAdmin: https://pma.SEDHOSTNAME
 Host:     localhost
 DB:       SEDUSER
-
+--
 User:     SEDUSER
 Pass:     SEDMYSQLPASS
 
@@ -41,22 +43,19 @@ Pass:     SEDMYSQLPASS
 ## < WORDPRESS
 
 ## > EMAIL
-
 Webmail: https://webmail.SEDDOMAIN
-
-# Receive
-Type:  IMAP
-Server: SEDHOSTNAME
-Port: 143
-STARTTLS / Password, normal
-
-# Send
-Type:  SMTP
-Server: SEDHOSTNAME
-Port: 587
-STARTTLS / Password, normal
-SMTP server requires authentication
-
+--
+Type:       IMAP (Receive)
+Server:     SEDHOSTNAME
+Port:       143
+Encryption: STARTTLS / Password, normal
+--
+Type:       SMTP (Send)
+Server:     SEDHOSTNAME
+Port:       587
+Encryption: STARTTLS / Password, normal
+Note:       SMTP server requires authentication
+--
 
 ## < EMAIL