backport 13082 (Misc changes)

diff --git a/README b/README
index 5a33d46c2f97958d440cce1f88d90d06fcd3b586..b4088ef55222f26d6523cee9de93f6279403e972 100644 (file)
--- a/README
+++ b/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/
-

diff --git a/vlc.win32.nsi b/vlc.win32.nsi
index 3a0fc77d73a30f413c0c820fe546f9eb8f9a845c..ee859c242b1b5dc8c9e30b28594d89eb921c753f 100644 (file)
--- a/vlc.win32.nsi
+++ b/vlc.win32.nsi
@@ -61,8 +61,7 @@ InstType "Full"
     !insertmacro MUI_PAGE_INSTFILES\r
   ; Finish page\r
     !define MUI_FINISHPAGE_RUN "$INSTDIR\vlc.exe"\r
-    !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\NEWS.txt"\r
-    !define MUI_FINISHPAGE_SHOWREADME_TEXT "View changelog"\r
+    !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\README.txt"\r
     !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED\r
     !define MUI_FINISHPAGE_LINK "Visit the VideoLAN VLC media player Website"\r
     !define MUI_FINISHPAGE_LINK_LOCATION "http://www.videolan.org/vlc/"\r