BUG: Fixing some merge errors

sebix · sebix · commit 426538409088 · 2014-11-02T20:17:34.000+01:00
diff --git a/index.html b/index.html
@@ -38,10 +38,10 @@ <h2 id="releases">Recent Releases</h2>
 			<li>WinPython <strong>3.3.5.1</strong>, <a href="https://github.com/winpython/winpython/blob/master/changelogs/WinPython-3.3.5.1_History.txt">Release Information</a>. Downloads: <a href="https://sourceforge.net/projects/stonebig.u/files/Winpython_3.3/WinPython-32bit-3.3.5.1.exe/download">32bit</a> and <a href="https://sourceforge.net/projects/stonebig.u/files/Winpython_3.3/WinPython-64bit-3.3.5.1.exe/download">64bit</a></li>
 			<li>WinPython <strong>3.4.1.1</strong>, <a href="https://github.com/winpython/winpython/blob/master/changelogs/WinPython-3.4.1.1_History.txt">Release Information</a>. Downloads: <a href="https://sourceforge.net/projects/stonebig.u/files/Winpython_3.4/WinPython-32bit-3.4.1.1.exe/download">32bit</a> and <a href="https://sourceforge.net/projects/stonebig.u/files/Winpython_3.4/WinPython-64bit-3.4.1.1.exe/download">64bit</a></li>
 		</ul>
-		<p>Older releases can be found at the <a href="https://sourceforge.net/projects/winpython/files/">Downloads page of the former maintainer</a> and creator Pierre Raybaut, but note that they may be outdated.</p>
+		<p>Older releases can be found at the <a href="https://sourceforge.net/projects/winpython/files/">Downloads page of the former maintainer</a> and creator Pierre Raybaut.</p>
 		
 		<h2 id="overview">Overview</h2>
-		<p>WinPython is a free open-source portable distribution of the <a href="https://www.python.org/">Python programming language</a> for Windows Vista/7/8, designed for scientific and education usage.</p>
+		<p>WinPython is a free open-source portable distribution of the <a href="https://www.python.org/">Python programming language</a> for Windows Vista/7/8 and scientific and educational usage.</p>
 		<p><img style="width: 901px; height: 97px;" alt="WinPython Launcher Icons" src="images/winpython_launchers_2741.png" /></p>
 		<p>It is a full-featured (see what's inside <a href="https://github.com/winpython/winpython/blob/master/changelogs/WinPython-2.7.8.2.txt">WinPython 2.7</a>, <a href="https://github.com/winpython/winpython/blob/master/changelogs/WinPython-3.3.5.1.txt">WinPython 3.3</a> or <a href="https://github.com/winpython/winpython/blob/master/changelogs/WinPython-3.4.2.1.txt">WinPython 3.4</a>) Python-based scientific environment:</p>
 		<ul>
@@ -53,7 +53,7 @@ <h2 id="overview">Overview</h2>
 			<li><strong>Portable</strong>:
 			<ul>
 				<li>it runs out of the box on any Windows with 2Go Ram (Ipython needs Windows>XP, and Ipython Notebook a recent browser)</li>
-                <li>the WinPython folder can be moved to any location (local, network, usb drive) with most of the <a href="https://github.com/winpython/winpython/wiki/Installation"><!--TODO-->application settings</a></li>
+                <li>the WinPython folder can be moved to any location (local, network, usb drive) with most of the <a href="https://github.com/winpython/winpython/wiki/Installation#settings">application settings</a></li>
             </ul>
 			<li><strong>Flexible</strong>: 
 			<ul>
