fixed merge conflicts and small addings

[linuxnijmegen-ssh.git] / conf.tex

diff --git a/conf.tex b/conf.tex
index f37ceaf..7d37cf4 100644 (file)
--- a/conf.tex
+++ b/conf.tex
@@ -1,5 +1,6 @@
 \begin{frame}[fragile]
        \frametitle{Gebruikersniveau}
+       \pause
        \begin{lstlisting}
 Host nas
     HostName 192.168.0.102
@@ -24,3 +25,10 @@ Host muziekserver
     AddressFamily inet
        \end{lstlisting}
 \end{frame}
+
+\begin{frame}
+       \frametitle{Systeemniveau}
+       \pause
+       /etc/ssh/ssh\_config
+\end{frame}
+