You are viewing a plain text version of this content. The canonical link for it is here.
Posted to win32-msi-cvs@httpd.apache.org by wr...@apache.org on 2007/12/22 21:36:58 UTC

svn commit: r606486 - /httpd/httpd/win32-msi/trunk/apache_2.2-win32.ism

Author: wrowe
Date: Sat Dec 22 12:36:57 2007
New Revision: 606486

URL: http://svn.apache.org/viewvc?rev=606486&view=rev
Log:
Promote ApacheMonitor to the main apache program shortcut group
instead of nesting in under 'control apache'.

PR: 40137

Modified:
    httpd/httpd/win32-msi/trunk/apache_2.2-win32.ism

Modified: httpd/httpd/win32-msi/trunk/apache_2.2-win32.ism
URL: http://svn.apache.org/viewvc/httpd/httpd/win32-msi/trunk/apache_2.2-win32.ism?rev=606486&r1=606485&r2=606486&view=diff
==============================================================================
--- httpd/httpd/win32-msi/trunk/apache_2.2-win32.ism (original)
+++ httpd/httpd/win32-msi/trunk/apache_2.2-win32.ism Sat Dec 22 12:36:57 2007
@@ -1241,8 +1241,6 @@
 		<row><td>shortcutsconfigure</td><td>administerapache</td><td>##Shortcut_Configure_ShortLongName##</td><td>Description of folder</td><td>1</td><td/></row>
 		<row><td>shortcutsreviewlogs</td><td>administerapache</td><td>##Shortcut_ReviewLogs_ShortLongName##</td><td>Description of folder</td><td>1</td><td/></row>
 		<row><td>shortcutsservercontrol</td><td>administerapache</td><td>##Shortcut_Services_ShortLongName##</td><td>Description of folder</td><td>1</td><td/></row>
-		<row><td>shortcutsservercontrol1</td><td>administerapache</td><td>##Shortcut_Services_ShortLongName##</td><td>Description of folder</td><td>1</td><td/></row>
-		<row><td>shortcutsservercontrol2</td><td>administerapache</td><td>##Shortcut_Services_ShortLongName##</td><td>Description of folder</td><td>1</td><td/></row>
 	</table>
 
 	<table name="DrLocator">
@@ -4681,10 +4679,10 @@
 		<col def="s72">DirProperty</col>
 		<col def="i2">InstallMode</col>
 		<row><td>ShortcutAccessLog</td><td>logs</td><td/><td>shortcutsreviewlogs</td><td>2</td></row>
-		<row><td>ShortcutApacheMonitor</td><td>ApacheMonitor</td><td/><td>shortcutsservercontrol2</td><td>2</td></row>
+		<row><td>ShortcutApacheMonitor</td><td>ApacheMonitor</td><td/><td>administerapache</td><td>2</td></row>
 		<row><td>ShortcutConfigEdit</td><td>httpd</td><td/><td>shortcutsconfigure</td><td>2</td></row>
 		<row><td>ShortcutConfigTest</td><td>httpd</td><td/><td>shortcutsconfigure</td><td>2</td></row>
-		<row><td>ShortcutConsoleStart</td><td>ApacheNonAdmin</td><td/><td>shortcutsservercontrol1</td><td>2</td></row>
+		<row><td>ShortcutConsoleStart</td><td>ApacheNonAdmin</td><td/><td>shortcutsservercontrol</td><td>2</td></row>
 		<row><td>ShortcutDocsOnline</td><td>httpd</td><td/><td>administerapache</td><td>2</td></row>
 		<row><td>ShortcutErrorLog</td><td>logs</td><td/><td>shortcutsreviewlogs</td><td>2</td></row>
 		<row><td>ShortcutFAQ</td><td>manual_faq</td><td/><td>administerapache5</td><td>2</td></row>
@@ -4774,10 +4772,10 @@
 		<col def="S255">ISShortcutName</col>
 		<col def="I4">ISAttributes</col>
 		<row><td>ShortcutAccessLog</td><td>shortcutsreviewlogs</td><td>##Shortcut_ReviewLog_ShortLongName##</td><td>logs</td><td>[APACHELOGSDIR]access.log</td><td/><td>##Shortcut_ReviewLogDesc##</td><td>0</td><td/><td/><td>1</td><td>APACHELOGSDIR</td><td/><td/><td/></row>
-		<row><td>ShortcutApacheMonitor</td><td>shortcutsservercontrol2</td><td>##Shortcut_ApacheMonitor_ShortLongName##</td><td>ApacheMonitor</td><td>[#ApacheMonitor.exe]</td><td/><td>##Shortcut_ApacheMonitorDesc##</td><td>0</td><td/><td/><td>1</td><td>INSTALLDIR</td><td/><td/><td/></row>
+		<row><td>ShortcutApacheMonitor</td><td>administerapache</td><td>##Shortcut_ApacheMonitor_ShortLongName##</td><td>ApacheMonitor</td><td>[#ApacheMonitor.exe]</td><td/><td>##Shortcut_ApacheMonitorDesc##</td><td>0</td><td/><td/><td>1</td><td>INSTALLDIR</td><td/><td/><td/></row>
 		<row><td>ShortcutConfigEdit</td><td>shortcutsconfigure</td><td>##Shortcut_EditConfigDesc_ShortLongName##</td><td>httpd</td><td>[APACHECONFDIR]httpd.conf</td><td/><td>##Shortcut_EditConfigDesc##</td><td>0</td><td/><td/><td>1</td><td>APACHECONFDIR</td><td/><td/><td/></row>
 		<row><td>ShortcutConfigTest</td><td>shortcutsconfigure</td><td>##Shortcut_TestConfig_ShortLongName##</td><td>httpd</td><td>[#httpd.exe]</td><td>-w -t -f "[APACHECONFDIR]httpd.conf" -d "[INSTALLDIR]."</td><td>##Shortcut_TestConfigDesc##</td><td>0</td><td/><td/><td>1</td><td>INSTALLDIR</td><td/><td/><td/></row>
-		<row><td>ShortcutConsoleStart</td><td>shortcutsservercontrol1</td><td>##Shortcut_RunInConsole_ShortLongName##</td><td>ApacheNonAdmin</td><td>[#httpd.exe]</td><td>-w -f "[APACHECONFDIR]httpd.conf" -d "[INSTALLDIR]."</td><td>##Shortcut_RunInConsoleDesc##</td><td>0</td><td/><td/><td>1</td><td>INSTALLDIR</td><td/><td/><td/></row>
+		<row><td>ShortcutConsoleStart</td><td>shortcutsservercontrol</td><td>##Shortcut_RunInConsole_ShortLongName##</td><td>ApacheNonAdmin</td><td>[#httpd.exe]</td><td>-w -f "[APACHECONFDIR]httpd.conf" -d "[INSTALLDIR]."</td><td>##Shortcut_RunInConsoleDesc##</td><td>0</td><td/><td/><td>1</td><td>INSTALLDIR</td><td/><td/><td/></row>
 		<row><td>ShortcutDocsOnline</td><td>administerapache</td><td>##Shortcut_OnlineDocs_ShortLongName##</td><td>read</td><td>[Apache_Site_Docs]</td><td/><td>##Shortcut_OnlineDocsDesc##</td><td>0</td><td/><td/><td>1</td><td/><td/><td/><td/></row>
 		<row><td>ShortcutErrorLog</td><td>shortcutsreviewlogs</td><td>##Shortcut_ReviewErrors_ShortLongName##</td><td>logs</td><td>[APACHELOGSDIR]error.log</td><td/><td>##Shortcut_ReviewErrorsDesc##</td><td>0</td><td/><td/><td>1</td><td>APACHELOGSDIR</td><td/><td/><td/></row>
 		<row><td>ShortcutFAQOnline</td><td>administerapache</td><td>##Shortcut_FAQ_ShortLongName##</td><td>read</td><td>[Apache_Site_FAQ]</td><td/><td>##Shortcut_FAQDesc##</td><td>0</td><td/><td/><td>1</td><td/><td/><td/><td/></row>



---------------------------------------------------------------------
To unsubscribe, e-mail: win32-msi-cvs-unsubscribe@httpd.apache.org
For additional commands, e-mail: win32-msi-cvs-help@httpd.apache.org