aboutsummaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2017-08-11 12:43:48 -0700
committerAnders Broman <a.broman58@gmail.com>2017-08-15 14:48:29 +0000
commit719adb4fdc61e5187efefdfeb25a41d60d40be7f (patch)
tree5fa55129c5dd026b006e5ea58256b8278c484843 /packaging
parentf4ca61220aa65e42d880c947ce9c01dfe5bc8d4b (diff)
Convert README to README.md.
Convert the contents of the top-level README to Markdown and give it a .md extension. Most of our documentation is plain text or AsciiDoc, but the top-level README file in a Git repository is special in that many online browsers will show the README contents along with the directory listing and those browsers tend to favor Markdown. This is true of GitHub (which we're currently mirroring to), Gerrit via its Gitiles plugin (which we're not yet using but likely will), and other places. Add "foreign" to AM_INIT_AUTOMAKE. There is probably a joke to be made here about the FSF and border walls. Change-Id: I87c306d74864e1f0a432225b160a1b4483ee946c Reviewed-on: https://code.wireshark.org/review/23049 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'packaging')
-rw-r--r--packaging/wix/ComponentGroups.wxi8
-rw-r--r--packaging/wix/Makefile.am2
2 files changed, 5 insertions, 5 deletions
diff --git a/packaging/wix/ComponentGroups.wxi b/packaging/wix/ComponentGroups.wxi
index 3220eb3..b74b97b 100644
--- a/packaging/wix/ComponentGroups.wxi
+++ b/packaging/wix/ComponentGroups.wxi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Include>
<!-- Wireshark -->
@@ -38,8 +38,8 @@
<Component Id="cmpNEWS_txt" Guid="*">
<File Id="filNEWS_txt" KeyPath="yes" Source="$(var.Staging.Dir)\NEWS.txt" />
</Component>
- <Component Id="cmpREADME_txt" Guid="*">
- <File Id="filREADME_txt" KeyPath="yes" Source="$(var.Staging.Dir)\README.txt" />
+ <Component Id="cmpREADME_md" Guid="*">
+ <File Id="filREADME_md" KeyPath="yes" Source="$(var.Staging.Dir)\README.md" />
</Component>
<Component Id="cmpREADME_windows_txt" Guid="*">
<File Id="filREADME_windows_txt" KeyPath="yes" Source="$(var.Staging.Dir)\README.windows.txt" />
@@ -92,7 +92,7 @@
<ComponentRef Id="cmpLibwsutil_dll" />
<ComponentRef Id="cmpCOPYING_txt" />
<ComponentRef Id="cmpNEWS_txt" />
- <ComponentRef Id="cmpREADME_txt" />
+ <ComponentRef Id="cmpREADME_md" />
<ComponentRef Id="cmpREADME_windows_txt" />
<ComponentRef Id="cmpAUTHORS_SHORT" />
<ComponentRef Id="cmpManuf" />
diff --git a/packaging/wix/Makefile.am b/packaging/wix/Makefile.am
index ce663a2..77f59f3 100644
--- a/packaging/wix/Makefile.am
+++ b/packaging/wix/Makefile.am
@@ -10,7 +10,7 @@ EXTRA_DIST = \
InputPaths.wxi \
Plugins.wxi \
Prerequisites.wxi \
- README \
+ README.md \
StringOverrides.wxl \
UserInterface.wxi \
Wireshark.wxs \