[Slim-Checkins] r11860 - in /trunk/server: HTML/EN/html/docs/ HTML/Handheld/html/ HTML/Nokia770/html/ Slim/Web/Pages/

[dean at svn.slimdevices.com]

Author: dean
Date: Mon Apr 30 07:57:48 2007
New Revision: 11860

URL: http://svn.slimdevices.com?rev=11860&view=rev
Log:
Merge from branch 6.5: 11859  
Remove ipconfig.html. It's obsolete and duplicates what's in quickstart.html

Removed:
    trunk/server/HTML/EN/html/docs/ipconfig.html
    trunk/server/HTML/EN/html/docs/ipconfig.html.de
    trunk/server/HTML/EN/html/docs/ipconfig.html.es
    trunk/server/HTML/EN/html/docs/ipconfig.html.fr
    trunk/server/HTML/EN/html/docs/ipconfig.html.it
    trunk/server/HTML/EN/html/docs/ipconfig.html.nl
Modified:
    trunk/server/HTML/Handheld/html/help.html
    trunk/server/HTML/Nokia770/html/help.html
    trunk/server/Slim/Web/Pages/Home.pm

Modified: trunk/server/HTML/Handheld/html/help.html
URL: http://svn.slimdevices.com/trunk/server/HTML/Handheld/html/help.html?rev=11860&r1=11859&r2=11860&view=diff
==============================================================================
--- trunk/server/HTML/Handheld/html/help.html (original)
+++ trunk/server/HTML/Handheld/html/help.html Mon Apr 30 07:57:48 2007
@@ -6,7 +6,6 @@
 
 	<ul>
 		<li><a href="[% webroot %]html/docs/quickstart.html?player=[% player | uri %]">[% "GETTING_STARTED" | string %]</a></li>
-		<li><a href="[% webroot %]html/docs/ipconfig.html?player=[% player | uri %]">[% "PLAYER_SETUP" | string %]</a></li>
 		<li><a href="[% webroot %]html/docs/help_remote.html?player=[% player | uri %]">[% "HELP_REMOTE" | string %]</a></li>
 		<li><a href="http://faq.slimdevices.com" target="faq">[% "FAQ" | string %]</a> </li>
 		<li><a href="[% webroot %]html/docs/index.html?player=[% player | uri %]">[% "TECHNICAL_INFORMATION" | string %]</a></li>

Modified: trunk/server/HTML/Nokia770/html/help.html
URL: http://svn.slimdevices.com/trunk/server/HTML/Nokia770/html/help.html?rev=11860&r1=11859&r2=11860&view=diff
==============================================================================
--- trunk/server/HTML/Nokia770/html/help.html (original)
+++ trunk/server/HTML/Nokia770/html/help.html Mon Apr 30 07:57:48 2007
@@ -8,9 +8,6 @@
 <ul>
     <li>
          <a href="[% webroot %]html/docs/quickstart.html" target="_top">[% "GETTING_STARTED" | string %]</a>
-    </li>
-    <li>
-         <a href="[% webroot %]html/docs/ipconfig.html" target="_top">[% "PLAYER_SETUP" | string %]</a>
     </li>
     <li>
          <a href="[% webroot %]html/docs/help_remote.html" target="_top">[% "HELP_REMOTE" | string %]</a>

Modified: trunk/server/Slim/Web/Pages/Home.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Web/Pages/Home.pm?rev=11860&r1=11859&r2=11860&view=diff
==============================================================================
--- trunk/server/Slim/Web/Pages/Home.pm (original)
+++ trunk/server/Slim/Web/Pages/Home.pm Mon Apr 30 07:57:48 2007
@@ -26,7 +26,6 @@
 	Slim::Web::HTTP::addPageFunction(qr/^squeezenetwork\.(?:htm|xml)/, sub {$class->squeezeNetwork(@_)});
 
 	$class->addPageLinks("help",{'GETTING_STARTED' => "html/docs/quickstart.html"});
-	$class->addPageLinks("help",{'PLAYER_SETUP' => "html/docs/ipconfig.html"});
 	$class->addPageLinks("help",{'HELP_REMOTE' => "html/help_remote.html"});
 	$class->addPageLinks("help",{'REMOTE_STREAMING' => "html/docs/remotestreaming.html"});
 	$class->addPageLinks("help",{'FAQ' => "http://faq.slimdevices.com/"},1);
@@ -58,7 +57,6 @@
 
 	if (!exists $Slim::Web::Pages::additionalLinks{"help"}) {
 		$class->addPageLinks("help", {'GETTING_STARTED' => "html/docs/quickstart.html"});
-		$class->addPageLinks("help", {'PLAYER_SETUP' => "html/docs/ipconfig.html"});
 		$class->addPageLinks("help", {'HELP_REMOTE' => "html/help_remote.html"});
 		$class->addPageLinks("help", {'REMOTE_STREAMING' => "html/docs/remotestreaming.html"});
 		$class->addPageLinks("help", {'FAQ' => "html/docs/faq.html"});