Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg
2011-08-28 17:44:59 +02:00
7 changed files with 9 additions and 9 deletions

View File

@ -160,7 +160,7 @@ powered by \LaTeX, of course}
die X-Session noch\\
\texttt{DISPLAY=:1 urxvt \&}
\item Debugger, strace, logfiles, core-dumps aktivieren\\
(Siehe auch \url{http://i3.zekjur.net/docs/debugging.html})
(Siehe auch \url{http://i3wm.org/docs/debugging.html})
\end{list}
\end{slide}
@ -498,7 +498,7 @@ int handle_transient_for(void *data, xcb_connection_t *conn,
\begin{slide}{exit(0);}
\begin{list}{$\bullet$}{\itemsep=1em}
\item git-webinterface: \url{http://code.stapelberg.de/git/i3}
\item Website: \url{http://i3.zekjur.net}
\item Website: \url{http://i3wm.org}
\item IRC: \#i3 auf irc.twice-irc.de
\item xcb: \url{http://xcb.freedesktop.org/}
\item 50-Zeilen-WM: \url{http://incise.org/tinywm.html}

View File

@ -215,7 +215,7 @@ for (int c = 0; c < 10; c++) {
\begin{slide}{Mehr infos}
\begin{list}{$\bullet$}{\itemsep=1em}
\item git-webinterface: \url{http://code.stapelberg.de/git/i3}
\item Website: \url{http://i3.zekjur.net}
\item Website: \url{http://i3wm.org}
\item IRC: \#i3 auf irc.twice-irc.de
\end{list}
\end{slide}

View File

@ -14,7 +14,7 @@
pdftitle={i3 Reference Card},
pdfauthor={\textcopyright\ Zeus Panchenko},
pdfkeywords={i3, refcard},
pdfsubject={based on http://i3.zekjur.net/docs/userguide.html},
pdfsubject={based on http://i3wm.org/docs/userguide.html},
pdfpagemode={FullScreen}}
\definecolor{lightgray}{gray}{0.7}
@ -27,7 +27,7 @@
\newcommand{\RefCardTitle}[2]
{\centering{\Large{\textbf{i3 Reference Card (#1/#2)\\
{\scriptsize{\url{http://i3.zekjur.net/docs/userguide.html}}}}}}
{\scriptsize{\url{http://i3wm.org/docs/userguide.html}}}}}}
\vspace{1mm}}