Return-Path: 
 <win32-msi-cvs-return-192-apmail-httpd-win32-msi-cvs-archive=httpd.apache.org@httpd.apache.org>
Delivered-To: apmail-httpd-win32-msi-cvs-archive@www.apache.org
Received: (qmail 40844 invoked from network); 21 Dec 2007 19:40:23 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 21 Dec 2007 19:40:23 -0000
Received: (qmail 86875 invoked by uid 500); 21 Dec 2007 19:40:12 -0000
Delivered-To: apmail-httpd-win32-msi-cvs-archive@httpd.apache.org
Received: (qmail 86863 invoked by uid 500); 21 Dec 2007 19:40:12 -0000
Mailing-List: contact win32-msi-cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:win32-msi-cvs-help@httpd.apache.org>
list-unsubscribe: <mailto:win32-msi-cvs-unsubscribe@httpd.apache.org>
List-Post: <mailto:win32-msi-cvs@httpd.apache.org>
Reply-To: win32-msi-cvs@httpd.apache.org
List-Id: <win32-msi-cvs.httpd.apache.org>
Delivered-To: mailing list win32-msi-cvs@httpd.apache.org
Received: (qmail 86852 invoked by uid 99); 21 Dec 2007 19:40:12 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 21 Dec 2007 11:40:12 -0800
X-ASF-Spam-Status: No, hits=-100.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 21 Dec 2007 19:39:50 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id F09FF1A9832; Fri, 21 Dec 2007 11:39:53 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r606288 -
 /httpd/httpd/win32-msi/trunk/apache_2.2-win32.ism
Date: Fri, 21 Dec 2007 19:39:53 -0000
To: win32-msi-cvs@httpd.apache.org
From: wrowe@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20071221193953.F09FF1A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: wrowe
Date: Fri Dec 21 11:39:52 2007
New Revision: 606288

URL: http://svn.apache.org/viewvc?rev=606288&view=rev
Log:
Resolve a host of problems identified by Orca validation suite,
and prepare for 2.2.7.

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=606288&r1=606287&r2=606288&view=diff
==============================================================================
--- httpd/httpd/win32-msi/trunk/apache_2.2-win32.ism (original)
+++ httpd/httpd/win32-msi/trunk/apache_2.2-win32.ism Fri Dec 21 11:39:52 2007
@@ -319,7 +319,6 @@
 		<col key="yes" def="i2">Order</col>
 		<col def="s64">Value</col>
 		<col def="L64">Text</col>
-		<row><td>IS_SQLSERVER_SERVER</td><td>1</td><td>TestValue</td><td/></row>
 	</table>
 
 	<table name="CompLocator">
@@ -356,7 +355,7 @@
 		<row><td>cgibin</td><td>{57385CC7-3504-4EF9-92B3-DD3B734CF980}</td><td>APACHECGIDIR</td><td>0</td><td/><td>printenv.pl</td><td>1</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
 		<row><td>conf</td><td>{00557AFD-F5B5-4EFF-87D3-8942174F9778}</td><td>APACHECONFDIR</td><td>0</td><td/><td/><td>1</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
 		<row><td>conf_default</td><td>{14E8726B-4776-4380-AEB1-883478D692C6}</td><td>DEFAULTCONF</td><td>0</td><td/><td>mime.types</td><td>1</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
-		<row><td>conf_default_extra</td><td>{14E8726B-4776-4380-AEB1-883478D692C6}</td><td>DEFAULTEXTRA</td><td>0</td><td/><td/><td>1</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
+		<row><td>conf_default_extra</td><td>{FA19460B-4776-4380-AEB1-883478D692C6}</td><td>DEFAULTEXTRA</td><td>0</td><td/><td/><td>1</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
 		<row><td>conf_default_extra_temp</td><td>{359BAF52-1C92-4243-B159-E346F7030447}</td><td>DEFAULTEXTRA</td><td>0</td><td/><td/><td>1</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
 		<row><td>conf_default_temp</td><td>{35C952BA-1C92-4243-B159-E346F7030447}</td><td>DEFAULTCONF</td><td>0</td><td/><td/><td>1</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
 		<row><td>conf_extra</td><td>{0E1C777D-47A6-4775-93D4-0A5464767D25}</td><td>CONFEXTRA</td><td>0</td><td/><td/><td>1</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
@@ -734,33 +733,6 @@
 		<row><td>ReadyToRemove</td><td>DlgText2</td><td>Text</td><td>21</td><td>102</td><td>330</td><td>24</td><td>3</td><td/><td/><td/><td/><td/><td/><td/><td/></row>
 		<row><td>ReadyToRemove</td><td>DlgTitle</td><td>Text</td><td>13</td><td>6</td><td>292</td><td>25</td><td>65539</td><td/><td>##IDS__IsVerifyRemoveAllDlg_8##</td><td/><td/><td/><td/><td/><td/></row>
 		<row><td>ReadyToRemove</td><td>RemoveNow</td><td>PushButton</td><td>230</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS__IsVerifyRemoveAllDlg_9##</td><td>Cancel</td><td/><td/><td/><td/><td/></row>
-		<row><td>SQLBrowse</td><td>Branding1</td><td>Text</td><td>4</td><td>227</td><td>50</td><td>13</td><td>3</td><td/><td>##IDS_INSTALLSHIELD_FORMATTED##</td><td/><td/><td>0</td><td>0</td><td/><td/></row>
-		<row><td>SQLBrowse</td><td>Branding2</td><td>Text</td><td>3</td><td>226</td><td>50</td><td>13</td><td>65537</td><td/><td>##IDS_INSTALLSHIELD##</td><td/><td/><td>0</td><td>0</td><td/><td/></row>
-		<row><td>SQLBrowse</td><td>Cancel</td><td>PushButton</td><td>194</td><td>241</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS_CANCEL##</td><td>TxtSQLBrowse</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>SQLBrowse</td><td>DlgLine</td><td>Line</td><td>48</td><td>232</td><td>224</td><td>0</td><td>1</td><td/><td/><td/><td/><td>0</td><td>0</td><td/><td/></row>
-		<row><td>SQLBrowse</td><td>OK</td><td>PushButton</td><td>125</td><td>241</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS_OK##</td><td>lstSQLServer</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>SQLBrowse</td><td>TxtSQLBrowse</td><td>Text</td><td>13</td><td>8</td><td>245</td><td>31</td><td>65539</td><td/><td>##IDS_SQLBROWSE_INTRO##</td><td>OK</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>SQLBrowse</td><td>lstSQLServer</td><td>ListBox</td><td>14</td><td>45</td><td>245</td><td>165</td><td>7</td><td>IS_SQLSERVER_LIST</td><td/><td>Cancel</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>SQLLogin</td><td>Back</td><td>PushButton</td><td>164</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS_BACK##</td><td>Next</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>SQLLogin</td><td>Banner</td><td>Bitmap</td><td>0</td><td>0</td><td>374</td><td>44</td><td>1</td><td/><td/><td/><td/><td>0</td><td/><td/><td>NewBinary1</td></row>
-		<row><td>SQLLogin</td><td>BannerLine</td><td>Line</td><td>0</td><td>44</td><td>374</td><td>0</td><td>1</td><td/><td/><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>SQLLogin</td><td>Branding1</td><td>Text</td><td>4</td><td>229</td><td>50</td><td>13</td><td>3</td><td/><td>##IDS_INSTALLSHIELD_FORMATTED##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>SQLLogin</td><td>Branding2</td><td>Text</td><td>3</td><td>228</td><td>50</td><td>13</td><td>65537</td><td/><td>##IDS_INSTALLSHIELD##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>SQLLogin</td><td>BtnSQLBrowse</td><td>PushButton</td><td>301</td><td>106</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS_SQLLOGIN_BROWSE##</td><td>lblAuthentication</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>SQLLogin</td><td>Cancel</td><td>PushButton</td><td>301</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS_CANCEL##</td><td>lblServer</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>SQLLogin</td><td>DlgDesc</td><td>Text</td><td>21</td><td>23</td><td>292</td><td>25</td><td>65539</td><td/><td>##IDS_SQLLOGIN_DESC##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>SQLLogin</td><td>DlgLine</td><td>Line</td><td>48</td><td>234</td><td>326</td><td>0</td><td>1</td><td/><td/><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>SQLLogin</td><td>DlgTitle</td><td>Text</td><td>13</td><td>7</td><td>292</td><td>25</td><td>65539</td><td/><td>##IDS_SQLLOGIN_TITLE##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>SQLLogin</td><td>EdtLogin</td><td>Edit</td><td>92</td><td>184</td><td>218</td><td>16</td><td>3</td><td>IS_SQLSERVER_USERNAME</td><td/><td>lblPswd</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>SQLLogin</td><td>EdtPswd</td><td>Edit</td><td>92</td><td>208</td><td>218</td><td>16</td><td>2097155</td><td>IS_SQLSERVER_PASSWORD</td><td/><td>Back</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>SQLLogin</td><td>Next</td><td>PushButton</td><td>229</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS_NEXT##</td><td>Cancel</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>SQLLogin</td><td>RadioButtonGroup1</td><td>RadioButtonGroup</td><td>25</td><td>145</td><td>343</td><td>34</td><td>3</td><td>IS_SQLSERVER_AUTHENTICATION</td><td/><td>lblLoginID</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>SQLLogin</td><td>cboServers</td><td>ComboBox</td><td>18</td><td>106</td><td>278</td><td>80</td><td>65539</td><td>IS_SQLSERVER_SERVER</td><td/><td>BtnSQLBrowse</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>SQLLogin</td><td>lblAuthentication</td><td>Text</td><td>18</td><td>129</td><td>334</td><td>14</td><td>131075</td><td/><td>##IDS_SQLLOGIN_CONNECT##</td><td>RadioButtonGroup1</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>SQLLogin</td><td>lblLoginID</td><td>Text</td><td>43</td><td>186</td><td>48</td><td>13</td><td>3</td><td/><td>##IDS_SQLLOGIN_ID##</td><td>EdtLogin</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>SQLLogin</td><td>lblPswd</td><td>Text</td><td>43</td><td>208</td><td>47</td><td>13</td><td>3</td><td/><td>##IDS_SQLLOGIN_PSWD##</td><td>EdtPswd</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>SQLLogin</td><td>lblSQLLoginIntro</td><td>Text</td><td>17</td><td>50</td><td>345</td><td>40</td><td>65539</td><td/><td>##IDS_SQLLOGIN_INTRO##</td><td>cboServers</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>SQLLogin</td><td>lblServer</td><td>Text</td><td>18</td><td>92</td><td>88</td><td>14</td><td>3</td><td/><td>##IDS_SQLLOGIN_SERVER##</td><td>lblSQLLoginIntro</td><td/><td>0</td><td/><td/><td/></row>
 		<row><td>ServerInformation</td><td>AdminWarningText</td><td>Text</td><td>42</td><td>186</td><td>238</td><td>35</td><td>65539</td><td/><td>##IDS__IsServerInformation_17##</td><td/><td/><td/><td/><td/><td/></row>
 		<row><td>ServerInformation</td><td>AppUsersGroup</td><td>RadioButtonGroup</td><td>26</td><td>185</td><td>300</td><td>29</td><td>3</td><td>ApplicationUsers</td><td>##IDS__IsServerInformation_15##</td><td>Next</td><td/><td/><td/><td/><td/></row>
 		<row><td>ServerInformation</td><td>AppUsersLabel</td><td>Text</td><td>21</td><td>167</td><td>300</td><td>14</td><td>65539</td><td/><td>##IDS__IsServerInformation_14##</td><td/><td/><td/><td/><td/><td/></row>
@@ -916,16 +888,8 @@
 		<row><td>ReadyToInstall</td><td>DlgTitle3</td><td>Show</td><td>ProgressType0="install"</td></row>
 		<row><td>ReadyToInstall</td><td>TcpIpWarningText</td><td>Hide</td><td>RESOLVED_WINSOCK2 = "1"</td></row>
 		<row><td>ReadyToInstall</td><td>TcpIpWarningTitle</td><td>Hide</td><td>RESOLVED_WINSOCK2 = "1"</td></row>
-		<row><td>SQLLogin</td><td>EdtLogin</td><td>Disable</td><td>IS_SQLSERVER_AUTHENTICATION=0</td></row>
-		<row><td>SQLLogin</td><td>EdtLogin</td><td>Enable</td><td>IS_SQLSERVER_AUTHENTICATION=1</td></row>
-		<row><td>SQLLogin</td><td>EdtPswd</td><td>Disable</td><td>IS_SQLSERVER_AUTHENTICATION=0</td></row>
-		<row><td>SQLLogin</td><td>EdtPswd</td><td>Enable</td><td>IS_SQLSERVER_AUTHENTICATION=1</td></row>
-		<row><td>SQLLogin</td><td>lblLoginID</td><td>Disable</td><td>IS_SQLSERVER_AUTHENTICATION=0</td></row>
-		<row><td>SQLLogin</td><td>lblLoginID</td><td>Enable</td><td>IS_SQLSERVER_AUTHENTICATION=1</td></row>
-		<row><td>SQLLogin</td><td>lblPswd</td><td>Disable</td><td>IS_SQLSERVER_AUTHENTICATION=0</td></row>
-		<row><td>SQLLogin</td><td>lblPswd</td><td>Enable</td><td>IS_SQLSERVER_AUTHENTICATION=1</td></row>
-		<row><td>ServerInformation</td><td>AdminWarningText</td><td>Hide</td><td>AdminUser Or Version9X</td></row>
-		<row><td>ServerInformation</td><td>AppUsersGroup</td><td>Hide</td><td>Not (AdminUser Or Version9X)</td></row>
+		<row><td>ServerInformation</td><td>AdminWarningText</td><td>Hide</td><td>Privileged Or Version9X</td></row>
+		<row><td>ServerInformation</td><td>AppUsersGroup</td><td>Hide</td><td>Not (Privileged Or Version9X)</td></row>
 		<row><td>SetupCompleteError</td><td>Back</td><td>Default</td><td>UpdateStarted</td></row>
 		<row><td>SetupCompleteError</td><td>Back</td><td>Disable</td><td>NOT UpdateStarted</td></row>
 		<row><td>SetupCompleteError</td><td>Back</td><td>Enable</td><td>UpdateStarted</td></row>
@@ -1071,23 +1035,13 @@
 		<row><td>ReadyToRemove</td><td>RemoveNow</td><td>[ProgressType1]</td><td>Uninstalling</td><td>1</td><td>0</td></row>
 		<row><td>ReadyToRemove</td><td>RemoveNow</td><td>[ProgressType2]</td><td>uninstalled</td><td>1</td><td>0</td></row>
 		<row><td>ReadyToRemove</td><td>RemoveNow</td><td>[ProgressType3]</td><td>uninstalls</td><td>1</td><td>0</td></row>
-		<row><td>SQLBrowse</td><td>Cancel</td><td>EndDialog</td><td>Return</td><td>1</td><td>1</td></row>
-		<row><td>SQLBrowse</td><td>OK</td><td>EndDialog</td><td>Return</td><td>1</td><td>2</td></row>
-		<row><td>SQLBrowse</td><td>OK</td><td>[IS_SQLSERVER_SERVER]</td><td>[IS_SQLSERVER_LIST]</td><td>1</td><td>1</td></row>
-		<row><td>SQLLogin</td><td>Back</td><td>NewDialog</td><td>CustomerInformation</td><td>1</td><td>1</td></row>
-		<row><td>SQLLogin</td><td>BtnSQLBrowse</td><td>DoAction</td><td>ISSQLServerList</td><td>1</td><td>2</td></row>
-		<row><td>SQLLogin</td><td>BtnSQLBrowse</td><td>SpawnDialog</td><td>SQLBrowse</td><td>1</td><td>3</td></row>
-		<row><td>SQLLogin</td><td>BtnSQLBrowse</td><td>[IS_SQLSERVER_LIST]</td><td>[IS_SQLSERVER_SERVER]</td><td>1</td><td>1</td></row>
-		<row><td>SQLLogin</td><td>Cancel</td><td>SpawnDialog</td><td>CancelSetup</td><td>1</td><td>1</td></row>
-		<row><td>SQLLogin</td><td>Next</td><td>DoAction</td><td>ISSQLServerValidate</td><td>1</td><td>3</td></row>
-		<row><td>SQLLogin</td><td>Next</td><td>NewDialog</td><td>SetupType</td><td>IS_SQLSERVER_STATUS=0</td><td>4</td></row>
 		<row><td>ServerInformation</td><td>Back</td><td>NewDialog</td><td>ReadMe</td><td>1</td><td>1</td></row>
 		<row><td>ServerInformation</td><td>Cancel</td><td>SpawnDialog</td><td>CancelSetup</td><td>1</td><td>1</td></row>
 		<row><td>ServerInformation</td><td>Next</td><td>DoAction</td><td>ValidateServerName</td><td>RESOLVED_WINSOCK2 = "1"</td><td>0</td></row>
 		<row><td>ServerInformation</td><td>Next</td><td>NewDialog</td><td>SetupType</td><td>Not INVALIDFIELD</td><td>0</td></row>
 		<row><td>ServerInformation</td><td>Next</td><td>NewDialog</td><td>ValidationError</td><td>INVALIDFIELD</td><td>0</td></row>
-		<row><td>ServerInformation</td><td>Next</td><td>[ALLUSERS]</td><td>1</td><td>ApplicationUsers = "AllUsers" And (AdminUser Or Version9X)</td><td>1</td></row>
-		<row><td>ServerInformation</td><td>Next</td><td>[ALLUSERS]</td><td>{}</td><td>ApplicationUsers &lt;&gt; "AllUsers"  Or Not (AdminUser Or Version9X)</td><td>2</td></row>
+		<row><td>ServerInformation</td><td>Next</td><td>[ALLUSERS]</td><td>1</td><td>ApplicationUsers = "AllUsers" And (Privileged Or Version9X)</td><td>1</td></row>
+		<row><td>ServerInformation</td><td>Next</td><td>[ALLUSERS]</td><td>{}</td><td>ApplicationUsers &lt;&gt; "AllUsers"  Or Not (Privileged Or Version9X)</td><td>2</td></row>
 		<row><td>ServerInformation</td><td>Next</td><td>[INVALIDDIALOG]</td><td>ServerInformation</td><td>INVALIDFIELD</td><td>0</td></row>
 		<row><td>ServerInformation</td><td>Next</td><td>[SERVERPORT]</td><td>80</td><td>ALLUSERS</td><td>3</td></row>
 		<row><td>ServerInformation</td><td>Next</td><td>[SERVERPORT]</td><td>8080</td><td>Not ALLUSERS</td><td>4</td></row>
@@ -1132,6 +1086,8 @@
 		<col key="yes" def="s72">Directory_</col>
 		<col key="yes" def="s72">Component_</col>
 		<row><td>APACHECONFDIR</td><td>conf</td></row>
+		<row><td>CONFEXTRA</td><td>conf_extra</td></row>
+		<row><td>DEFAULTEXTRA</td><td>conf_default_extra</td></row>
 		<row><td>APACHELOGSDIR</td><td>logs</td></row>
 	</table>
 
@@ -1151,7 +1107,7 @@
 		<row><td>SetAllUsersProfileNT</td><td>51</td><td>ALLUSERSPROFILE</td><td>[%SystemRoot]\Profiles\All Users</td><td/></row>
 		<row><td>StartApacheMonitor</td><td>1746</td><td>ApacheMonitor.exe</td><td/><td/></row>
 		<row><td>ValidateServerName</td><td>1</td><td>real_features_dll</td><td>_ValidateServerName@4</td><td/></row>
-		<row><td>setAllUsersProfile2K</td><td>51</td><td>ALLUSERSPROFILE</td><td>[%ALLUSERSPROFILE]</td><td/></row>
+		<row><td>SetAllUsersProfile2K</td><td>51</td><td>ALLUSERSPROFILE</td><td>[%ALLUSERSPROFILE]</td><td/></row>
 		<row><td>setUserProfileNT</td><td>51</td><td>USERPROFILE</td><td>[%USERPROFILE]</td><td/></row>
 	</table>
 
@@ -1189,8 +1145,6 @@
 		<row><td>ReadMe</td><td>50</td><td>50</td><td>374</td><td>267</td><td>67</td><td>##IDS__ReadMe_0##</td><td>Next</td><td>Next</td><td>Cancel</td><td/><td/><td/><td/></row>
 		<row><td>ReadyToInstall</td><td>50</td><td>50</td><td>374</td><td>267</td><td>99</td><td>##IDS__IsVerifyReadyDlg_0##</td><td>InstallNow</td><td>InstallNow</td><td>Cancel</td><td>Ready to Install</td><td/><td/><td/></row>
 		<row><td>ReadyToRemove</td><td>50</td><td>50</td><td>374</td><td>267</td><td>3</td><td>##IDS__IsVerifyRemoveAllDlg_0##</td><td>RemoveNow</td><td>RemoveNow</td><td>Cancel</td><td>Verify Remove</td><td/><td/><td/></row>
-		<row><td>SQLBrowse</td><td>50</td><td>50</td><td>272</td><td>265</td><td>3</td><td>##IDS_PRODUCTNAME_INSTALLSHIELD##</td><td>lstSQLServer</td><td>OK</td><td>Cancel</td><td>SQL Server List Browse</td><td/><td>0</td><td/></row>
-		<row><td>SQLLogin</td><td>50</td><td>50</td><td>374</td><td>266</td><td>3</td><td>##IDS_PRODUCTNAME_INSTALLSHIELD##</td><td>cboServers</td><td>Next</td><td>Cancel</td><td>SQL Server Login</td><td/><td>0</td><td/></row>
 		<row><td>ServerInformation</td><td>50</td><td>50</td><td>374</td><td>267</td><td>3</td><td>##IDS__IsServerInformation_0##</td><td>ServerDomainLabel</td><td>Next</td><td>Cancel</td><td>Identification</td><td/><td/><td/></row>
 		<row><td>SetupCompleteError</td><td>50</td><td>50</td><td>374</td><td>267</td><td>67</td><td>##IDS__IsFatalError_0##</td><td>Finish</td><td>Finish</td><td>Finish</td><td>Fatal Error</td><td/><td/><td/></row>
 		<row><td>SetupCompleteSuccess</td><td>50</td><td>50</td><td>374</td><td>267</td><td>67</td><td>##IDS__IsExitDialog_0##</td><td>CheckLaunchProgram</td><td>OK</td><td>OK</td><td>Exit</td><td/><td/><td/></row>
@@ -1283,8 +1237,8 @@
 		<row><td>WindowsVolume</td><td>TARGETDIR</td><td>.:WinRoot</td><td/><td/><td/></row>
 		<row><td>XSL</td><td>STYLE</td><td>xsl</td><td/><td>0</td><td/></row>
 		<row><td>administerapache</td><td>ProgramMenuFolder</td><td>##AppProduct_ShortLongName##</td><td>Description of folder</td><td>1</td><td/></row>
-		<row><td>shortcutsconfigure</td><td>administerapache</td><td>##Shortcuts_Configure_ShortLongName##</td><td>Description of folder</td><td>1</td><td/></row>
-		<row><td>shortcutsreviewlogs</td><td>administerapache</td><td>##Shortcuts_ReviewLogs_ShortLongName##</td><td>Description of folder</td><td>1</td><td/></row>
+		<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>
@@ -1737,7 +1691,7 @@
 		<row><td>httpd.exe</td><td>httpd</td><td>httpd.exe</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;ApacheTargetFolder&gt;\bin\httpd.exe</td><td>1</td><td/></row>
 		<row><td>httpd.conf.in</td><td>conf_default_temp</td><td>HTTPD-~1.IN|httpd.conf.in</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;ApacheBuildFolder&gt;\docs\conf\httpd.conf.in</td><td>1</td><td/></row>
 		<row><td>htpasswd.exe</td><td>htpasswd</td><td>htpasswd.exe</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;ApacheTargetFolder&gt;\bin\htpasswd.exe</td><td>1</td><td/></row>
-		<row><td>httxt2dbm.exe</td><td>httxt2dbm</td><td>httxt2dbm.exe</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;ApacheTargetFolder&gt;\bin\httxt2dbm.exe</td><td>1</td><td/></row>
+		<row><td>httxt2dbm.exe</td><td>httxt2dbm</td><td>HTTXT2~1.EXE|httxt2dbm.exe</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;ApacheTargetFolder&gt;\bin\httxt2dbm.exe</td><td>1</td><td/></row>
 		<row><td>libhttpd.dll</td><td>libhttpd</td><td>libhttpd.dll</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;ApacheTargetFolder&gt;\bin\libhttpd.dll</td><td>1</td><td/></row>
 		<row><td>manual.css</td><td>manual_style_css</td><td>manual.css</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;ApacheTargetFolder&gt;\manual\style\css\manual.css</td><td>1</td><td/></row>
 		<row><td>manual_index.html.en</td><td>manual</td><td>INDEXH~1.EN|index.html.en</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;ApacheTargetFolder&gt;\manual\index.html.en</td><td>1</td><td/></row>
@@ -2467,8 +2421,8 @@
 		<col def="S255">Value</col>
 		<col def="S255">TestValue</col>
 		<col def="i4">Type</col>
-		<row><td>ApacheBuildFolder</td><td>d:\asf-build\build-2.2.6\</td><td/><td>2</td></row>
-		<row><td>ApacheTargetFolder</td><td>d:\asf-build\target-2.2.6\</td><td/><td>2</td></row>
+		<row><td>ApacheBuildFolder</td><td>d:\asf-build\build-2.2.7\</td><td/><td>2</td></row>
+		<row><td>ApacheTargetFolder</td><td>d:\asf-build\target-2.2.7\</td><td/><td>2</td></row>
 		<row><td>CommonFilesFolder</td><td/><td/><td>1</td></row>
 		<row><td>ISPROJECTDIR</td><td/><td/><td>1</td></row>
 		<row><td>ISProductFolder</td><td/><td/><td>1</td></row>
@@ -2500,8 +2454,8 @@
 		<row><td>win32</td><td>Comments</td><td>##IDS_Dev_Warning##</td></row>
 		<row><td>win32</td><td>PackageCode</td><td>{69492F41-747E-42B4-BF27-5C49212C5F24}</td></row>
 		<row><td>win32</td><td>ProductCode</td><td>{85262A06-2D8C-4BC1-B6ED-5A705D09CFFC}</td></row>
-		<row><td>win32</td><td>ProductName</td><td>Apache HTTP Server 2.2.6</td></row>
-		<row><td>win32</td><td>ProductVersion</td><td>2.2.6</td></row>
+		<row><td>win32</td><td>ProductName</td><td>Apache HTTP Server 2.2.7</td></row>
+		<row><td>win32</td><td>ProductVersion</td><td>2.2.7</td></row>
 		<row><td>win32</td><td>SetupFileName</td><td>setup</td></row>
 		<row><td>win32</td><td>Subject</td><td>##AppProduct_Description##</td></row>
 		<row><td>win32</td><td>Title</td><td>##IDS_Package_Title##</td></row>
@@ -2754,9 +2708,9 @@
 		<col def="I2">Encoded</col>
 		<col def="S0">Comment</col>
 		<col def="I4">TimeStamp</col>
-		<row><td>AppProduct</td><td>1033</td><td>Apache HTTP Server 2.2.6</td><td>0</td><td>SYSTEM_GENERATED</td><td>1578731275</td></row>
+		<row><td>AppProduct</td><td>1033</td><td>Apache HTTP Server 2.2.7</td><td>0</td><td>SYSTEM_GENERATED</td><td>1578731275</td></row>
 		<row><td>AppProduct_Description</td><td>1033</td><td>The Apache HTTP Web Server Version 2.2</td><td>0</td><td/><td>1712964623</td></row>
-		<row><td>AppProduct_ShortLongName</td><td>1033</td><td>APACHE~1.6|Apache HTTP Server 2.2.6</td><td>0</td><td/><td>1712971342</td></row>
+		<row><td>AppProduct_ShortLongName</td><td>1033</td><td>APACHE~1.7|Apache HTTP Server 2.2.7</td><td>0</td><td/><td>1712971342</td></row>
 		<row><td>AppPublisher</td><td>1033</td><td>Apache Software Foundation</td><td>0</td><td/><td>1360611656</td></row>
 		<row><td>AppPublisherURL</td><td>1033</td><td>http://httpd.apache.org/</td><td>0</td><td/><td>1360611656</td></row>
 		<row><td>AppSupportContact</td><td>1033</td><td>Apache Users Mailing List</td><td>0</td><td/><td>1360611656</td></row>
@@ -3282,19 +3236,6 @@
 		<row><td>IDS_SHORTCUTFOLDER_7</td><td>1033</td><td>Description of folder</td><td>0</td><td>SYSTEM_GENERATED</td><td>1360611656</td></row>
 		<row><td>IDS_SHORTCUTFOLDER_8</td><td>1033</td><td>Description of folder</td><td>0</td><td>SYSTEM_GENERATED</td><td>1360611656</td></row>
 		<row><td>IDS_SHORTCUTFOLDER_9</td><td>1033</td><td>Description of folder</td><td>0</td><td>SYSTEM_GENERATED</td><td>1360611656</td></row>
-		<row><td>IDS_SQLBROWSE_INTRO</td><td>1033</td><td>From the list of servers below, select the database server you would like to target.</td><td>0</td><td/><td/></row>
-		<row><td>IDS_SQLLOGIN_BROWSE</td><td>1033</td><td>B&amp;rowse...</td><td>0</td><td/><td>-2087168511</td></row>
-		<row><td>IDS_SQLLOGIN_CONNECT</td><td>1033</td><td>Connect using:</td><td>0</td><td/><td>-2087168511</td></row>
-		<row><td>IDS_SQLLOGIN_DESC</td><td>1033</td><td>Select database server and authentication method</td><td>0</td><td/><td/></row>
-		<row><td>IDS_SQLLOGIN_ID</td><td>1033</td><td>&amp;Login ID:</td><td>0</td><td/><td>-2087168511</td></row>
-		<row><td>IDS_SQLLOGIN_INTRO</td><td>1033</td><td>Select the database server to install to from the list below or click Browse to see a list of all database servers. You can also specify the way to authenticate your login using your current credentials or a SQL Login ID and Password.</td><td>0</td><td/><td/></row>
-		<row><td>IDS_SQLLOGIN_PSWD</td><td>1033</td><td>&amp;Password:</td><td>0</td><td/><td>-2087168511</td></row>
-		<row><td>IDS_SQLLOGIN_SERVER</td><td>1033</td><td>&amp;Database Server:</td><td>0</td><td/><td/></row>
-		<row><td>IDS_SQLLOGIN_SQL</td><td>1033</td><td>S&amp;erver authentication using the Login ID and password below</td><td>0</td><td/><td/></row>
-		<row><td>IDS_SQLLOGIN_TITLE</td><td>1033</td><td>{&amp;MSSansBold8}Database Server</td><td>0</td><td/><td/></row>
-		<row><td>IDS_SQLLOGIN_WIN</td><td>1033</td><td>&amp;Windows authentication credentials of current user</td><td>0</td><td/><td>-2087168511</td></row>
-		<row><td>IDS_SQLSCRIPT_INSTALLING</td><td>1033</td><td>Executing SQL Install Script...</td><td>0</td><td/><td>-2087168511</td></row>
-		<row><td>IDS_SQLSCRIPT_UNINSTALLING</td><td>1033</td><td>Executing SQL Uninstall Script...</td><td>0</td><td/><td>-2087168511</td></row>
 		<row><td>IDS_STANDARD_USE_SETUPEXE</td><td>1033</td><td>This installation cannot be run by directly launching the MSI package. You must run setup.exe.</td><td>0</td><td/><td>-2087168511</td></row>
 		<row><td>IDS_SetupTips_1</td><td>1033</td><td>OK</td><td>0</td><td/><td>1360609608</td></row>
 		<row><td>IDS_SetupTips_10</td><td>1033</td><td>Will be installed on first use. (Available only if the feature supports this option.)</td><td>0</td><td/><td>1360611656</td></row>
@@ -4065,7 +4006,9 @@
 		<row><td>Prog_so_desc</td><td>1033</td><td>Apache Loadable Module</td><td>0</td><td/><td>1360611656</td></row>
 		<row><td>Shortcut_ApacheMonitor</td><td>1033</td><td>Monitor Apache Servers</td><td>0</td><td/><td>1360611656</td></row>
 		<row><td>Shortcut_ApacheMonitor_ShortLongName</td><td>1033</td><td>MONITO~1|Monitor Apache Servers</td><td>0</td><td/><td>1360621896</td></row>
-		<row><td>Shortcut_ApacheMonitor_desc</td><td>1033</td><td>Apache Service Taskbar Icon</td><td>0</td><td/><td>1360611656</td></row>
+		<row><td>Shortcut_ApacheMonitorDesc</td><td>1033</td><td>Apache Service Taskbar Icon</td><td>0</td><td/><td>1360611656</td></row>
+		<row><td>Shortcut_Configure</td><td>1033</td><td>Configure Apache Server</td><td>0</td><td/><td>1360611656</td></row>
+		<row><td>Shortcut_Configure_ShortLongName</td><td>1033</td><td>CONFIG~1|Configure Apache Server</td><td>0</td><td/><td>1360611656</td></row>
 		<row><td>Shortcut_EditConfig</td><td>1033</td><td>Edit the Configuration File</td><td>0</td><td/><td>1360611656</td></row>
 		<row><td>Shortcut_EditConfigDesc</td><td>1033</td><td>Edit the Apache httpd.conf Configuration File</td><td>0</td><td/><td>1360611656</td></row>
 		<row><td>Shortcut_EditConfigDesc_ShortLongName</td><td>1033</td><td>EDITTH~1.CON|Edit the Apache httpd.conf Configuration File</td><td>0</td><td/><td>1360611656</td></row>
@@ -4099,11 +4042,8 @@
 		<row><td>Shortcut_TestConfig</td><td>1033</td><td>Test Configuration</td><td>0</td><td/><td>1360611656</td></row>
 		<row><td>Shortcut_TestConfigDesc</td><td>1033</td><td>Test the Apache httpd.conf Configuration File</td><td>0</td><td/><td>1360611656</td></row>
 		<row><td>Shortcut_TestConfig_ShortLongName</td><td>1033</td><td>TESTCO~1|Test Configuration</td><td>0</td><td/><td>1360611656</td></row>
-		<row><td>Shortcuts_ApacheMonitorDesc</td><td>1033</td><td>Show the Apache Service Monitor taskbar icon</td><td>0</td><td/><td>1360611656</td></row>
-		<row><td>Shortcuts_Configure</td><td>1033</td><td>Configure Apache Server</td><td>0</td><td/><td>1360611656</td></row>
-		<row><td>Shortcuts_Configure_ShortLongName</td><td>1033</td><td>CONFIG~1|Configure Apache Server</td><td>0</td><td/><td>1360611656</td></row>
-		<row><td>Shortcuts_ReviewLogs</td><td>1033</td><td>Review Server Log Files</td><td>0</td><td/><td>1360611656</td></row>
-		<row><td>Shortcuts_ReviewLogs_ShortLongName</td><td>1033</td><td>REVIEW~1|Review Server Log Files</td><td>0</td><td/><td>1360617800</td></row>
+		<row><td>Shortcut_ReviewLogs</td><td>1033</td><td>Review Server Log Files</td><td>0</td><td/><td>1360611656</td></row>
+		<row><td>Shortcut_ReviewLogs_ShortLongName</td><td>1033</td><td>REVIEW~1|Review Server Log Files</td><td>0</td><td/><td>1360617800</td></row>
 	</table>
 
 	<table name="ISTargetImage">
@@ -4285,8 +4225,10 @@
 		<row><td>SelfStartService</td><td>$ApacheAdmin=3 Or (?ApacheAdmin=3 and $ApacheAdmin&lt;&gt;2)</td><td>5810</td><td>If we are installing as a service (or were installed and not removed) start ourself</td><td/></row>
 		<row><td>SelfStopService</td><td>($ApacheAdmin=2 Or ?ApacheAdmin=3) And EXISTING_APACHE_SERVICE_PATH &gt; ""</td><td>1910</td><td>If we are removing or repairing ourself as a service, and the service is installed, stop it ourself</td><td/></row>
 		<row><td>SelfUnregModules</td><td/><td>2200</td><td>SelfUnregModules</td><td/></row>
+		<row><td>SetAllUsersProfile2K</td><td>VersionNT &gt;= 500</td><td>730</td><td/><td/></row>
 		<row><td>SetAllUsersProfileNT</td><td>VersionNT = 400</td><td>720</td><td/><td/></row>
 		<row><td>SetODBCFolders</td><td/><td>1100</td><td>SetODBCFolders</td><td/></row>
+		<row><td>SetUserProfileNT</td><td>VersionNT</td><td>710</td><td/><td/></row>
 		<row><td>StartApacheMonitor</td><td>$ApacheMonitor=3 Or (?ApacheMonitor=3 and $ApacheMonitor&lt;&gt;2)</td><td>5930</td><td>If we are installing ApacheMonitor (or it was installed and not removed), then launch it</td><td/></row>
 		<row><td>StartServices</td><td>VersionNT</td><td>5900</td><td>StartServices</td><td/></row>
 		<row><td>StopServices</td><td>VersionNT</td><td>1900</td><td>StopServices</td><td/></row>
@@ -4303,8 +4245,6 @@
 		<row><td>WriteEnvironmentStrings</td><td/><td>5200</td><td>WriteEnvironmentStrings</td><td/></row>
 		<row><td>WriteIniValues</td><td/><td>5100</td><td>WriteIniValues</td><td/></row>
 		<row><td>WriteRegistryValues</td><td/><td>5000</td><td>WriteRegistryValues</td><td/></row>
-		<row><td>setAllUsersProfile2K</td><td>VersionNT &gt;= 500</td><td>730</td><td/><td/></row>
-		<row><td>setUserProfileNT</td><td>VersionNT</td><td>710</td><td/><td/></row>
 	</table>
 
 	<table name="InstallShield">
@@ -4365,7 +4305,9 @@
 		<row><td>RMCCPSearch</td><td>Not CCP_SUCCESS And CCP_TEST</td><td>600</td><td>RMCCPSearch</td><td/></row>
 		<row><td>ResolveServerName</td><td>RESOLVED_WINSOCK2 = "0"</td><td>610</td><td/><td/></row>
 		<row><td>ResolveSource</td><td>Not Installed And Not PATCH</td><td>960</td><td>ResolveSource</td><td/></row>
-		<row><td>SetAllUsersProfileNT</td><td>VersionNT = 400</td><td>1320</td><td/><td/></row>
+		<row><td>SetAllUsersProfileNT</td><td>VersionNT = 400</td><td>810</td><td/><td/></row>
+		<row><td>SetAllUsersProfile2K</td><td>VersionNT &gt;= 500</td><td>820</td><td/><td/></row>
+		<row><td>SetUserProfileNT</td><td>VersionNT</td><td>830</td><td/><td/></row>
 		<row><td>SetupCompleteError</td><td/><td>-3</td><td>SetupCompleteError</td><td/></row>
 		<row><td>SetupCompleteSuccess</td><td/><td>-1</td><td>SetupCompleteSuccess</td><td/></row>
 		<row><td>SetupInitialization</td><td/><td>420</td><td>SetupInitialization</td><td/></row>
@@ -4373,8 +4315,6 @@
 		<row><td>SetupProgress</td><td/><td>1250</td><td>SetupProgress</td><td/></row>
 		<row><td>SetupResume</td><td>Installed And (RESUME Or Preselected) And Not PATCH</td><td>1230</td><td>SetupResume</td><td/></row>
 		<row><td>ValidateProductID</td><td/><td>700</td><td>ValidateProductID</td><td/></row>
-		<row><td>setAllUsersProfile2K</td><td>VersionNT &gt;= 500</td><td>1330</td><td/><td/></row>
-		<row><td>setUserProfileNT</td><td>VersionNT</td><td>1310</td><td/><td/></row>
 	</table>
 
 	<table name="IsolatedComponent">
@@ -4392,7 +4332,6 @@
 		<col key="yes" def="i2">Order</col>
 		<col def="s64">Value</col>
 		<col def="L64">Text</col>
-		<row><td>IS_SQLSERVER_LIST</td><td>1</td><td>TestValue</td><td/></row>
 	</table>
 
 	<table name="ListView">
@@ -4647,7 +4586,7 @@
 		<row><td>PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS</td><td>##IDS_PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS##</td><td/></row>
 		<row><td>ProductCode</td><td>{8F721A14-795E-4D11-87DC-CD5778E45D05}</td><td/></row>
 		<row><td>ProductName</td><td>Apache HTTP Server 2.2</td><td/></row>
-		<row><td>ProductVersion</td><td>2.2.6</td><td/></row>
+		<row><td>ProductVersion</td><td>2.2.7</td><td/></row>
 		<row><td>ProgressType0</td><td>install</td><td/></row>
 		<row><td>ProgressType1</td><td>Installing</td><td/></row>
 		<row><td>ProgressType2</td><td>installed</td><td/></row>
@@ -4694,8 +4633,6 @@
 		<row><td>AgreeToLicense</td><td>2</td><td>Yes</td><td>0</td><td>0</td><td>295</td><td>15</td><td>##IDS__AgreeToLicense_1##</td><td/><td/></row>
 		<row><td>ApplicationUsers</td><td>1</td><td>AllUsers</td><td>4</td><td>1</td><td>290</td><td>14</td><td>##IDS__IsRegisterUserDlg_14##</td><td/><td/></row>
 		<row><td>ApplicationUsers</td><td>2</td><td>OnlyCurrentUser</td><td>4</td><td>15</td><td>290</td><td>14</td><td>##IDS__IsRegisterUserDlg_15##</td><td/><td/></row>
-		<row><td>IS_SQLSERVER_AUTHENTICATION</td><td>1</td><td>0</td><td>0</td><td>0</td><td>327</td><td>14</td><td>##IDS_SQLLOGIN_WIN##</td><td/><td>0</td></row>
-		<row><td>IS_SQLSERVER_AUTHENTICATION</td><td>2</td><td>1</td><td>0</td><td>14</td><td>327</td><td>19</td><td>##IDS_SQLLOGIN_SQL##</td><td/><td>0</td></row>
 		<row><td>_IsMaintenance</td><td>1</td><td>Reinstall</td><td>0</td><td>0</td><td>290</td><td>14</td><td>##IDS__IsMaintenanceDlg_9##</td><td/><td/></row>
 		<row><td>_IsMaintenance</td><td>2</td><td>Remove</td><td>0</td><td>60</td><td>290</td><td>14</td><td>##IDS__IsMaintenanceDlg_10##</td><td/><td/></row>
 		<row><td>_IsSetupTypeMin</td><td>1</td><td>Typical</td><td>0</td><td>0</td><td>264</td><td>14</td><td>##IDS__IsSetupTypeMinDlg_11##</td><td/><td/></row>
@@ -4719,10 +4656,10 @@
 		<col def="S0">Value</col>
 		<col def="s72">Component_</col>
 		<col def="I4">ISAttributes</col>
-		<row><td>Registry1</td><td>2</td><td>SOFTWARE\Apache Software Foundation\Apache\2.2.6</td><td>ServerRoot</td><td>[INSTALLDIR]</td><td>ApacheAdmin</td><td>0</td></row>
+		<row><td>Registry1</td><td>2</td><td>SOFTWARE\Apache Software Foundation\Apache\2.2.7</td><td>ServerRoot</td><td>[INSTALLDIR]</td><td>ApacheAdmin</td><td>0</td></row>
 		<row><td>Registry10</td><td>2</td><td>SOFTWARE\Classes\sofile</td><td/><td>Apache Loadable Module</td><td>ApacheAdmin</td><td>0</td></row>
-		<row><td>Registry11</td><td>1</td><td>SOFTWARE\Apache Software Foundation\Apache\2.2.6</td><td>Installed</td><td>#1</td><td>ApacheNonAdmin</td><td>0</td></row>
-		<row><td>Registry2</td><td>2</td><td>SOFTWARE\Apache Software Foundation\Apache\2.2.6</td><td>Shared</td><td>#1</td><td>ApacheAdmin</td><td>0</td></row>
+		<row><td>Registry11</td><td>1</td><td>SOFTWARE\Apache Software Foundation\Apache\2.2.7</td><td>Installed</td><td>#1</td><td>ApacheNonAdmin</td><td>0</td></row>
+		<row><td>Registry2</td><td>2</td><td>SOFTWARE\Apache Software Foundation\Apache\2.2.7</td><td>Shared</td><td>#1</td><td>ApacheAdmin</td><td>0</td></row>
 		<row><td>Registry3</td><td>2</td><td>SOFTWARE\Classes\.conf</td><td/><td>txtfile</td><td>ApacheAdmin</td><td>0</td></row>
 		<row><td>Registry4</td><td>2</td><td>SOFTWARE\Classes\.conf</td><td>Content Type</td><td>text/plain</td><td>ApacheAdmin</td><td>0</td></row>
 		<row><td>Registry5</td><td>2</td><td>SOFTWARE\Classes\.log</td><td/><td>txtfile</td><td>ApacheAdmin</td><td>0</td></row>
@@ -4831,9 +4768,8 @@
 		<col def="S255">ISComments</col>
 		<col def="S255">ISShortcutName</col>
 		<col def="I4">ISAttributes</col>
-		<row><td>NewShortcut</td><td>StartupFolder</td><td>##Shortcut_ApacheMonitor_ShortLongName##</td><td>ApacheMonitor</td><td>[#F161005_ApacheMonitor.exe]</td><td/><td>##Shortcut_ApacheMonitor_desc##</td><td>0</td><td/><td/><td>1</td><td/><td/><td/><td/></row>
 		<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>[#F161005_ApacheMonitor.exe]</td><td/><td>##Shortcut_ApacheMonitor_desc##</td><td>0</td><td/><td/><td>1</td><td>INSTALLDIR</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>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>



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