diff --git a/administrativt/medlemslapp/conditions.latex b/administrativt/medlemslapp/conditions.latex
index 035c6310e369742e6b1d9e0b94d286b1c2fbf981..8a36f5b8f86999319404d1877a417b3208eab42c 100644
--- a/administrativt/medlemslapp/conditions.latex
+++ b/administrativt/medlemslapp/conditions.latex
@@ -9,57 +9,51 @@
\begin{document}
\epsfysize 30 mm
\mbox{\hspace{8cm}
+ \vspace{-5cm}
\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.
+\section*{Terms for accounts (v1.3)}
-\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).
+Welcome to LYSATOR!
-\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.
+As a member of Lysator you have wide possibilities to explore many
+interesting areas in computing. You are free to, within reasonable
+borders, do almost anything on the computer systems of Lysator,
+but there are certain rules that Lysator wants you to abide to.
-\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!
+\begin{enumerate}
+\item The account is personal, and may not be transfered or extradited
+without the consent of the board or the system administrators. It
+is OK to let a friend you trust use your account temporarily while you
+watch.
-\item You are not allowed to try to access other peoples accounts.
+\item Avoid using Lysator's computers in a way that disturbs other
+members use of the computer. (E.g. don't run heavy computing
+applications on any other computers than those intended as
+computingservers.)
-\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 Do not use Lysator's equipment to send/forward SPAM, or to spread
+copyright protected material if you don't have permission to do so.
-\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 Beyond the above rules does Lysator also apply the rules that
+Linköpings universitet have stated in {\textless}Rules for computers,
+ network and system facilities at Linköpings universitet, DNR: LiU
+1299/97-14{\textgreater}.
+\end{enumerate}
-\item Be kind to the other members of Lysator! Every megabyte of disc
-space that you use up will be unavailable to everyone else.
+In addition the following can be noted:
+\begin{itemize}
+\item It is usually better to ask for help if you need it, than to only
+act on guesses, especially when it comes to shared systems and resources
+where you can cause problems for others if you make errors. Also share
+the knowledge yuo have if anyone asks.
+
+\item Lysators computers and equipment is mostly donated. Some of these
+donators have special donation terms. Check with datorhandboken\\
+{\textless}http://datorhandbok.lysator.liu.se/{\textgreater} if you
+are unsure about what terms apply to the system you use, or ask a
+system administrator ("root").
\end{itemize}
These rules exist so that we may all enjoy our login sessions on
@@ -69,6 +63,7 @@ connection. We risk losing the connection unless we behave.
\newpage
\epsfysize 30 mm
\mbox{\hspace{8cm}
+ \vspace{-5cm}
\epsfbox{lyslogo.ps}}
\vspace{-5ex}
\section*{FIlled in by the applicant}
@@ -76,10 +71,10 @@ connection. We risk losing the connection unless we behave.
\renewcommand{\arraystretch}{2.57}
\fbox{
\begin{tabular}{@{}ll}
- Namn: & \hspace{9.4cm} \\ \cline{2-2}
- Adress: \\ \cline{2-2}
+ Name: & \hspace{9.4cm} \\ \cline{2-2}
+ Address: \\ \cline{2-2}
\\ \cline{2-2}
- Telefon: \\ \cline{2-2}
+ Phone: \\ \cline{2-2}
\end{tabular}
}
@@ -93,13 +88,14 @@ connection. We risk losing the connection unless we behave.
Personal ID: \\ \cline{2-2}
Creating root: \\ \cline{2-2}
Payment method: \\ \cline{2-2}
+ LiU-kort? \\ \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)"
+ I have read the conditions in the paper "Terms for accounts (v1.3)"
and promise to follow them.
\begin{tabular}{@{}rlrl}
diff --git a/administrativt/medlemslapp/conditions1_3.latex b/administrativt/medlemslapp/conditions1_3.latex
deleted file mode 100644
index 8a36f5b8f86999319404d1877a417b3208eab42c..0000000000000000000000000000000000000000
--- a/administrativt/medlemslapp/conditions1_3.latex
+++ /dev/null
@@ -1,105 +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}
- \vspace{-5cm}
- \epsfbox{lyslogo.ps}}
-
-\section*{Terms for accounts (v1.3)}
-
-Welcome to LYSATOR!
-
-As a member of Lysator you have wide possibilities to explore many
-interesting areas in computing. You are free to, within reasonable
-borders, do almost anything on the computer systems of Lysator,
-but there are certain rules that Lysator wants you to abide to.
-
-\begin{enumerate}
-\item The account is personal, and may not be transfered or extradited
-without the consent of the board or the system administrators. It
-is OK to let a friend you trust use your account temporarily while you
-watch.
-
-\item Avoid using Lysator's computers in a way that disturbs other
-members use of the computer. (E.g. don't run heavy computing
-applications on any other computers than those intended as
-computingservers.)
-
-\item Do not use Lysator's equipment to send/forward SPAM, or to spread
-copyright protected material if you don't have permission to do so.
-
-\item Beyond the above rules does Lysator also apply the rules that
-Linköpings universitet have stated in {\textless}Rules for computers,
- network and system facilities at Linköpings universitet, DNR: LiU
-1299/97-14{\textgreater}.
-\end{enumerate}
-
-In addition the following can be noted:
-
-\begin{itemize}
-\item It is usually better to ask for help if you need it, than to only
-act on guesses, especially when it comes to shared systems and resources
-where you can cause problems for others if you make errors. Also share
-the knowledge yuo have if anyone asks.
-
-\item Lysators computers and equipment is mostly donated. Some of these
-donators have special donation terms. Check with datorhandboken\\
-{\textless}http://datorhandbok.lysator.liu.se/{\textgreater} if you
-are unsure about what terms apply to the system you use, or ask a
-system administrator ("root").
-\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}
- \vspace{-5cm}
- \epsfbox{lyslogo.ps}}
-\vspace{-5ex}
-\section*{FIlled in by the applicant}
-
-\renewcommand{\arraystretch}{2.57}
-\fbox{
- \begin{tabular}{@{}ll}
- Name: & \hspace{9.4cm} \\ \cline{2-2}
- Address: \\ \cline{2-2}
- \\ \cline{2-2}
- Phone: \\ \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}
- LiU-kort? \\ \cline{2-2}
- \end{tabular}
-}
-
-\vspace{1cm}
-
-\section*{Date and signature}
- I have read the conditions in the paper "Terms for accounts (v1.3)"
- 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}