diff --git a/administrativt/medlemslapp/conditions.latex b/administrativt/medlemslapp/conditions.latex
index 4893b03d81720a61b392a1f7c26831fced62ed9d..035c6310e369742e6b1d9e0b94d286b1c2fbf981 100644
--- a/administrativt/medlemslapp/conditions.latex
+++ b/administrativt/medlemslapp/conditions.latex
@@ -1,13 +1,18 @@
-\documentstyle[a4,psfig]{article}
+\documentclass[a4paper]{article}
+\usepackage[swedish]{babel}
+\usepackage[latin1]{inputenc}
+\usepackage{epsfig}
+\usepackage{boxedminipage}
\topmargin -1.5cm
\textheight 25cm
\pagestyle{empty}
\begin{document}
+\epsfysize 30 mm
\mbox{\hspace{8cm}
- \psfig{figure=lyslogo.ps,width=30mm}}
+ \epsfbox{lyslogo.ps}}
\vspace{-5ex}
-\section*{Terms for accounts (v1.0)}
+\section*{Terms for accounts (v1.2.1)}
Welcome to Lysator! As a member of Lysator you have wide possibilities
to explore many interesting areas in computing. You are free to do
@@ -16,13 +21,15 @@ certain rules that Lysator wants you to abide to.
\begin{itemize}
\item The account is personal. You must keep the password secret. It
-is OK to let a friend you trust use your account while you watch.
-Contact a system administrator immediately if you suspect that
+is OK to let a friend you trust use your account temporarily while you
+watch. Contact a system administrator immediately if you suspect that
somebody have used your account.
\item Pick your password with care! It must not appear in a dictionary
-(neither Swedish, English, German nor any other languages). Your
-password should not be single-case.
+(neither Swedish, English, German nor any other languages or slang
+expressions). Your password should not be single-case and preferrably
+include at least one non-alphanumeric character (but avoid control
+characters).
\item Ask for help! It is all to easy to destroy something by mistake.
If you are uncertain about something, ask somebody who knows. This is
@@ -46,11 +53,13 @@ you are in doubt, ask a system administrator.
services, {\em don't} use trial-and-error! Ask a system administrator
instead.
-\item It is prohibited to use the network or the computers
-commercially.
+\item It is prohibited to use the network commercially. Also, some of
+the computers can't be used for commercial purposes, due to conditions
+set by the donating organisations.
\item Be kind to the other members of Lysator! Every megabyte of disc
space that you use up will be unavailable to everyone else.
+
\end{itemize}
These rules exist so that we may all enjoy our login sessions on
@@ -58,27 +67,43 @@ Lysators computers, and so that Lysator may keep its good network
connection. We risk losing the connection unless we behave.
\newpage
+\epsfysize 30 mm
\mbox{\hspace{8cm}
- \psfig{figure=lyslogo.ps,width=30mm}}
+ \epsfbox{lyslogo.ps}}
\vspace{-5ex}
-\section*{Information}
+\section*{FIlled in by the applicant}
\renewcommand{\arraystretch}{2.57}
-\begin{tabular}{@{}ll}
-Username: & \hspace{8.2cm} \\ \cline{2-2}
-Real name: \\ \cline{2-2}
-Address: \\ \cline{2-2}
-\\ \cline{2-2}
-\\ \cline{2-2}
-\\ \cline{2-2}
-Phone: \\ \cline{2-2}
-\end{tabular}
+\fbox{
+ \begin{tabular}{@{}ll}
+ Namn: & \hspace{9.4cm} \\ \cline{2-2}
+ Adress: \\ \cline{2-2}
+ \\ \cline{2-2}
+ Telefon: \\ \cline{2-2}
+ \end{tabular}
+}
+
+\vspace{1cm}
+
+\section*{Filled in by the root}
+\fbox{
+ \begin{tabular}{@{}ll}
+ Username: & \hspace{7.7cm} \\ \cline{2-2}
+ UID: \\ \cline{2-2}
+ Personal ID: \\ \cline{2-2}
+ Creating root: \\ \cline{2-2}
+ Payment method: \\ \cline{2-2}
+ \end{tabular}
+}
+
\vspace{1cm}
-\section*{Date and sign}
-I have read the conditions in the paper "Terms for accounts (v1.0)"
-and promise to follow them.
-\begin{tabular}{@{}llll}
-Date & \hspace{3cm} & Name & \hspace{4.6cm} \\ \cline{2-2} \cline{4-4}
+\section*{Date and signature}
+ I have read the conditions in the paper "Terms for accounts (v1.2.1)"
+ and promise to follow them.
+
+\begin{tabular}{@{}rlrl}
+ Date & \hspace{3cm} & Signature & \hspace{4.2cm} \\ \cline{2-2} \cline{4-4}
+
\end{tabular}
\end{document}
diff --git a/administrativt/medlemslapp/conditions1_2_1.latex b/administrativt/medlemslapp/conditions1_2_1.latex
deleted file mode 100644
index 035c6310e369742e6b1d9e0b94d286b1c2fbf981..0000000000000000000000000000000000000000
--- a/administrativt/medlemslapp/conditions1_2_1.latex
+++ /dev/null
@@ -1,109 +0,0 @@
-\documentclass[a4paper]{article}
-\usepackage[swedish]{babel}
-\usepackage[latin1]{inputenc}
-\usepackage{epsfig}
-\usepackage{boxedminipage}
-\topmargin -1.5cm
-\textheight 25cm
-\pagestyle{empty}
-\begin{document}
-\epsfysize 30 mm
-\mbox{\hspace{8cm}
- \epsfbox{lyslogo.ps}}
-\vspace{-5ex}
-
-\section*{Terms for accounts (v1.2.1)}
-
-Welcome to Lysator! As a member of Lysator you have wide possibilities
-to explore many interesting areas in computing. You are free to do
-almost anything on the computer systems of Lysator, but there are
-certain rules that Lysator wants you to abide to.
-
-\begin{itemize}
-\item The account is personal. You must keep the password secret. It
-is OK to let a friend you trust use your account temporarily while you
-watch. Contact a system administrator immediately if you suspect that
-somebody have used your account.
-
-\item Pick your password with care! It must not appear in a dictionary
-(neither Swedish, English, German nor any other languages or slang
-expressions). Your password should not be single-case and preferrably
-include at least one non-alphanumeric character (but avoid control
-characters).
-
-\item Ask for help! It is all to easy to destroy something by mistake.
-If you are uncertain about something, ask somebody who knows. This is
-especially important when you are using the network.
-
-\item You are not allowed to use the network to log in to other
-systems. Exception: If you have an account on another system, you may
-use the network to reach it. It is also OK to use the network for
-public services such as MUD or anonymous ftp.
-
-\item Be careful when you use the network! For instance, many
-ftp-sites allow access only during off-hours (their local time) even
-though it may be physically possible to use them 24 hours a day. If
-you are in doubt, ask a system administrator.
-
-\item Illegal software copying is illegal!
-
-\item You are not allowed to try to access other peoples accounts.
-
-\item If you don't know how to use ftp or any other kind of network
-services, {\em don't} use trial-and-error! Ask a system administrator
-instead.
-
-\item It is prohibited to use the network commercially. Also, some of
-the computers can't be used for commercial purposes, due to conditions
-set by the donating organisations.
-
-\item Be kind to the other members of Lysator! Every megabyte of disc
-space that you use up will be unavailable to everyone else.
-
-\end{itemize}
-
-These rules exist so that we may all enjoy our login sessions on
-Lysators computers, and so that Lysator may keep its good network
-connection. We risk losing the connection unless we behave.
-
-\newpage
-\epsfysize 30 mm
-\mbox{\hspace{8cm}
- \epsfbox{lyslogo.ps}}
-\vspace{-5ex}
-\section*{FIlled in by the applicant}
-
-\renewcommand{\arraystretch}{2.57}
-\fbox{
- \begin{tabular}{@{}ll}
- Namn: & \hspace{9.4cm} \\ \cline{2-2}
- Adress: \\ \cline{2-2}
- \\ \cline{2-2}
- Telefon: \\ \cline{2-2}
- \end{tabular}
-}
-
-\vspace{1cm}
-
-\section*{Filled in by the root}
-\fbox{
- \begin{tabular}{@{}ll}
- Username: & \hspace{7.7cm} \\ \cline{2-2}
- UID: \\ \cline{2-2}
- Personal ID: \\ \cline{2-2}
- Creating root: \\ \cline{2-2}
- Payment method: \\ \cline{2-2}
- \end{tabular}
-}
-
-\vspace{1cm}
-
-\section*{Date and signature}
- I have read the conditions in the paper "Terms for accounts (v1.2.1)"
- and promise to follow them.
-
-\begin{tabular}{@{}rlrl}
- Date & \hspace{3cm} & Signature & \hspace{4.2cm} \\ \cline{2-2} \cline{4-4}
-
-\end{tabular}
-\end{document}
diff --git a/administrativt/medlemslapp/conditions1_2_1.txt b/administrativt/medlemslapp/conditions1_2_1.txt
deleted file mode 100644
index d9fcb12f81d4858d71f9b933eb724a0d1b89e5ad..0000000000000000000000000000000000000000
--- a/administrativt/medlemslapp/conditions1_2_1.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-
- Terms for accounts (v1.2.1)
-
- Welcome to Lysator! As a member of Lysator you have wide possibilities
- to explore many interesting areas in computing. You are free to do
- almost anything on the computer systems of Lysator, but there are
- certain rules that Lysator wants you to abide to.
-
- * The account is personal. You must keep the password secret. It is
- OK to let a friend you trust use your account temporarily while
- you watch. Contact a system administrator immediately if you
- suspect that somebody have used your account.
- * Pick your password with care! It must not appear in a dictionary
- (neither Swedish, English, German nor any other languages or slang
- expressions). Your password should not be single-case and
- preferrably include at least one non-alphanumeric character (but
- avoid control characters).
- * Ask for help! It is all to easy to destroy something by mistake.
- If you are uncertain about something, ask somebody who knows. This
- is especially important when you are using the network.
- * You are not allowed to use the network to log in to other systems.
- Exception: If you have an account on another system, you may use
- the network to reach it. It is also OK to use the network for
- public services such as MUD or anonymous ftp.
- * Be careful when you use the network! For instance, many ftp-sites
- allow access only during off-hours (their local time) even though
- it may be physically possible to use them 24 hours a day. If you
- are in doubt, ask a system administrator.
- * Illegal software copying is illegal!
- * You are not allowed to try to access other peoples accounts.
- * If you don't know how to use ftp or any other kind of network
- services, don't use trial-and-error! Ask a system
- administrator instead.
- * It is prohibited to use the network commercially. Also, some of
- the computers can't be used for commercial purposes, due to
- conditions set by the donating organisations.
- * Be kind to the other members of Lysator! Every megabyte of disc
- space that you use up will be unavailable to everyone else.
-
- These rules exist so that we may all enjoy our login sessions on
- Lysators computers, and so that Lysator may keep its good network
- connection. We risk losing the connection unless we behave.