From e70e2dbe9f3fd6422ba74c5f36d50c80705c2ba8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Date: Tue, 2 Jun 2009 12:23:37 +0000 Subject: [PATCH] Change /index.php/ in wiki.openstreetmap.org links to /wiki/. This looks nicer --- app/controllers/changeset_controller.rb | 2 +- app/views/layouts/site.rhtml | 2 +- app/views/notifier/gpx_failure.rhtml | 2 +- app/views/notifier/signup_confirm.text.plain.rhtml | 2 +- app/views/trace/_trace_form.rhtml | 2 +- app/views/user/account.rhtml | 2 +- doc/README_FOR_APP | 6 +++--- public/404.html | 4 ++-- public/500.html | 4 ++-- test/functional/api_controller_test.rb | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb index 704a2a0f6..469d45f35 100644 --- 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 - # 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 diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml index 0da605ee2..aac7d16b4 100644 --- a/app/views/layouts/site.rhtml +++ b/app/views/layouts/site.rhtml @@ -105,7 +105,7 @@
<%= t 'layouts.help_wiki' %>
<%= t 'layouts.news_blog' %>
- <%= t 'layouts.shop' %>
+ <%= t 'layouts.shop' %>
<%= yield :left_menu %>
diff --git a/app/views/notifier/gpx_failure.rhtml b/app/views/notifier/gpx_failure.rhtml index 7035e45d1..70d5d9b71 100644 --- 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: - 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 661179909..7c4e75872 100644 --- 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' %> -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 9d9dd146a..b8117901f 100644 --- a/app/views/trace/_trace_form.rhtml +++ b/app/views/trace/_trace_form.rhtml @@ -4,6 +4,6 @@ <%= t'trace.trace_form.description' %><%= f.text_field :description, :size => 50, :maxlength => 255 %> <%= t'trace.trace_form.tags' %><%= f.text_field :tagstring, :size => 50, :maxlength => 255 %> <%= t'trace.trace_form.public' %><%= f.check_box :public %> - <%= submit_tag t('trace.trace_form.upload_button') %> | <%= t'trace.trace_form.help' %> + <%= submit_tag t('trace.trace_form.upload_button') %> | <%= t'trace.trace_form.help' %> <% end %> diff --git a/app/views/user/account.rhtml b/app/views/user/account.rhtml index e43612673..15a8f6827 100644 --- a/app/views/user/account.rhtml +++ b/app/views/user/account.rhtml @@ -40,7 +40,7 @@

Public editing

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. - Since the 0.6 API changeover, only public users can edit map data. (find out why).
+ Since the 0.6 API changeover, only public users can edit map data. (find out why).
Your email address will not be revealed by becoming public.
This action cannot be reversed and all new users are now public by default.


diff --git a/doc/README_FOR_APP b/doc/README_FOR_APP index 6c4e6b0fc..dc6dbad6f 100644 --- 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 -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) @@ -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 -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 diff --git a/public/404.html b/public/404.html index 16abbfca0..9f6b91c7f 100644 --- a/public/404.html +++ b/public/404.html @@ -6,7 +6,7 @@

File not found

Couldn't find a file/directory/API operation by that name on the OpenStreetMap server (HTTP 404)

-

Feel free to contact the OpenStreetMap community if you have found a broken link / bug. Make a note of the exact URL of your request.

+

Feel free to contact the OpenStreetMap community if you have found a broken link / bug. Make a note of the exact URL of your request.

- \ No newline at end of file + diff --git a/public/500.html b/public/500.html index 552024a2d..508bd4e95 100644 --- a/public/500.html +++ b/public/500.html @@ -6,8 +6,8 @@

Application error

The OpenStreetMap server encountered an unexpected condition that prevented it from fulfilling the request (HTTP 500)

-

Feel free to contact the OpenStreetMap community if your problem persists. Make a note of the exact URL / post data of your request.

+

Feel free to contact the OpenStreetMap community if your problem persists. Make a note of the exact URL / post data of your request.

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)

- \ No newline at end of file + diff --git a/test/functional/api_controller_test.rb b/test/functional/api_controller_test.rb index 285556cd8..89411ab03 100644 --- 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: - # 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 -- 2.43.2