From: Mart Lubbers <mart@martlubbers.net>
Date: Tue, 8 Jul 2014 13:28:16 +0000 (+0200)
Subject: Merge branch 'master' of github.com:dopefishh/ssh-pres
X-Git-Tag: 1.0~3
X-Git-Url: https://git.martlubbers.net/?p=linuxnijmegen-ssh.git;a=commitdiff_plain;h=e089f81414c5d661914480e8ec0de354b1b93b33;hp=045d7a2a20106057e9b1a2b7ce76c3ae174ab6b8

Merge branch 'master' of github.com:dopefishh/ssh-pres

Conflicts:
	intro.tex
	server.tex
---

diff --git a/intro.tex b/intro.tex
index dd09fb8..f6e3d57 100644
--- a/intro.tex
+++ b/intro.tex
@@ -1,5 +1,18 @@
 \begin{frame}
 	\frametitle{Introductie}
+<<<<<<< HEAD
+	\begin{block}{Waarom}
+		\begin{enumerate}
+				\pause
+			\item{veiligheid \footnote{mits goed gebruikt}}
+				\pause
+			\item{beschikbaarheid}
+				\pause
+			\item{cross platform}
+		\end{enumerate}
+	\end{block}
+	En natuurlijk al de handige truukjes die je er mee uit kunt halen...
+=======
 	\begin{block}{Wat is SSH}
 			\pause
 			\begin{enumerate}
@@ -12,4 +25,5 @@
 	\pause
 	\begin{block}{Versleuteling}
 	\end{block}
+>>>>>>> 045d7a2a20106057e9b1a2b7ce76c3ae174ab6b8
 \end{frame}
diff --git a/server.tex b/server.tex
index 6806116..2597941 100644
--- a/server.tex
+++ b/server.tex
@@ -34,5 +34,6 @@
 			\item ...
 			\item \lstinline{$ man sshd_config}
 		\end{enumerate}
+>>>>>>> 045d7a2a20106057e9b1a2b7ce76c3ae174ab6b8
 	\end{block}
 \end{frame}
diff --git a/truuk.tex b/truuk.tex
index bf50aca..d7e6f07 100644
--- a/truuk.tex
+++ b/truuk.tex
@@ -84,6 +84,10 @@ option1="option1value",option2="option2value"...optionn="optionnvalue" ssh-rsa\
 AAAB4N.....
 		\end{lstlisting}
 	\end{block}
+	\begin{block}{Merk op}
+		alles in \textasciitilde/.ssh/ moet alleen leesbaar zijn voor de user. 
+		\lstinline{chmod 600} dus
+	\end{block}
 \end{frame}
 
 \begin{frame}[fragile]