OK, now that we really remove the .shtml docs,
maybe we get to get rid of them for good.
ChangeLog
Get rid of the obsolete .shtml references.
--
Dimi.
Index: .htaccess
===================================================================
RCS file: /home/wine/lostwages/.htaccess,v
retrieving revision 1.14
diff -u -r1.14 .htaccess
--- .htaccess 8 Sep 2003 19:13:41 -0000 1.14
+++ .htaccess 9 Sep 2003 04:34:32 -0000
@@ -15,7 +15,7 @@
# redirect winehq services to appropriate web sites
RedirectMatch ^/?page=(.*)$ http://www.winehq.org/site/$1
-RedirectMatch ^/index\.php?page=(.*)$ http://www.winehq.org/site/$1
+RedirectMatch ^/index\.php?page=(.*)$ http://www.winehq.org/site/$1
# redirect old winehq pages to new locations
RedirectPermanent /index.php http://www.winehq.org/site
@@ -69,6 +69,8 @@
RedirectMatch ^/(BUGS|Bugs|bugs)$ http://bugs.winehq.org/
RedirectMatch ^/(TROUBLE|Trouble|trouble)/$ http://www.winehq.org/site/docs/wine-faq/index
RedirectMatch ^/(TROUBLE|Trouble|trouble)$ http://www.winehq.org/site/docs/wine-faq/index
+RedirectMatch ^/site/docs/([a-z-]+)/?$ http://www.winehq.org/site/docs/$1/index
+RedirectMatch ^/site/docs/? http://www.winehq.org/site/documentation
# redirect soure website
RedirectMatch /WineAPI(.*)$ http://source.winehq.org/WineAPI$1
@@ -82,3 +84,5 @@
RedirectPermanent /search http://source.winehq.org/search
RedirectPermanent /diff http://source.winehq.org/search
+# we no longer use .shtml
+RedirectMatch ^/(.*)\.shtml(.*)$ http://www.winehq.org/$1$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 9 Sep 2003 04:13:20 -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/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 9 Sep 2003 04:13:21 -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";>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";>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";>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";>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";>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";>Outdated</td>
<td><a href="?issue=44#MFC and Wine">#44</a></td>
<td class="pct60">60% possible</td>
<td>Andreas Mohr</td>
Index: wwn/wn20000925_62.xml
===================================================================
RCS file: /home/wine/lostwages/wwn/wn20000925_62.xml,v
retrieving revision 1.5
diff -u -r1.5 wn20000925_62.xml
--- wwn/wn20000925_62.xml 4 Sep 2003 15:53:36 -0000 1.5
+++ wwn/wn20000925_62.xml 9 Sep 2003 04:13:22 -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#CONFIG-HELPER-WINECFG";>
+http://www.winehq.com/docs/wine-user/config-helper-programs#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 9 Sep 2003 04:13:22 -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";>
+http://www.winehq.com/docs/wine-user/config-wine-main</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 9 Sep 2003 04:13:22 -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";>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.7
diff -u -r1.7 wn20010513_95.xml
--- wwn/wn20010513_95.xml 4 Sep 2003 15:53:36 -0000 1.7
+++ wwn/wn20010513_95.xml 9 Sep 2003 04:13:23 -0000
@@ -373,8 +373,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";>
+ http://www.winehq.com/docs/wine-devel/patches</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 9 Sep 2003 04:13:23 -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#WINEMAKER-INTRODUCTION";>
+http://www.winehq.org/docs/winelib-user/winelib-getting-started#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 9 Sep 2003 04:13:24 -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</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.4
diff -u -r1.4 wn20030425_167.xml
--- wwn/wn20030425_167.xml 4 Sep 2003 15:53:36 -0000 1.4
+++ wwn/wn20030425_167.xml 9 Sep 2003 04:13:24 -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";>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.2
diff -u -r1.2 interview_11.xml
--- wwn/interviews/interview_11.xml 4 Sep 2003 15:53:37 -0000 1.2
+++ wwn/interviews/interview_11.xml 9 Sep 2003 04:13:25 -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";>
+http://www.winehq.org/docs/wine-devel/testing</a></p>
</answer>
