backport 13082 (Misc changes)

README

@@ -3,6 +3,13 @@ $Id$
 README for the VLC media player
 ===============================
 
+The VideoLAN web site . . . http://www.videolan.org/
+Documentation . . . . . . . http://www.videolan.org/doc/
+Support . . . . . . . . . . http://www.videolan.org/support/
+Forums  . . . . . . . . . . http://forum.videolan.org/
+Wiki  . . . . . . . . . . . http://wiki.videolan.org/
+The Developers site . . . . http://developers.videolan.org/vlc/
+
 ABOUT-NLS          - Notes on the Free Translation Project.
 AUTHORS            - Main VLC authors.
 COPYING            - The GPL license.
@@ -15,12 +22,3 @@ README             - This file.
 README.MacOSX.rtf  - Information specific to the MacOS X port.
 THANKS             - All VLC contributors.
 doc/               - Miscellaneous documentation.
-
-Resources
-=========
-
-The VideoLAN web site: http://www.videolan.org/
-Documentation and support: http://w.videolan.org/support/
-Forums: http://forum.videolan.org/
-The Developers site: http://developers.videolan.org/vlc/
-

vlc.win32.nsi

@@ -61,8 +61,7 @@ InstType "Full"
     !insertmacro MUI_PAGE_INSTFILES
   ; Finish page
     !define MUI_FINISHPAGE_RUN "$INSTDIR\vlc.exe"
-    !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\NEWS.txt"
-    !define MUI_FINISHPAGE_SHOWREADME_TEXT "View changelog"
+    !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\README.txt"
     !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
     !define MUI_FINISHPAGE_LINK "Visit the VideoLAN VLC media player Website"
     !define MUI_FINISHPAGE_LINK_LOCATION "http://www.videolan.org/vlc/"