update docs/multi-monitor from git

diff --git a/_docs/multi-monitor b/_docs/multi-monitor
index a1fd6dc039273b454c2ddc9ddcd322c4726d754c..cafe569103b6c3f88a08615b697c4f176bb9c137 100644 (file)
--- a/_docs/multi-monitor
+++ b/_docs/multi-monitor
@@ -1,15 +1,16 @@
 The multi-monitor situation
 ===========================
-Michael Stapelberg <michael+i3@stapelberg.de>
-September 2011
+Michael Stapelberg <michael@i3wm.org>
+April 2013
 
-…or: oh no, I have an nVidia graphics card!
+Please upgrade your nVidia driver to version 302.17 or newer and i3 will just
+work. This document is kept around for historic reasons only.
 
 == The quick fix
 
 If you are using the nVidia binary graphics driver (also known as 'blob')
-you need to use the +--force-xinerama+ flag (in your .xsession) when starting
-i3, like so:
+before version 302.17, you need to use the +--force-xinerama+ flag (in your
+.xsession) when starting i3, like so:
 
 .Example:
 ----------------------------------------------

diff --git a/docs/multi-monitor.html b/docs/multi-monitor.html
index 914fbcf86d0cd7af303b658ecd4eff0b4ccd6c94..77dfa4906a1fa62ebc72644e9763c493577f0260 100644 (file)
--- a/docs/multi-monitor.html
+++ b/docs/multi-monitor.html
@@ -30,8 +30,8 @@ window.onload = function(){asciidoc.footnotes(); asciidoc.toc(2);}
 <div id="header">\r
 <h1>The multi-monitor situation</h1>\r
 <span id="author">Michael Stapelberg</span><br />\r
-<span id="email"><tt>&lt;<a href="mailto:michael+i3@stapelberg.de">michael+i3@stapelberg.de</a>&gt;</tt></span><br />\r
-<span id="revdate">September 2011</span>\r
+<span id="email"><tt>&lt;<a href="mailto:michael@i3wm.org">michael@i3wm.org</a>&gt;</tt></span><br />\r
+<span id="revdate">April 2013</span>\r
 <div id="toc">
   <div id="toctitle">Table of Contents</div>
   <noscript><p><b>JavaScript must be enabled in your browser to display the table of contents.</b></p></noscript>
@@ -39,15 +39,16 @@ window.onload = function(){asciidoc.footnotes(); asciidoc.toc(2);}
 </div>\r
 <div id="preamble">\r
 <div class="sectionbody">\r
-<div class="paragraph"><p>…or: oh no, I have an nVidia graphics card!</p></div>\r
+<div class="paragraph"><p>Please upgrade your nVidia driver to version 302.17 or newer and i3 will just\r
+work. This document is kept around for historic reasons only.</p></div>\r
 </div>\r
 </div>\r
 <div class="sect1">\r
 <h2 id="_the_quick_fix">1. The quick fix</h2>\r
 <div class="sectionbody">\r
 <div class="paragraph"><p>If you are using the nVidia binary graphics driver (also known as <em>blob</em>)\r
-you need to use the <tt>--force-xinerama</tt> flag (in your .xsession) when starting\r
-i3, like so:</p></div>\r
+before version 302.17, you need to use the <tt>--force-xinerama</tt> flag (in your\r
+.xsession) when starting i3, like so:</p></div>\r
 <div class="listingblock">\r
 <div class="title">Example:</div>\r
 <div class="content">\r