Hi Jer,
This is the updated patch. Please apply this time :)
ChangeLog
Remove all references to .shtml. Minor aesthetic fixes.
--
Dimi.
Index: .htaccess
===================================================================
RCS file: /home/wine/lostwages/.htaccess,v
retrieving revision 1.12
diff -u -r1.12 .htaccess
--- .htaccess 28 Jul 2003 22:38:07 -0000 1.12
+++ .htaccess 26 Aug 2003 12:40:54 -0000
@@ -78,3 +78,6 @@
RedirectPermanent /find http://source.winehq.org/find
RedirectPermanent /search http://source.winehq.org/search
RedirectPermanent /diff http://source.winehq.org/search
+
+# we no longer use .shtml, redirect to .html
+RedirectMatch ^/(.*)\.shtml(.*)$ http://www.winehq.org/$1.html$2
Index: templates/en/contributing.template
===================================================================
RCS file: /home/wine/lostwages/templates/en/contributing.template,v
retrieving revision 1.14
diff -u -r1.14 contributing.template
--- templates/en/contributing.template 28 Jul 2003 22:33:40 -0000 1.14
+++ templates/en/contributing.template 26 Aug 2003 12:40:55 -0000
@@ -381,7 +381,7 @@
the workings of their patch at all !)
</p>
<p>If you spend a lot of time monitoring either the newsgroup or wine-users
- you are a good candidate for suggesting updates to the <a href="{$root}/docs/wine-faq/t1.shtml">wine FAQ.</a>
+ you are a good candidate for suggesting updates to the <a href="{$root}/site/faq">wine FAQ.</a>
</p>
<p>
The documentation updates would be done by sending "cvs diff"s of the
Index: templates/en/faq.template
===================================================================
RCS file: /home/wine/lostwages/templates/en/faq.template,v
retrieving revision 1.10
diff -u -r1.10 faq.template
--- templates/en/faq.template 28 Jul 2003 22:33:40 -0000 1.10
+++ templates/en/faq.template 26 Aug 2003 12:40:56 -0000
@@ -808,8 +808,8 @@
<h3><a name="I_have_written_some_code_that_I_would"></a>I have written some code that I would like to submit to the Wine project. How do I go about doing this?</h3>
<p>Patches are greatly appreciated and should be submitted to the wine-patches mailing list
-(<a href="http://www.winehq.org/site/sending_patches";>http://www.winehq.org/site/sending_patches</a>).Also see this page
-for a description of what happens to submitted patches.</p>
+(<a href="http://www.winehq.org/site/sending_patches";>http://www.winehq.org/site/sending_patches</a>).
+Also see this page for a description of what happens to submitted patches.</p>
<a href="#TOP">Back to top</a>
Index: templates/en/status_wine.template
===================================================================
RCS file: /home/wine/lostwages/templates/en/status_wine.template,v
retrieving revision 1.4
diff -u -r1.4 status_wine.template
--- templates/en/status_wine.template 28 Jul 2003 22:33:40 -0000 1.4
+++ templates/en/status_wine.template 26 Aug 2003 12:40:57 -0000
@@ -55,7 +55,7 @@
</tr>
<tr>
<td>Wine's fundamental architecture</td>
- <td class="outdadeq"><a href="http://www.winehq.com/docs/wine-devel/architecture.shtml";>Getting outdated</a></td>
+ <td class="outdadeq"><a href="http://www.winehq.com/docs/wine-devel/architecture.html";>Getting outdated</a></td>
<td><a href="?issue=50#Feature: Wine Architecture by Ove Kåven">#50</a>,
<a href="?issue=154#Kernel%20Module%20/%20Shared%20Memory%20Revisited">#154</a></td>
<td class="pct85">85% complete</td>
@@ -146,7 +146,7 @@
</tr>
<tr>
<td>Native DLL overrides</td>
- <td class="good"><a href="http://www.winehq.org/docs/wine-user/dll-config.shtml";>Good</a></td>
+ <td class="good"><a href="http://www.winehq.org/docs/wine-user/dll-config.html";>Good</a></td>
<td><a href="?issue=46#Feature: DLL overrides by Ove Kåven">#46</a>,
<a href="?issue=134#Native vs.Builtin DLL's">#134</a></td>
<td class="pct95">95% complete</td>
@@ -445,7 +445,7 @@
</tr>
<tr>
<td>Wine Conformance Test Suite</td>
- <td class="good"><a href="http://www.winehq.org/Docs/wine-devel/testing.shtml";>Good</a></td>
+ <td class="good"><a href="http://www.winehq.org/docs/wine-devel/testing.html";>Good</a></td>
<td><a href="?issue=119#Improving Regression Testing">#119</a>,
<a href="?issue=120#CreateProcess Test">#120</a>,
<a href="?issue=121#More Tests">#121</a>,
@@ -494,7 +494,7 @@
</tr>
<tr>
<td>How to install Wine</td>
- <td class="good"><a href="http://www.winehq.com/Docs/wine-user/";>Good</td>
+ <td class="good"><a href="http://www.winehq.com/docs/wine-user/";>Good</td>
<td>None</td>
<td class="pct90"><a href="{$root}/site/status_todo#Instructions_">90% possible</a><br>
(on x86s running Linux, FreeBSD, or Solaris)</td>
@@ -502,7 +502,7 @@
</tr>
<tr>
<td>How to debug</td>
- <td class="adeqgood"><a href="http://www.winehq.com/Docs/wine-user/bugs.shtml";>Adequate</td>
+ <td class="adeqgood"><a href="http://www.winehq.com/docs/wine-user/bugs.html";>Adequate</td>
<td><a href="?issue=33#Debugging Wine with Microsoft tools">#33</a>,
<a href="?issue=76#Setting up Winedbg">#76</a>,
<a href="?issue=113#Setting Breakpoints in the Debugger">#113</a>,
@@ -514,7 +514,7 @@
</tr>
<tr>
<td>How to create a useful bug report</td>
- <td class="adeqgood"><a href="http://www.winehq.com/Docs/wine-user/bug-reporting.shtml";>Adequate</td>
+ <td class="adeqgood"><a href="http://www.winehq.com/docs/wine-user/bug-reporting.html";>Adequate</td>
<td><a href="?issue=122#Bugzilla: A Call to Arms">#122</a></td>
<td class="pct80">80% possible</td>
<td>Andreas Mohr</td>
@@ -541,7 +541,7 @@
</tr>
<tr>
<td>How to compile MFC with Winelib</td>
- <td class="outdadeq"><a href="http://www.winehq.com/Docs/winelib-user/mfc-compiling.shtml";>Outdated</td>
+ <td class="outdadeq"><a href="http://www.winehq.com/docs/winelib-user/mfc-compiling.html";>Outdated</td>
<td><a href="?issue=44#MFC and Wine">#44</a></td>
<td class="pct60">60% possible</td>
<td>Andreas Mohr</td>
Index: templates/en/winelib.template
===================================================================
RCS file: /home/wine/lostwages/templates/en/winelib.template,v
retrieving revision 1.3
diff -u -r1.3 winelib.template
--- templates/en/winelib.template 3 Jul 2003 17:33:59 -0000 1.3
+++ templates/en/winelib.template 26 Aug 2003 12:40:58 -0000
@@ -71,7 +71,7 @@
<dd>For these, <tt>winemaker</tt> does a decent job of generating a build system.
I will not cover this type of applications here, for the time being.
Please refer to the <tt>winemaker</tt>
- <a href="http://www.winehq.org/Docs/winelib-user/winelib-getting-started.shtml#WINEMAKER-INTRODUCTION";>documentation</a>
+ <a href="http://www.winehq.org/Docs/winelib-user/winelib-getting-started.html#WINEMAKER-INTRODUCTION";>documentation</a>
for more information.</dd>
<dt>GNU tools based build process</dt>
Index: wwn/wn20000925_62.xml
===================================================================
RCS file: /home/wine/lostwages/wwn/wn20000925_62.xml,v
retrieving revision 1.4
diff -u -r1.4 wn20000925_62.xml
--- wwn/wn20000925_62.xml 25 Jul 2003 18:45:03 -0000 1.4
+++ wwn/wn20000925_62.xml 26 Aug 2003 12:40:58 -0000
@@ -169,8 +169,8 @@
<quote who="Martin Pilka">
wine-configuration wizard 0.3beta is now available at
-<a href="http://www.winehq.com/Docs/wine-user/config-helper-programs.shtml#CONFIG-HELPER-WINECFG";>
-http://www.winehq.com/Docs/wine-user/config-helper-programs.shtml#CONFIG-HELPER-WINECFG</a>
+<a href="http://www.winehq.com/docs/wine-user/config-helper-programs.html#CONFIG-HELPER-WINECFG";>
+http://www.winehq.com/docs/wine-user/config-helper-programs.html#CONFIG-HELPER-WINECFG</a>
</quote>
Index: wwn/wn20001016_65.xml
===================================================================
RCS file: /home/wine/lostwages/wwn/wn20001016_65.xml,v
retrieving revision 1.3
diff -u -r1.3 wn20001016_65.xml
--- wwn/wn20001016_65.xml 18 Jul 2003 20:50:50 -0000 1.3
+++ wwn/wn20001016_65.xml 26 Aug 2003 12:40:58 -0000
@@ -42,8 +42,8 @@
<ul>
<li>Martin Pilka released another version (0.32b) of winecfg tool (see
<kcref issuenum="62" sectionnum="2">for a previous article</kcref>). You can
-grab it at <a href="http://www.winehq.com/Docs/wine-user/config-wine-main.shtml";>
-http://www.winehq.com/Docs/wine-user/config-wine-main.shtml</a></li>
+grab it at <a href="http://www.winehq.com/docs/wine-user/config-wine-main.html";>
+http://www.winehq.com/docs/wine-user/config-wine-main.html</a></li>
</ul>
</section>
Index: wwn/wn20010422_92.xml
===================================================================
RCS file: /home/wine/lostwages/wwn/wn20010422_92.xml,v
retrieving revision 1.3
diff -u -r1.3 wn20010422_92.xml
--- wwn/wn20010422_92.xml 18 Jul 2003 20:50:50 -0000 1.3
+++ wwn/wn20010422_92.xml 26 Aug 2003 12:40:58 -0000
@@ -26,7 +26,7 @@
</ul></p>
<p>Head on over to the <a
-href="http://www.winehq.com/download.shtml";>download</a>
+href="http://www.winehq.com/download.html";>download</a>
page and grab the source.</p>
</intro>
Index: wwn/wn20010513_95.xml
===================================================================
RCS file: /home/wine/lostwages/wwn/wn20010513_95.xml,v
retrieving revision 1.6
diff -u -r1.6 wn20010513_95.xml
--- wwn/wn20010513_95.xml 25 Jul 2003 18:45:03 -0000 1.6
+++ wwn/wn20010513_95.xml 26 Aug 2003 12:40:58 -0000
@@ -375,8 +375,8 @@
(otherwise each of your emails will go through the moderator)</li>
<li> Wine Developer's Guide: Chapter 4. Submitting Patches
- <a href="http://www.winehq.com/Docs/wine-devel/patches.shtml";>
- http://www.winehq.com/Docs/wine-devel/patches.shtml</a>
+ <a href="http://www.winehq.com/docs/wine-devel/patches.html";>
+ http://www.winehq.com/docs/wine-devel/patches.html</a>
All you need to know about submitting patches (I hope)</li>
</ul></p>
Index: wwn/wn20030103_151.xml
===================================================================
RCS file: /home/wine/lostwages/wwn/wn20030103_151.xml,v
retrieving revision 1.4
diff -u -r1.4 wn20030103_151.xml
--- wwn/wn20030103_151.xml 18 Jul 2003 20:50:50 -0000 1.4
+++ wwn/wn20030103_151.xml 26 Aug 2003 12:40:59 -0000
@@ -432,8 +432,8 @@
<quote who="Hans Christian Studt"><p>
I am trying to follow this discription on how to compile win32
source code with the winelib (
-<a href="http://www.winehq.org/Docs/winelib-user/winelib-getting-started.shtml#WINEMAKER-INTRODUCTION";>
-http://www.winehq.org/Docs/winelib-user/winelib-getting-started.shtml#WINEMAKER-INTRODUCTION</a>
+<a href="http://www.winehq.org/docs/winelib-user/winelib-getting-started.html#WINEMAKER-INTRODUCTION";>
+http://www.winehq.org/docs/winelib-user/winelib-getting-started.html#WINEMAKER-INTRODUCTION</a>
)
</p><p>
The process generates a Makefile that is supposed to complie a
Index: wwn/wn20030110_152.xml
===================================================================
RCS file: /home/wine/lostwages/wwn/wn20030110_152.xml,v
retrieving revision 1.4
diff -u -r1.4 wn20030110_152.xml
--- wwn/wn20030110_152.xml 18 Jul 2003 20:50:50 -0000 1.4
+++ wwn/wn20030110_152.xml 26 Aug 2003 12:40:59 -0000
@@ -248,7 +248,7 @@
let me know and I will update this page accordingly.<br />
See the following URL for instructions on how to compile (and debug) the
tests on Windows using Visual C++:
-<a href="http://www.winehq.com/docs/wine-devel/testing-windows.shtml";>http://www.winehq.com/docs/wine-devel/testing-windows.shtml</a>
+<a href="http://www.winehq.com/docs/wine-devel/testing-windows.html";>http://www.winehq.com/docs/wine-devel/testing-windows.html</a>
</p>
<p><a name="incorrect">Note</a>: These tests are conformance tests which means
their main function is to describe the behavior of Windows APIs, and then to
Index: wwn/wn20030425_167.xml
===================================================================
RCS file: /home/wine/lostwages/wwn/wn20030425_167.xml,v
retrieving revision 1.3
diff -u -r1.3 wn20030425_167.xml
--- wwn/wn20030425_167.xml 18 Jul 2003 20:50:50 -0000 1.3
+++ wwn/wn20030425_167.xml 26 Aug 2003 12:41:00 -0000
@@ -595,7 +595,7 @@
(if that is legal) and depend upon Wine handling the low-level network stuff
etc. I don't personally have any experience of that.</p></quote>
-<p>For more info, see the <a href="http://www.winehq.com/Docs/wine-user/config-odbc.shtml";>Wine
+<p>For more info, see the <a href="http://www.winehq.com/docs/wine-user/config-odbc.html";>Wine
User Guide</a>.</p>
</section><section
Index: wwn/interviews/interview_11.xml
===================================================================
RCS file: /home/wine/lostwages/wwn/interviews/interview_11.xml,v
retrieving revision 1.1
diff -u -r1.1 interview_11.xml
--- wwn/interviews/interview_11.xml 12 Aug 2003 21:06:14 -0000 1.1
+++ wwn/interviews/interview_11.xml 26 Aug 2003 12:41:00 -0000
@@ -609,8 +609,8 @@
tests, while 'make file.ok' will run just the file API tests.
</p><p>
For more details about writing Conformance tests, see:
-<a href="http://www.winehq.org/Docs/wine-devel/testing.shtml";>
-http://www.winehq.org/Docs/wine-devel/testing.shtml</a></p>
+<a href="http://www.winehq.org/docs/wine-devel/testing.html";>
+http://www.winehq.org/docs/wine-devel/testing.html</a></p>
</answer>
