diff --git a/src/chm/html/authoring_bundle_package_manifest.htm b/src/chm/html/authoring_bundle_package_manifest.htm --- a/src/chm/html/authoring_bundle_package_manifest.htm +++ b/src/chm/html/authoring_bundle_package_manifest.htm @@ -39,10 +39,10 @@ <PackageGroup Id="MyPackage"> <ExePackage SourceFile="[sources]\packages\shared\MyPackage.exe" - DownloadURL="http://mywebdomain.com/?mypackage.exe + DownloadUrl="http://example.com/?mypackage.exe" InstallCommand="/q /ACTION=Install" RepairCommand="/q ACTION=Repair /hideconsole" - UninstallCommand="/q ACTION=Uninstall /hideconsole /> + UninstallCommand="/q ACTION=Uninstall /hideconsole" /> </PackageGroup> </Fragment> </Wix> @@ -60,10 +60,10 @@ <PackageGroup Id="MyPackage"> <ExePackage SourceFile="[sources]\packages\shared\MyPackage.exe" - DownloadURL="http://mywebdomain.com/?mypackage.exe + DownloadUrl="http://example.com/?mypackage.exe" InstallCommand="/q /ACTION=Install" RepairCommand="/q ACTION=Repair /hideconsole" - UninstallCommand="/q ACTION=Uninstall /hideconsole + UninstallCommand="/q ACTION=Uninstall /hideconsole" InstallCondition="NOT VersionNT64 AND VersionNT >= v5.1" /> </PackageGroup> </Fragment> diff --git a/src/chm/html/bundle_author_chain.htm b/src/chm/html/bundle_author_chain.htm --- a/src/chm/html/bundle_author_chain.htm +++ b/src/chm/html/bundle_author_chain.htm @@ -36,7 +36,7 @@ <Chain> <ExePackage SourceFile="[sources]\packages\shared\MyPackage.exe" - DownloadURL="http://mywebdomain.com/?mypackage.exe + DownloadUrl="http://example.com/?mypackage.exe" InstallCommand="/q /ACTION=Install" RepairCommand="/q ACTION=Repair /hideconsole"/> </Chain> diff --git a/src/chm/html/bundle_define_searches.htm b/src/chm/html/bundle_define_searches.htm --- a/src/chm/html/bundle_define_searches.htm +++ b/src/chm/html/bundle_define_searches.htm @@ -77,10 +77,10 @@ <PackageGroup Id="MyPackage"> <ExePackage SourceFile="[sources]\packages\shared\MyPackage.exe" - DownloadURL="http://mywebdomain.com/?mypackage.exe + DownloadUrl="http://example.com/?mypackage.exe" InstallCommand="/q /ACTION=Install" RepairCommand="/q ACTION=Repair /hideconsole" - UninstallCommand="/q ACTION=Uninstall /hideconsole " + UninstallCommand="/q ACTION=Uninstall /hideconsole" InstallCondition="[x86] = 1 AND [OSVersion] >= 5.0.5121.0 AND [patchLevel] = 0" /> </PackageGroup> </Fragment> diff --git a/src/chm/html/wixdev_getting_started.htm b/src/chm/html/wixdev_getting_started.htm --- a/src/chm/html/wixdev_getting_started.htm +++ b/src/chm/html/wixdev_getting_started.htm @@ -11,13 +11,13 @@

So you want to be a Windows Installer XML developer?

-

People have started expressing interest in joining the Windows Installer XML toolset development community so I figured I should get some administrative details out of the way.  If you are interested in contributing code to the Windows Installer XML toolset, it is very important to read through all four of these topics.

+

People have started expressing interest in joining the Windows Installer XML toolset development community so I figured I should get some administrative details out of the way.  If you are interested in contributing code to the Windows Installer XML toolset, it is very important to read through all four of these topics.

1)  The Windows Installer XML toolset copyright is held by Microsoft.

I want to be very up front about the copyright of the Windows Installer XML toolset and how it affects us as developers.  Microsoft is the sponsor of the Windows Installer XML project.  Before a contribution can be accepted into the WiX project, the lawyers have asked that we assign our rights to those contributions to Microsoft.  By having developers sign a copyright assignment agreement, Microsoft can maintain single legal control of the project.  That single legal control enables Microsoft to best defend the project in the future if there was ever any sort of legal challenge.

-

Before jumping to any conspiracy theories, please note that this copyright assignment is exactly the same process the Free Software Foundation has you go through if you work on a project they sponsor.  Also, in Clause 5 of the Windows Installer XML assignment agreement your rights to your contribution are explicitly granted back to you.  If you would like a copy of the assignment agreement, please contact wixadmin@microsoft.com.

+

Before jumping to any conspiracy theories, please note that this copyright assignment is exactly the same process the Free Software Foundation has you go through if you work on a project they sponsor.  Also, in Clause 5 of the Windows Installer XML assignment agreement your rights to your contribution are explicitly granted back to you.  If you would like a copy of the assignment agreement, please contact wixadmin@microsoft.com.

2)  The Windows Installer XML project is a benevolent dictatorship.

@@ -27,7 +27,7 @@

3)  The Windows Installer XML community is a meritocracy.

-

Those individuals in the community who demonstrate an understanding of the code base by actively participating on the Windows Installer XML mailing lists and consistently submitting high quality diffs will be given a “Karma boost”.  With enough Karma you will earn the ability to commit changes directly to the Windows Installer XML project’s CVS tree.

+

Those individuals in the community who demonstrate an understanding of the code base by actively participating on the Windows Installer XML mailing lists and consistently submitting high quality diffs will be given a “Karma boost”.  With enough Karma you will earn the ability to commit changes directly to the Windows Installer XML project’s CVS tree.

Commit privileges should not be taken lightly.  It is very important that the WiX toolset maintain a high quality bar because many people depend on the tools working properly.  Very few developers earn these privileges.  In fact, in over four years of development, only five developers have earned commit privileges to the internal Windows Installer XML project.

diff --git a/src/wix/Xsd/wix.xsd b/src/wix/Xsd/wix.xsd --- a/src/wix/Xsd/wix.xsd +++ b/src/wix/Xsd/wix.xsd @@ -9300,7 +9300,7 @@ - Reference to the Binary element that contains the chainer executeable. Mutually exclusive with + Reference to the Binary element that contains the chainer executable. Mutually exclusive with the FileSource and PropertySource attributes. @@ -9308,7 +9308,7 @@ - Reference to the File element that is the chainer executeable. Mutually exclusive with + Reference to the File element that is the chainer executable. Mutually exclusive with the BinarySource and PropertySource attributes. @@ -9316,7 +9316,7 @@ - Reference to a Property that resolves to the full path to the chainer executeable. Mutually exclusive with + Reference to a Property that resolves to the full path to the chainer executable. Mutually exclusive with the BinarySource and FileSource attributes.