Change /index.php/ in wiki.openstreetmap.org links to /wiki/. This looks nicer

diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb
index 704a2a0f634aaa90e3aee9816461c17d07bcd366..469d45f35daac89b945dbf82a4952ddfdd22795e 100644 (file)
--- a/app/controllers/changeset_controller.rb
+++ b/app/controllers/changeset_controller.rb
@@ -115,7 +115,7 @@ class ChangesetController < ApplicationController
   # changeset.
   #
   # Returns: a diffResult document, as described in 
   # changeset.
   #
   # Returns: a diffResult document, as described in 

-  # http://wiki.openstreetmap.org/index.php/OSM_Protocol_Version_0.6
+  # http://wiki.openstreetmap.org/wiki/OSM_Protocol_Version_0.6

   def upload
     # only allow POST requests, as the upload method is most definitely
     # not idempotent, as several uploads with placeholder IDs will have
   def upload
     # only allow POST requests, as the upload method is most definitely
     # not idempotent, as several uploads with placeholder IDs will have

diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml
index 0da605ee207709c77c2a6e5c249c9d48b828903a..aac7d16b4997306d61445f7757297d1b5ce77b09 100644 (file)
--- a/app/views/layouts/site.rhtml
+++ b/app/views/layouts/site.rhtml
@@ -105,7 +105,7 @@
       <div id="left_menu" class="left_menu">
         <a href="http://wiki.openstreetmap.org"><%= t 'layouts.help_wiki' %></a><br />
         <a href="http://www.opengeodata.org/"><%= t 'layouts.news_blog' %></a><br />
       <div id="left_menu" class="left_menu">
         <a href="http://wiki.openstreetmap.org"><%= t 'layouts.help_wiki' %></a><br />
         <a href="http://www.opengeodata.org/"><%= t 'layouts.news_blog' %></a><br />

-        <a href="http://wiki.openstreetmap.org/index.php/Merchandise"><%= t 'layouts.shop' %></a><br />
+        <a href="http://wiki.openstreetmap.org/wiki/Merchandise"><%= t 'layouts.shop' %></a><br />

         <%= yield :left_menu %>
       </div>
 
         <%= yield :left_menu %>
       </div>
 

diff --git a/app/views/notifier/gpx_failure.rhtml b/app/views/notifier/gpx_failure.rhtml
index 7035e45d180318432613f4ff35f0a204d42a2b26..70d5d9b71b52777f8a05891083de031fd46982ef 100644 (file)
--- a/app/views/notifier/gpx_failure.rhtml
+++ b/app/views/notifier/gpx_failure.rhtml
@@ -6,4 +6,4 @@ failed to import. Here's the error:
 More information about GPX import failures and how to avoid
 them can be found at:
 
 More information about GPX import failures and how to avoid
 them can be found at:
 

-  http://wiki.openstreetmap.org/index.php/GPX_Import_Failures
+  http://wiki.openstreetmap.org/wiki/GPX_Import_Failures

diff --git a/app/views/notifier/signup_confirm.text.plain.rhtml b/app/views/notifier/signup_confirm.text.plain.rhtml
index 661179909c36319ab557e0d48ff7fa68a359c8aa..7c4e758720e20ec5e601383f647648e3dd7e9523 100644 (file)
--- a/app/views/notifier/signup_confirm.text.plain.rhtml
+++ b/app/views/notifier/signup_confirm.text.plain.rhtml
@@ -34,4 +34,4 @@
 <%= t'notifier.signup_confirm_plain.current_user_1' %>
 <%= t'notifier.signup_confirm_plain.current_user_2' %>
 
 <%= t'notifier.signup_confirm_plain.current_user_1' %>
 <%= t'notifier.signup_confirm_plain.current_user_2' %>
 

-http://wiki.openstreetmap.org/index.php/Category:Users_by_geographical_region
+http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region

diff --git a/app/views/trace/_trace_form.rhtml b/app/views/trace/_trace_form.rhtml
index 9d9dd146ab3df4c50fbdbef6298258b80609a267..b8117901f0ab510de8cc3f3b0486c37f9e112ebc 100644 (file)
--- a/app/views/trace/_trace_form.rhtml
+++ b/app/views/trace/_trace_form.rhtml
@@ -4,6 +4,6 @@
   <tr><td align="right"><%= t'trace.trace_form.description' %></td><td><%= f.text_field :description, :size => 50, :maxlength => 255 %></td></tr>
   <tr><td align="right"><%= t'trace.trace_form.tags' %></td><td><%= f.text_field :tagstring, :size => 50, :maxlength => 255 %></td></tr>
   <tr><td align="right"><%= t'trace.trace_form.public' %></td><td><%= f.check_box :public %></td></tr>
   <tr><td align="right"><%= t'trace.trace_form.description' %></td><td><%= f.text_field :description, :size => 50, :maxlength => 255 %></td></tr>
   <tr><td align="right"><%= t'trace.trace_form.tags' %></td><td><%= f.text_field :tagstring, :size => 50, :maxlength => 255 %></td></tr>
   <tr><td align="right"><%= t'trace.trace_form.public' %></td><td><%= f.check_box :public %></td></tr>

-  <tr><td></td><td><%= submit_tag t('trace.trace_form.upload_button') %> | <a href="http://wiki.openstreetmap.org/index.php/Upload"><%= t'trace.trace_form.help' %></a></td></tr>
+  <tr><td></td><td><%= submit_tag t('trace.trace_form.upload_button') %> | <a href="http://wiki.openstreetmap.org/wiki/Upload"><%= t'trace.trace_form.help' %></a></td></tr>

 </table>
 <% end %>
 </table>
 <% end %>

diff --git a/app/views/user/account.rhtml b/app/views/user/account.rhtml
index e43612673a15d00fbfbbee9005adbbd405f4b8b6..15a8f6827054cd2d50a4cbf371a578ac10264c26 100644 (file)
--- a/app/views/user/account.rhtml
+++ b/app/views/user/account.rhtml
@@ -40,7 +40,7 @@
 <a name="public"></a>
 <h2>Public editing</h2>
   Currently your edits are anonymous and people can't send you messages or see your location. To show what you edited and allow people to contact you through the website, click the button below.
 <a name="public"></a>
 <h2>Public editing</h2>
   Currently your edits are anonymous and people can't send you messages or see your location. To show what you edited and allow people to contact you through the website, click the button below.

-  <b>Since the 0.6 API changeover, only public users can edit map data</b>. (<a href="http://wiki.openstreetmap.org/index.php/Disabling_anonymous_edits">find out why</a>).<br />
+  <b>Since the 0.6 API changeover, only public users can edit map data</b>. (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">find out why</a>).<br />

   Your email address will not be revealed by becoming public.<br />
   This action cannot be reversed and all new users are now public by default.<br />
   <br /><br />
   Your email address will not be revealed by becoming public.<br />
   This action cannot be reversed and all new users are now public by default.<br />
   <br /><br />

diff --git a/doc/README_FOR_APP b/doc/README_FOR_APP
index 6c4e6b0fcf38ebdef9a39fe7d05b5f0ff2132124..dc6dbad6fe91639aa434a895291a6449316160a6 100644 (file)
--- a/doc/README_FOR_APP
+++ b/doc/README_FOR_APP
@@ -5,7 +5,7 @@ see to use models etc.
 =INSTALL
 
 Full information is available at 
 =INSTALL
 
 Full information is available at 

-http://wiki.openstreetmap.org/index.php/Rails
+http://wiki.openstreetmap.org/wiki/Rails

 
 * Get rails working (http://www.rubyonrails.org/)
 * Make your db (see db/README)
 
 * Get rails working (http://www.rubyonrails.org/)
 * Make your db (see db/README)


@@ -24,8 +24,8 @@ http://wiki.openstreetmap.org/index.php/Rails
 See
 
 The information about the next version of the protocol API 0.6 is available at 
 See
 
 The information about the next version of the protocol API 0.6 is available at 

-http://wiki.openstreetmap.org/index.php/OSM_Protocol_Version_0.6
-http://wiki.openstreetmap.org/index.php/REST
+http://wiki.openstreetmap.org/wiki/OSM_Protocol_Version_0.6
+http://wiki.openstreetmap.org/wiki/REST

 
 =HACKING
 
 
 =HACKING
 

diff --git a/public/404.html b/public/404.html
index 16abbfca0e03f0483709dcbf6e08b06319ac42e5..9f6b91c7ff5d97318cfa9522d8c7ab9020c1afab 100644 (file)
--- a/public/404.html
+++ b/public/404.html
@@ -6,7 +6,7 @@
   <div style="float:left;">
     <h1>File not found</h1>  
     <p>Couldn't find a file/directory/API operation by that name on the OpenStreetMap server (HTTP 404)</p>
   <div style="float:left;">
     <h1>File not found</h1>  
     <p>Couldn't find a file/directory/API operation by that name on the OpenStreetMap server (HTTP 404)</p>

-    <p>Feel free to <a href="http://wiki.openstreetmap.org/index.php/Contact" title="Various contact channels explained">contact</a> the OpenStreetMap community if you have found a broken link / bug. Make a note of the exact URL of your request.</p>
+    <p>Feel free to <a href="http://wiki.openstreetmap.org/wiki/Contact" title="Various contact channels explained">contact</a> the OpenStreetMap community if you have found a broken link / bug. Make a note of the exact URL of your request.</p>

   </div>
 </body>
   </div>
 </body>

-</html>
\ No newline at end of file
+</html>

diff --git a/public/500.html b/public/500.html
index 552024a2db5cd8829bd528c5ade2022b1564ff91..508bd4e95bac447c292f01c9f29f2c879d67a3bd 100644 (file)
--- a/public/500.html
+++ b/public/500.html
@@ -6,8 +6,8 @@
   <div style="float:left;">
     <h1>Application error</h1>
     <p>The OpenStreetMap server encountered an unexpected condition that prevented it from fulfilling the request (HTTP 500)</p>
   <div style="float:left;">
     <h1>Application error</h1>
     <p>The OpenStreetMap server encountered an unexpected condition that prevented it from fulfilling the request (HTTP 500)</p>

-    <p>Feel free to <a href="http://wiki.openstreetmap.org/index.php/Contact" title="Various contact channels explained">contact</a> the OpenStreetMap community if your problem persists. Make a note of the exact URL / post data of your request.</p>
+    <p>Feel free to <a href="http://wiki.openstreetmap.org/wiki/Contact" title="Various contact channels explained">contact</a> the OpenStreetMap community if your problem persists. Make a note of the exact URL / post data of your request.</p>

     <p>This may be a problem in our Ruby On Rails code. 500 ocurrs with exceptions thrown outside of an action (like in Dispatcher setups or broken Ruby code)</p>
   </div>
 </body>
     <p>This may be a problem in our Ruby On Rails code. 500 ocurrs with exceptions thrown outside of an action (like in Dispatcher setups or broken Ruby code)</p>
   </div>
 </body>

-</html>
\ No newline at end of file
+</html>

diff --git a/test/functional/api_controller_test.rb b/test/functional/api_controller_test.rb
index 285556cd87ca2f4b3224cfd756a387c2e66de780..89411ab03db64f21ca228fff7113fed7a7fce20d 100644 (file)
--- a/test/functional/api_controller_test.rb
+++ b/test/functional/api_controller_test.rb
@@ -149,7 +149,7 @@ class ApiControllerTest < ActionController::TestCase
   
   # MySQL and Postgres require that the C based functions are installed for 
   # this test to work. More information is available from:
   
   # MySQL and Postgres require that the C based functions are installed for 
   # this test to work. More information is available from:

-  # http://wiki.openstreetmap.org/index.php/Rails#Installing_the_quadtile_functions
+  # http://wiki.openstreetmap.org/wiki/Rails#Installing_the_quadtile_functions

   # or by looking at the readme in db/README
   def test_changes_simple
     get :changes
   # or by looking at the readme in db/README
   def test_changes_simple
     get :changes