Merge branch 'schulung'

updates from current linutronix schulung.git

Conflicts:
	Makefile
	configpres.tex
	flash-memory/ubi/handout_ubi_de.tex
	handout.tex
	index.txt
	pres_master.tex
	vorl.tex
	vorl1.tex
	vorl2.tex
	vorl3.tex
	vorl4.tex
	vorl5.tex

Signed-off-by: Manuel Traut <manut@mecka.net>

1 files changed, 4 insertions, 30 deletions

diff --git a/configmasterhandout.tex b/configmasterhandout.tex
index 3f061c6..285bc00 100644
--- a/configmasterhandout.tex
+++ b/configmasterhandout.tex
@@ -1,35 +1,9 @@
-%\documentclass[xlevel]{wise}
-%\documentclass{book}
-%\usepackage{lxextras}
-\documentclass[hyperref]{wise}
+\documentclass{book}
 \usepackage{german}
-%\usepackage[utf8]{inputenc}
-\usepackage{listings,color}
-\definecolor{lbcolor}{rgb}{0.95,0.95,0.95}
-\usepackage{hyperref}
+\usepackage[utf8]{inputenc}
+\usepackage{lxextras}
+\lstset{keywordstyle=\color{blue}}
 
-\hypersetup{colorlinks=true}
-
-\lstset{language=C++,
-    frameround=fttt,
-	numbers=left,
-	stepnumber=1,
-	numbersep=5pt,
-	numberstyle=\tiny,
-	breaklines=true,
-	breakautoindent=true,
-	postbreak=\space,
-	tabsize=2,
-	basicstyle=\ttfamily\footnotesize,
-	showspaces=false,
-	showstringspaces=false,
-	extendedchars=true,
-	backgroundcolor=\color{lbcolor},
-	keywordstyle  =\bf ,
-	%identifierstyle = \bf ,
-	commentstyle =\color{green},
-	stringstyle=\color{red}
-}
 \begin{document}
 
 \title{Linux Entwicklung}