aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2007-10-24 23:59:25 +0200
committerJonas Smedegaard <dr@jones.dk>2007-10-24 23:59:25 +0200
commit7cf4c855390fd7141fefb9941c11fe5827de62b0 (patch)
tree07fcb7456cb81b0648dcb3b44f4ef1d83053a8c6
parent88ecfe2bcd3a0fee195587c2a4b1cfc3159a87e6 (diff)
Lots of various improvements all over (from homebase.dk branch).
-rw-r--r--doc/admin.md2
-rw-r--r--doc/intro.md29
2 files changed, 17 insertions, 14 deletions
diff --git a/doc/admin.md b/doc/admin.md
index 7a575df..c02c482 100644
--- a/doc/admin.md
+++ b/doc/admin.md
@@ -92,4 +92,4 @@ TODO: Rewrite as automated syslog-ng plugin or cron script passing the message t
### Locate users with short password lifespan
- (group=<gruppe>; echo $group:; for user in `members $group`; do chage -l $user|egrep -q '^Maximum:[[:blank:]]*[0-9]{2}$' && printf $user'\t' && chage -l $user|egrep '^Password Expires:'; done)
+ (group=<gruppe>; echo $group:; for user in `members $group`; do chage -l $user|egrep -q '^Maximum:\[[:blank:]]*[0-9]{2}$' && printf $user'\t' && chage -l $user|egrep '^Password Expires:'; done)
diff --git a/doc/intro.md b/doc/intro.md
index 15975ed..41c1315 100644
--- a/doc/intro.md
+++ b/doc/intro.md
@@ -1,30 +1,33 @@
# Accounts
-Each user has a single, password-protected account.
+Each user has a single, personal account.
+The account, and what it provides access to, is protected by a personal [[password]].
-## Optional personal resources
-Each account can have various resources attached:
+## Personal resources
- * [[mail/addresses]]
+Each account can have various personal resources attached:
+
+ * Email [[addresses]]
+ * Personal [[file_shares|files]]
* A personal [[homepage]]
* One or more [[websites]]
-## Accessible shared services
+## Shared services
-User accounts provide access to various services:
+User accounts provide access to various shared resources:
- * [[mailinglists]]
- * [[files]]
- * [[printers]]
- * [[addressbooks]]
- * [[calendars]]
+ * [[Mailinglists]]
+ * Collaborative [[file_shares|files]]
+ * [[Printers]]
+ * [[Addressbooks|addressbooks]]
+ * [[Calendars]]
## Account administration
-User accounts are administered by the technical supporters using a small set of [[commands]]
+User accounts are administered by the technical supporters using a small set of [[account/commands]]
-An [[introemail]] points new users to the [[intro]] on this documentation website.
+New users are pointed to the [[intro]] page by [[intro/email]] and [[intro/sms]].