Merge branch 'master' into next

TODO

@@ -1,5 +1,5 @@
 
-Please see http://i3.zekjur.net/ for our bugtracker.
+Please see http://i3wm.org/ for our bugtracker.
 
 Some old notes, just to not lose them:
  * was passiert, wenn zwei fenster fullscreen wollen auf dem selben workspace?

docs/GPN-2009-06-27/i3.tex

@@ -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}

docs/NoName-2009-03-12/i3.tex

@@ -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}

docs/refcard.tex

@@ -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}}
 
 

i3.welcome

@@ -2,7 +2,7 @@
 
 This message provides an overview of the default keybindings to use i3.
 Please also make sure to have a look at the man page and the user's guide:
-http://i3.zekjur.net/docs/userguide.html
+http://i3wm.org/docs/userguide.html
 
 
 2.) Configuration Files

logo.svg

@@ -310,7 +310,7 @@
             <dc:title>steckdenis</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:description>Logo for I3, an improved dynamic tiling window manager: http://i3.zekjur.net/</dc:description>
+        <dc:description>Logo for I3, an improved dynamic tiling window manager: http://i3wm.org/</dc:description>
         <cc:license
            rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
       </cc:Work>

pseudo-doc.doxygen

@@ -7,7 +7,7 @@
 #
 # So, if you want to use it, here you go. This is however not a supported
 # document, and I recommend you have a look at the docs/ folder or at
-# http://i3.zekjur.net/ for more, real documentation.
+# http://i3wm.org/ for more, real documentation.
 #
 
 #---------------------------------------------------------------------------