diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index 4f15d35a0..39786341b 100644
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -49,7 +49,7 @@ class WikiController < ApplicationController
 
   # display a page (in editing mode if it doesn't exist)
   def show
-    page_title = params[:page]
+    page_title = params[:id]
     @page = @wiki.find_or_new_page(page_title)
     if @page.new_record?
       if User.current.allowed_to?(:edit_wiki_pages, @project) && editable?
@@ -82,7 +82,7 @@ class WikiController < ApplicationController
   
   # edit an existing page or a new one
   def edit
-    @page = @wiki.find_or_new_page(params[:page])    
+    @page = @wiki.find_or_new_page(params[:id])    
     return render_403 unless editable?
     @page.content = WikiContent.new(:page => @page) if @page.new_record?
     
@@ -101,7 +101,7 @@ class WikiController < ApplicationController
   verify :method => :post, :only => :update, :render => {:nothing => true, :status => :method_not_allowed }
   # Creates a new page or updates an existing one
   def update
-    @page = @wiki.find_or_new_page(params[:page])    
+    @page = @wiki.find_or_new_page(params[:id])    
     return render_403 unless editable?
     @page.content = WikiContent.new(:page => @page) if @page.new_record?
     
@@ -114,7 +114,7 @@ class WikiController < ApplicationController
       attachments = Attachment.attach_files(@page, params[:attachments])
       render_attachment_warning_if_needed(@page)
       # don't save if text wasn't changed
-      redirect_to :action => 'show', :project_id => @project, :page => @page.title
+      redirect_to :action => 'show', :project_id => @project, :id => @page.title
       return
     end
     @content.attributes = params[:content]
@@ -124,7 +124,7 @@ class WikiController < ApplicationController
       attachments = Attachment.attach_files(@page, params[:attachments])
       render_attachment_warning_if_needed(@page)
       call_hook(:controller_wiki_edit_after_save, { :params => params, :page => @page})
-      redirect_to :action => 'show', :project_id => @project, :page => @page.title
+      redirect_to :action => 'show', :project_id => @project, :id => @page.title
     end
 
   rescue ActiveRecord::StaleObjectError
@@ -140,13 +140,13 @@ class WikiController < ApplicationController
     @original_title = @page.pretty_title
     if request.post? && @page.update_attributes(params[:wiki_page])
       flash[:notice] = l(:notice_successful_update)
-      redirect_to :action => 'show', :project_id => @project, :page => @page.title
+      redirect_to :action => 'show', :project_id => @project, :id => @page.title
     end
   end
   
   def protect
     @page.update_attribute :protected, params[:protected]
-    redirect_to :action => 'show', :project_id => @project, :page => @page.title
+    redirect_to :action => 'show', :project_id => @project, :id => @page.title
   end
 
   # show page history
@@ -210,7 +210,7 @@ class WikiController < ApplicationController
       export = render_to_string :action => 'export_multiple', :layout => false
       send_data(export, :type => 'text/html', :filename => "wiki.html")
     else
-      redirect_to :action => 'show', :project_id => @project, :page => nil
+      redirect_to :action => 'show', :project_id => @project, :id => nil
     end
   end
 
@@ -219,7 +219,7 @@ class WikiController < ApplicationController
   end
   
   def preview
-    page = @wiki.find_page(params[:page])
+    page = @wiki.find_page(params[:id])
     # page is nil when previewing a new page
     return render_403 unless page.nil? || editable?(page)
     if page
@@ -234,7 +234,7 @@ class WikiController < ApplicationController
     return render_403 unless editable?
     attachments = Attachment.attach_files(@page, params[:attachments])
     render_attachment_warning_if_needed(@page)
-    redirect_to :action => 'show', :page => @page.title
+    redirect_to :action => 'show', :id => @page.title
   end
 
 private
@@ -249,7 +249,7 @@ private
   
   # Finds the requested page and returns a 404 error if it doesn't exist
   def find_existing_page
-    @page = @wiki.find_page(params[:page])
+    @page = @wiki.find_page(params[:id])
     render_404 if @page.nil?
   end
   
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 38d43e5b8..12f4b6e5e 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -177,7 +177,7 @@ module ApplicationHelper
       content << "<ul class=\"pages-hierarchy\">\n"
       pages[node].each do |page|
         content << "<li>"
-        content << link_to(h(page.pretty_title), {:controller => 'wiki', :action => 'show', :project_id => page.project, :page => page.title},
+        content << link_to(h(page.pretty_title), {:controller => 'wiki', :action => 'show', :project_id => page.project, :id => page.title},
                            :title => (page.respond_to?(:updated_on) ? l(:label_updated_time, distance_of_time_in_words(Time.now, page.updated_on)) : nil))
         content << "\n" + render_page_hierarchy(pages, page.id) if pages[page.id]
         content << "</li>\n"
@@ -541,7 +541,7 @@ module ApplicationHelper
             when :local; "#{title}.html"
             when :anchor; "##{title}"   # used for single-file wiki export
             else
-              url_for(:only_path => only_path, :controller => 'wiki', :action => 'show', :project_id => link_project, :page => Wiki.titleize(page), :anchor => anchor)
+              url_for(:only_path => only_path, :controller => 'wiki', :action => 'show', :project_id => link_project, :id => Wiki.titleize(page), :anchor => anchor)
             end
           link_to((title || page), url, :class => ('wiki-page' + (wiki_page ? '' : ' new')))
         else
diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 6db5a997b..80be7a629 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -178,9 +178,9 @@ class Mailer < ActionMailer::Base
     message_id wiki_content
     recipients wiki_content.recipients
     cc(wiki_content.page.wiki.watcher_recipients - recipients)
-    subject "[#{wiki_content.project.name}] #{l(:mail_subject_wiki_content_added, :page => wiki_content.page.pretty_title)}"
+    subject "[#{wiki_content.project.name}] #{l(:mail_subject_wiki_content_added, :id => wiki_content.page.pretty_title)}"
     body :wiki_content => wiki_content,
-         :wiki_content_url => url_for(:controller => 'wiki', :action => 'index', :id => wiki_content.project, :page => wiki_content.page.title)
+         :wiki_content_url => url_for(:controller => 'wiki', :action => 'index', :id => wiki_content.project, :id => wiki_content.page.title)
     render_multipart('wiki_content_added', body)
   end
   
@@ -195,10 +195,10 @@ class Mailer < ActionMailer::Base
     message_id wiki_content
     recipients wiki_content.recipients
     cc(wiki_content.page.wiki.watcher_recipients + wiki_content.page.watcher_recipients - recipients)
-    subject "[#{wiki_content.project.name}] #{l(:mail_subject_wiki_content_updated, :page => wiki_content.page.pretty_title)}"
+    subject "[#{wiki_content.project.name}] #{l(:mail_subject_wiki_content_updated, :id => wiki_content.page.pretty_title)}"
     body :wiki_content => wiki_content,
-         :wiki_content_url => url_for(:controller => 'wiki', :action => 'index', :id => wiki_content.project, :page => wiki_content.page.title),
-         :wiki_diff_url => url_for(:controller => 'wiki', :action => 'diff', :id => wiki_content.project, :page => wiki_content.page.title, :version => wiki_content.version)
+         :wiki_content_url => url_for(:controller => 'wiki', :action => 'index', :id => wiki_content.project, :id => wiki_content.page.title),
+         :wiki_diff_url => url_for(:controller => 'wiki', :action => 'diff', :id => wiki_content.project, :id => wiki_content.page.title, :version => wiki_content.version)
     render_multipart('wiki_content_updated', body)
   end
 
diff --git a/app/models/wiki_content.rb b/app/models/wiki_content.rb
index 68de46654..995b6599d 100644
--- a/app/models/wiki_content.rb
+++ b/app/models/wiki_content.rb
@@ -54,7 +54,7 @@ class WikiContent < ActiveRecord::Base
                   :description => :comments,
                   :datetime => :updated_on,
                   :type => 'wiki-page',
-                  :url => Proc.new {|o| {:controller => 'wiki', :action => 'show', :project_id => o.page.wiki.project, :page => o.page.title, :version => o.version}}
+                  :url => Proc.new {|o| {:controller => 'wiki', :action => 'show', :project_id => o.page.wiki.project, :id => o.page.title, :version => o.version}}
 
     acts_as_activity_provider :type => 'wiki_edits',
                               :timestamp => "#{WikiContent.versioned_table_name}.updated_on",
diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb
index d489ec015..b65da2b77 100644
--- a/app/models/wiki_page.rb
+++ b/app/models/wiki_page.rb
@@ -28,7 +28,7 @@ class WikiPage < ActiveRecord::Base
   acts_as_event :title => Proc.new {|o| "#{l(:label_wiki)}: #{o.title}"},
                 :description => :text,
                 :datetime => :created_on,
-                :url => Proc.new {|o| {:controller => 'wiki', :action => 'show', :project_id => o.wiki.project, :page => o.title}}
+                :url => Proc.new {|o| {:controller => 'wiki', :action => 'show', :project_id => o.wiki.project, :id => o.title}}
 
   acts_as_searchable :columns => ['title', 'text'],
                      :include => [{:wiki => :project}, :content],
@@ -139,7 +139,7 @@ class WikiPage < ActiveRecord::Base
     parent_page = t.blank? ? nil : self.wiki.find_page(t)
     self.parent = parent_page
   end
-  
+
   protected
   
   def validate
diff --git a/app/views/mailer/wiki_content_added.text.html.rhtml b/app/views/mailer/wiki_content_added.text.html.rhtml
index 92e368f54..4140db98d 100644
--- a/app/views/mailer/wiki_content_added.text.html.rhtml
+++ b/app/views/mailer/wiki_content_added.text.html.rhtml
@@ -1,3 +1,3 @@
-<p><%= l(:mail_body_wiki_content_added, :page => link_to(h(@wiki_content.page.pretty_title), @wiki_content_url), 
+<p><%= l(:mail_body_wiki_content_added, :id => link_to(h(@wiki_content.page.pretty_title), @wiki_content_url), 
 		  																  :author => h(@wiki_content.author)) %><br />
 <em><%=h @wiki_content.comments %></em></p>
diff --git a/app/views/mailer/wiki_content_added.text.plain.rhtml b/app/views/mailer/wiki_content_added.text.plain.rhtml
index 5699eecd5..f57470b0e 100644
--- a/app/views/mailer/wiki_content_added.text.plain.rhtml
+++ b/app/views/mailer/wiki_content_added.text.plain.rhtml
@@ -1,4 +1,4 @@
-<%= l(:mail_body_wiki_content_added, :page => h(@wiki_content.page.pretty_title), 
+<%= l(:mail_body_wiki_content_added, :id => h(@wiki_content.page.pretty_title), 
 																		 :author => h(@wiki_content.author)) %>
 <%= @wiki_content.comments %>
 
diff --git a/app/views/mailer/wiki_content_updated.text.html.rhtml b/app/views/mailer/wiki_content_updated.text.html.rhtml
index 9f0bf0c87..f84e92326 100644
--- a/app/views/mailer/wiki_content_updated.text.html.rhtml
+++ b/app/views/mailer/wiki_content_updated.text.html.rhtml
@@ -1,4 +1,4 @@
-<p><%= l(:mail_body_wiki_content_updated, :page => link_to(h(@wiki_content.page.pretty_title), @wiki_content_url), 
+<p><%= l(:mail_body_wiki_content_updated, :id => link_to(h(@wiki_content.page.pretty_title), @wiki_content_url), 
   	    														      :author => h(@wiki_content.author)) %><br />
 <em><%=h @wiki_content.comments %></em></p>
 
diff --git a/app/views/mailer/wiki_content_updated.text.plain.rhtml b/app/views/mailer/wiki_content_updated.text.plain.rhtml
index 29767a65b..db5ca38dc 100644
--- a/app/views/mailer/wiki_content_updated.text.plain.rhtml
+++ b/app/views/mailer/wiki_content_updated.text.plain.rhtml
@@ -1,4 +1,4 @@
-<%= l(:mail_body_wiki_content_updated, :page => h(@wiki_content.page.pretty_title), 
+<%= l(:mail_body_wiki_content_updated, :id => h(@wiki_content.page.pretty_title), 
 																			 :author => h(@wiki_content.author)) %>
 <%= @wiki_content.comments %>
 
diff --git a/app/views/projects/settings/_versions.rhtml b/app/views/projects/settings/_versions.rhtml
index d41929c2d..eb04d6d43 100644
--- a/app/views/projects/settings/_versions.rhtml
+++ b/app/views/projects/settings/_versions.rhtml
@@ -17,7 +17,7 @@
     <td class="description"><%=h version.description %></td>
     <td class="status"><%= l("version_status_#{version.status}") %></td>
     <td class="sharing"><%=h format_version_sharing(version.sharing) %></td>
-    <td><%= link_to(h(version.wiki_page_title), :controller => 'wiki', :page => Wiki.titleize(version.wiki_page_title)) unless version.wiki_page_title.blank? || @project.wiki.nil? %></td>
+    <td><%= link_to(h(version.wiki_page_title), :controller => 'wiki', :id => Wiki.titleize(version.wiki_page_title)) unless version.wiki_page_title.blank? || @project.wiki.nil? %></td>
     <td class="buttons">
     	<% if version.project == @project %>
     		<%= link_to_if_authorized l(:button_edit),   {:controller => 'versions', :action => 'edit', :id => version }, :class => 'icon icon-edit' %>
diff --git a/app/views/versions/show.rhtml b/app/views/versions/show.rhtml
index 6b2b09d0f..f8a82142c 100644
--- a/app/views/versions/show.rhtml
+++ b/app/views/versions/show.rhtml
@@ -1,6 +1,6 @@
 <div class="contextual">
 <%= link_to_if_authorized l(:button_edit), {:controller => 'versions', :action => 'edit', :id => @version}, :class => 'icon icon-edit' %>
-<%= link_to_if_authorized(l(:button_edit_associated_wikipage, :page_title => @version.wiki_page_title), {:controller => 'wiki', :action => 'edit', :page => Wiki.titleize(@version.wiki_page_title)}, :class => 'icon icon-edit') unless @version.wiki_page_title.blank? || @project.wiki.nil? %>
+<%= link_to_if_authorized(l(:button_edit_associated_wikipage, :page_title => @version.wiki_page_title), {:controller => 'wiki', :action => 'edit', :id => Wiki.titleize(@version.wiki_page_title)}, :class => 'icon icon-edit') unless @version.wiki_page_title.blank? || @project.wiki.nil? %>
 <%= call_hook(:view_versions_show_contextual, { :version => @version, :project => @project }) %>
 </div>
 
diff --git a/app/views/wiki/_sidebar.rhtml b/app/views/wiki/_sidebar.rhtml
index 7f60825aa..9a24963f2 100644
--- a/app/views/wiki/_sidebar.rhtml
+++ b/app/views/wiki/_sidebar.rhtml
@@ -4,6 +4,6 @@
 
 <h3><%= l(:label_wiki) %></h3>
 
-<%= link_to l(:field_start_page), {:action => 'show', :page => nil} %><br />
+<%= link_to l(:field_start_page), {:action => 'show', :id => nil} %><br />
 <%= link_to l(:label_index_by_title), {:action => 'index'} %><br />
 <%= link_to l(:label_index_by_date), {:action => 'date_index'} %><br />
diff --git a/app/views/wiki/annotate.rhtml b/app/views/wiki/annotate.rhtml
index 1e664fb84..dfea19581 100644
--- a/app/views/wiki/annotate.rhtml
+++ b/app/views/wiki/annotate.rhtml
@@ -1,12 +1,12 @@
 <div class="contextual">
-<%= link_to(l(:button_edit), {:action => 'edit', :page => @page.title}, :class => 'icon icon-edit') %>
-<%= link_to(l(:label_history), {:action => 'history', :page => @page.title}, :class => 'icon icon-history') %>
+<%= link_to(l(:button_edit), {:action => 'edit', :id => @page.title}, :class => 'icon icon-edit') %>
+<%= link_to(l(:label_history), {:action => 'history', :id => @page.title}, :class => 'icon icon-history') %>
 </div>
 
 <h2><%= @page.pretty_title %></h2>
 
 <p>
-<%= l(:label_version) %> <%= link_to @annotate.content.version, :action => 'show', :page => @page.title, :version => @annotate.content.version %>
+<%= l(:label_version) %> <%= link_to @annotate.content.version, :action => 'show', :id => @page.title, :version => @annotate.content.version %>
 <em>(<%= @annotate.content.author ? @annotate.content.author.name : "anonyme" %>, <%= format_time(@annotate.content.updated_on) %>)</em>
 </p>
 
@@ -18,7 +18,7 @@
 <% @annotate.lines.each do |line| -%>
 <tr class="bloc-<%= colors[line[0]] %>">
     <th class="line-num"><%= line_num %></th>
-    <td class="revision"><%= link_to line[0], :controller => 'wiki', :action => 'show', :project_id => @project, :page => @page.title, :version => line[0] %></td>
+    <td class="revision"><%= link_to line[0], :controller => 'wiki', :action => 'show', :project_id => @project, :id => @page.title, :version => line[0] %></td>
     <td class="author"><%= h(line[1]) %></td>
     <td class="line-code"><pre><%=h line[2] %></pre></td>
 </tr>
diff --git a/app/views/wiki/date_index.html.erb b/app/views/wiki/date_index.html.erb
index 086d8f632..01385bc49 100644
--- a/app/views/wiki/date_index.html.erb
+++ b/app/views/wiki/date_index.html.erb
@@ -12,7 +12,7 @@
 <h3><%= format_date(date) %></h3>
 <ul>
 <% @pages_by_date[date].each do |page| %>
-    <li><%= link_to page.pretty_title, :action => 'show', :page => page.title %></li>
+    <li><%= link_to page.pretty_title, :action => 'show', :id => page.title %></li>
 <% end %>
 </ul>
 <% end %>
diff --git a/app/views/wiki/destroy.rhtml b/app/views/wiki/destroy.rhtml
index 99f470320..400230f89 100644
--- a/app/views/wiki/destroy.rhtml
+++ b/app/views/wiki/destroy.rhtml
@@ -15,5 +15,5 @@
 </div>
 
 <%= submit_tag l(:button_apply) %>
-<%= link_to l(:button_cancel), :controller => 'wiki', :action => 'show', :project_id => @project, :page => @page.title %>
+<%= link_to l(:button_cancel), :controller => 'wiki', :action => 'show', :project_id => @project, :id => @page.title %>
 <% end %>
diff --git a/app/views/wiki/diff.rhtml b/app/views/wiki/diff.rhtml
index a9eebdb9a..90478ed86 100644
--- a/app/views/wiki/diff.rhtml
+++ b/app/views/wiki/diff.rhtml
@@ -1,14 +1,14 @@
 <div class="contextual">
-<%= link_to(l(:label_history), {:action => 'history', :page => @page.title}, :class => 'icon icon-history') %>
+<%= link_to(l(:label_history), {:action => 'history', :id => @page.title}, :class => 'icon icon-history') %>
 </div>
 
 <h2><%= @page.pretty_title %></h2>
 
 <p>
-<%= l(:label_version) %> <%= link_to @diff.content_from.version, :action => 'show', :page => @page.title, :version => @diff.content_from.version %>
+<%= l(:label_version) %> <%= link_to @diff.content_from.version, :action => 'show', :id => @page.title, :version => @diff.content_from.version %>
 <em>(<%= @diff.content_from.author ? @diff.content_from.author.name : "anonyme" %>, <%= format_time(@diff.content_from.updated_on) %>)</em>
 &#8594;
-<%= l(:label_version) %> <%= link_to @diff.content_to.version, :action => 'show', :page => @page.title, :version => @diff.content_to.version %>/<%= @page.content.version %>
+<%= l(:label_version) %> <%= link_to @diff.content_to.version, :action => 'show', :id => @page.title, :version => @diff.content_to.version %>/<%= @page.content.version %>
 <em>(<%= @diff.content_to.author ? @diff.content_to.author.name : "anonyme" %>, <%= format_time(@diff.content_to.updated_on) %>)</em>
 </p>
 
diff --git a/app/views/wiki/edit.rhtml b/app/views/wiki/edit.rhtml
index b14bfb720..a140e2088 100644
--- a/app/views/wiki/edit.rhtml
+++ b/app/views/wiki/edit.rhtml
@@ -1,6 +1,6 @@
 <h2><%=h @page.pretty_title %></h2>
 
-<% form_for :content, @content, :url => {:action => 'update', :page => @page.title}, :html => {:multipart => true, :id => 'wiki_form'} do |f| %>
+<% form_for :content, @content, :url => {:action => 'update', :id => @page.title}, :html => {:multipart => true, :id => 'wiki_form'} do |f| %>
 <%= f.hidden_field :version %>
 <%= error_messages_for 'content' %>
 
@@ -10,7 +10,7 @@
 
 <p><%= submit_tag l(:button_save) %>
    <%= link_to_remote l(:label_preview), 
-                       { :url => { :controller => 'wiki', :action => 'preview', :project_id => @project, :page => @page.title },
+                       { :url => { :controller => 'wiki', :action => 'preview', :project_id => @project, :id => @page.title },
                          :method => 'post',
                          :update => 'preview',
                          :with => "Form.serialize('wiki_form')",
diff --git a/app/views/wiki/history.rhtml b/app/views/wiki/history.rhtml
index 1f73fd173..5d44598f9 100644
--- a/app/views/wiki/history.rhtml
+++ b/app/views/wiki/history.rhtml
@@ -19,13 +19,13 @@
 <% line_num = 1 %>
 <% @versions.each do |ver| %>
 <tr class="<%= cycle("odd", "even") %>">
-    <td class="id"><%= link_to ver.version, :action => 'show', :page => @page.title, :version => ver.version %></td>
+    <td class="id"><%= link_to ver.version, :action => 'show', :id => @page.title, :version => ver.version %></td>
     <td class="checkbox"><%= radio_button_tag('version', ver.version, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('cbto-#{line_num+1}').checked=true;") if show_diff && (line_num < @versions.size) %></td>
     <td class="checkbox"><%= radio_button_tag('version_from', ver.version, (line_num==2), :id => "cbto-#{line_num}") if show_diff && (line_num > 1) %></td>
     <td align="center"><%= format_time(ver.updated_on) %></td>
     <td><%= link_to_user ver.author %></td>
     <td><%=h ver.comments %></td>
-    <td align="center"><%= link_to l(:button_annotate), :action => 'annotate', :page => @page.title, :version => ver.version %></td>
+    <td align="center"><%= link_to l(:button_annotate), :action => 'annotate', :id => @page.title, :version => ver.version %></td>
 </tr>
 <% line_num += 1 %>
 <% end %>
diff --git a/app/views/wiki/show.rhtml b/app/views/wiki/show.rhtml
index d8bc8c55e..173ac9ee2 100644
--- a/app/views/wiki/show.rhtml
+++ b/app/views/wiki/show.rhtml
@@ -1,25 +1,25 @@
 <div class="contextual">
 <% if @editable %>
-<%= link_to_if_authorized(l(:button_edit), {:action => 'edit', :page => @page.title}, :class => 'icon icon-edit', :accesskey => accesskey(:edit)) if @content.version == @page.content.version %>
+<%= link_to_if_authorized(l(:button_edit), {:action => 'edit', :id => @page.title}, :class => 'icon icon-edit', :accesskey => accesskey(:edit)) if @content.version == @page.content.version %>
 <%= watcher_tag(@page, User.current) %>
-<%= link_to_if_authorized(l(:button_lock), {:action => 'protect', :page => @page.title, :protected => 1}, :method => :post, :class => 'icon icon-lock') if !@page.protected? %>
-<%= link_to_if_authorized(l(:button_unlock), {:action => 'protect', :page => @page.title, :protected => 0}, :method => :post, :class => 'icon icon-unlock') if @page.protected? %>
-<%= link_to_if_authorized(l(:button_rename), {:action => 'rename', :page => @page.title}, :class => 'icon icon-move') if @content.version == @page.content.version %>
-<%= link_to_if_authorized(l(:button_delete), {:action => 'destroy', :page => @page.title}, :method => :delete, :confirm => l(:text_are_you_sure), :class => 'icon icon-del') %>
-<%= link_to_if_authorized(l(:button_rollback), {:action => 'edit', :page => @page.title, :version => @content.version }, :class => 'icon icon-cancel') if @content.version < @page.content.version %>
+<%= link_to_if_authorized(l(:button_lock), {:action => 'protect', :id => @page.title, :protected => 1}, :method => :post, :class => 'icon icon-lock') if !@page.protected? %>
+<%= link_to_if_authorized(l(:button_unlock), {:action => 'protect', :id => @page.title, :protected => 0}, :method => :post, :class => 'icon icon-unlock') if @page.protected? %>
+<%= link_to_if_authorized(l(:button_rename), {:action => 'rename', :id => @page.title}, :class => 'icon icon-move') if @content.version == @page.content.version %>
+<%= link_to_if_authorized(l(:button_delete), {:action => 'destroy', :id => @page.title}, :method => :delete, :confirm => l(:text_are_you_sure), :class => 'icon icon-del') %>
+<%= link_to_if_authorized(l(:button_rollback), {:action => 'edit', :id => @page.title, :version => @content.version }, :class => 'icon icon-cancel') if @content.version < @page.content.version %>
 <% end %>
-<%= link_to_if_authorized(l(:label_history), {:action => 'history', :page => @page.title}, :class => 'icon icon-history') %>
+<%= link_to_if_authorized(l(:label_history), {:action => 'history', :id => @page.title}, :class => 'icon icon-history') %>
 </div>
 
-<%= breadcrumb(@page.ancestors.reverse.collect {|parent| link_to h(parent.pretty_title), {:page => parent.title}}) %>
+<%= breadcrumb(@page.ancestors.reverse.collect {|parent| link_to h(parent.pretty_title), {:id => parent.title}}) %>
 
 <% if @content.version != @page.content.version %>
     <p>    
-    <%= link_to(('&#171; ' + l(:label_previous)), :action => 'show', :page => @page.title, :version => (@content.version - 1)) + " - " if @content.version > 1 %>
+    <%= link_to(('&#171; ' + l(:label_previous)), :action => 'show', :id => @page.title, :version => (@content.version - 1)) + " - " if @content.version > 1 %>
     <%= "#{l(:label_version)} #{@content.version}/#{@page.content.version}" %>
-    <%= '(' + link_to('diff', :controller => 'wiki', :action => 'diff', :page => @page.title, :version => @content.version) + ')' if @content.version > 1 %> - 
-    <%= link_to((l(:label_next) + ' &#187;'), :action => 'show', :page => @page.title, :version => (@content.version + 1)) + " - " if @content.version < @page.content.version %>
-    <%= link_to(l(:label_current_version), :action => 'show', :page => @page.title) %>
+    <%= '(' + link_to('diff', :controller => 'wiki', :action => 'diff', :id => @page.title, :version => @content.version) + ')' if @content.version > 1 %> - 
+    <%= link_to((l(:label_next) + ' &#187;'), :action => 'show', :id => @page.title, :version => (@content.version + 1)) + " - " if @content.version < @page.content.version %>
+    <%= link_to(l(:label_current_version), :action => 'show', :id => @page.title) %>
     <br />
     <em><%= @content.author ? @content.author.name : "anonyme" %>, <%= format_time(@content.updated_on) %> </em><br />
     <%=h @content.comments %>
@@ -35,7 +35,7 @@
 <div id="wiki_add_attachment">
 <p><%= link_to l(:label_attachment_new), {}, :onclick => "Element.show('add_attachment_form'); Element.hide(this); Element.scrollTo('add_attachment_form'); return false;",
                                              :id => 'attach_files_link' %></p>
-<% form_tag({ :controller => 'wiki', :action => 'add_attachment', :project_id => @project, :page => @page.title }, :multipart => true, :id => "add_attachment_form", :style => "display:none;") do %>
+<% form_tag({ :controller => 'wiki', :action => 'add_attachment', :project_id => @project, :id => @page.title }, :multipart => true, :id => "add_attachment_form", :style => "display:none;") do %>
   <div class="box">
   <p><%= render :partial => 'attachments/form' %></p>
   </div>
@@ -46,8 +46,8 @@
 <% end %>
 
 <% other_formats_links do |f| %>
-	<%= f.link_to 'HTML', :url => {:page => @page.title, :version => @content.version} %>
-	<%= f.link_to 'TXT', :url => {:page => @page.title, :version => @content.version} %>
+	<%= f.link_to 'HTML', :url => {:id => @page.title, :version => @content.version} %>
+	<%= f.link_to 'TXT', :url => {:id => @page.title, :version => @content.version} %>
 <% end if User.current.allowed_to?(:export_wiki_pages, @project) %>
 
 <% content_for :header_tags do %>
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index a3f78f81f..31ec55eeb 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -809,12 +809,12 @@ bg:
   text_wiki_page_destroy_children: Delete child pages and all their descendants
   setting_password_min_length: Minimum password length
   field_group_by: Group results by
-  mail_subject_wiki_content_updated: "'{{page}}' wiki page has been updated"
+  mail_subject_wiki_content_updated: "'{{id}}' wiki page has been updated"
   label_wiki_content_added: Wiki page added
-  mail_subject_wiki_content_added: "'{{page}}' wiki page has been added"
-  mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}.
+  mail_subject_wiki_content_added: "'{{id}}' wiki page has been added"
+  mail_body_wiki_content_added: The '{{id}}' wiki page has been added by {{author}}.
   label_wiki_content_updated: Wiki page updated
-  mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
+  mail_body_wiki_content_updated: The '{{id}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
   setting_new_project_user_role_id: Role given to a non-admin user who creates a project
   label_view_all_revisions: View all revisions
diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index cebe14dac..9aa951c5e 100644
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -829,12 +829,12 @@ bs:
   text_wiki_page_destroy_children: Delete child pages and all their descendants
   setting_password_min_length: Minimum password length
   field_group_by: Group results by
-  mail_subject_wiki_content_updated: "'{{page}}' wiki page has been updated"
+  mail_subject_wiki_content_updated: "'{{id}}' wiki page has been updated"
   label_wiki_content_added: Wiki page added
-  mail_subject_wiki_content_added: "'{{page}}' wiki page has been added"
-  mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}.
+  mail_subject_wiki_content_added: "'{{id}}' wiki page has been added"
+  mail_body_wiki_content_added: The '{{id}}' wiki page has been added by {{author}}.
   label_wiki_content_updated: Wiki page updated
-  mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
+  mail_body_wiki_content_updated: The '{{id}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
   setting_new_project_user_role_id: Role given to a non-admin user who creates a project
   label_view_all_revisions: View all revisions
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 9befe1d18..a0e5d25b9 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -195,10 +195,10 @@ ca:
   mail_body_account_activation_request: "S'ha registrat un usuari nou ({{value}}). El seu compte està pendent d'aprovació:"
   mail_subject_reminder: "{{count}} assumptes venceran els següents {{days}} dies"
   mail_body_reminder: "{{count}} assumptes que teniu assignades venceran els següents {{days}} dies:"
-  mail_subject_wiki_content_added: "S'ha afegit la pàgina wiki «{{page}}»"
-  mail_body_wiki_content_added: "En {{author}} ha afegit la pàgina wiki «{{page}}»."
-  mail_subject_wiki_content_updated: "S'ha actualitzat la pàgina wiki «{{page}}»"
-  mail_body_wiki_content_updated: "En {{author}} ha actualitzat la pàgina wiki «{{page}}»."
+  mail_subject_wiki_content_added: "S'ha afegit la pàgina wiki «{{id}}»"
+  mail_body_wiki_content_added: "En {{author}} ha afegit la pàgina wiki «{{id}}»."
+  mail_subject_wiki_content_updated: "S'ha actualitzat la pàgina wiki «{{id}}»"
+  mail_body_wiki_content_updated: "En {{author}} ha actualitzat la pàgina wiki «{{id}}»."
   
   gui_validation_error: 1 error
   gui_validation_error_plural: "{{count}} errors"
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 5e90855fc..9435d34dc 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -815,12 +815,12 @@ cs:
   text_wiki_page_destroy_children: Smazat podstránky a všechny jejich potomky
   setting_password_min_length: Minimální délka hesla
   field_group_by: Seskupovat výsledky podle
-  mail_subject_wiki_content_updated: "'{{page}}' Wiki stránka byla aktualizována"
+  mail_subject_wiki_content_updated: "'{{id}}' Wiki stránka byla aktualizována"
   label_wiki_content_added: Wiki stránka přidána
-  mail_subject_wiki_content_added: "'{{page}}' Wiki stránka byla přidána"
-  mail_body_wiki_content_added: "'{{page}}' Wiki stránka byla přidána od {{author}}."
+  mail_subject_wiki_content_added: "'{{id}}' Wiki stránka byla přidána"
+  mail_body_wiki_content_added: "'{{id}}' Wiki stránka byla přidána od {{author}}."
   label_wiki_content_updated: Wiki stránka aktualizována
-  mail_body_wiki_content_updated: "'{{page}}' Wiki stránka byla aktualizována od {{author}}."
+  mail_body_wiki_content_updated: "'{{id}}' Wiki stránka byla aktualizována od {{author}}."
   permission_add_project: Vytvořit projekt
   setting_new_project_user_role_id: Role přiřazená uživateli bez práv administrátora, který projekt vytvořil
   label_view_all_revisions: Zobrazit všechny revize
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 87e813bba..1523d5bf2 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -831,12 +831,12 @@ da:
   text_wiki_page_destroy_children: Slet undersider ogalle deres afledte sider.
   setting_password_min_length: Mindste længde på kodeord
   field_group_by: Gruppér resultater efter
-  mail_subject_wiki_content_updated: "'{{page}}' wikisiden er blevet opdateret"
+  mail_subject_wiki_content_updated: "'{{id}}' wikisiden er blevet opdateret"
   label_wiki_content_added: Wiki side tilføjet
-  mail_subject_wiki_content_added: "'{{page}}' wikisiden er blevet tilføjet"
-  mail_body_wiki_content_added: The '{{page}}' wikiside er blevet tilføjet af {{author}}.
+  mail_subject_wiki_content_added: "'{{id}}' wikisiden er blevet tilføjet"
+  mail_body_wiki_content_added: The '{{id}}' wikiside er blevet tilføjet af {{author}}.
   label_wiki_content_updated: Wikiside opdateret
-  mail_body_wiki_content_updated: Wikisiden '{{page}}' er blevet opdateret af {{author}}.
+  mail_body_wiki_content_updated: Wikisiden '{{id}}' er blevet opdateret af {{author}}.
   permission_add_project: Opret projekt
   setting_new_project_user_role_id: Denne rolle gives til en bruger, som ikke er administrator, og som opretter et projekt
   label_view_all_revisions: Se alle revisioner
diff --git a/config/locales/de.yml b/config/locales/de.yml
index f2eb1e845..c39253d20 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -211,10 +211,10 @@ de:
   mail_body_account_activation_request: "Ein neuer Benutzer ({{value}}) hat sich registriert. Sein Konto wartet auf Ihre Genehmigung:"
   mail_subject_reminder: "{{count}} Tickets müssen in den nächsten {{days}} Tagen abgegeben werden"
   mail_body_reminder: "{{count}} Tickets, die Ihnen zugewiesen sind, müssen in den nächsten {{days}} Tagen abgegeben werden:"
-  mail_subject_wiki_content_added: "Wiki-Seite '{{page}}' hinzugefügt"
-  mail_body_wiki_content_added: "Die Wiki-Seite '{{page}}' wurde von {{author}} hinzugefügt."
-  mail_subject_wiki_content_updated: "Wiki-Seite '{{page}}' erfolgreich aktualisiert"
-  mail_body_wiki_content_updated: "Die Wiki-Seite '{{page}}' wurde von {{author}} aktualisiert."
+  mail_subject_wiki_content_added: "Wiki-Seite '{{id}}' hinzugefügt"
+  mail_body_wiki_content_added: "Die Wiki-Seite '{{id}}' wurde von {{author}} hinzugefügt."
+  mail_subject_wiki_content_updated: "Wiki-Seite '{{id}}' erfolgreich aktualisiert"
+  mail_body_wiki_content_updated: "Die Wiki-Seite '{{id}}' wurde von {{author}} aktualisiert."
 
   gui_validation_error: 1 Fehler
   gui_validation_error_plural: "{{count}} Fehler"
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 85f4bccbc..ba8b9925f 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -179,10 +179,10 @@ el:
   mail_body_account_activation_request: "'Ένας νέος χρήστης ({{value}}) έχει εγγραφεί. Ο λογαριασμός είναι σε στάδιο αναμονής της έγκρισης σας:"
   mail_subject_reminder: "{{count}} θέμα(τα) με προθεσμία στις επόμενες {{days}} ημέρες"
   mail_body_reminder: "{{count}}θέμα(τα)  που έχουν ανατεθεί σε σας, με προθεσμία στις επόμενες {{days}} ημέρες:"
-  mail_subject_wiki_content_added: "'προστέθηκε η σελίδα wiki {{page}}' "
-  mail_body_wiki_content_added: "Η σελίδα wiki '{{page}}' προστέθηκε από τον {{author}}."
-  mail_subject_wiki_content_updated: "'ενημερώθηκε η σελίδα wiki {{page}}' "
-  mail_body_wiki_content_updated: "Η σελίδα wiki  '{{page}}' ενημερώθηκε από τον {{author}}."
+  mail_subject_wiki_content_added: "'προστέθηκε η σελίδα wiki {{id}}' "
+  mail_body_wiki_content_added: "Η σελίδα wiki '{{id}}' προστέθηκε από τον {{author}}."
+  mail_subject_wiki_content_updated: "'ενημερώθηκε η σελίδα wiki {{id}}' "
+  mail_body_wiki_content_updated: "Η σελίδα wiki  '{{id}}' ενημερώθηκε από τον {{author}}."
   
   gui_validation_error: 1 σφάλμα
   gui_validation_error_plural: "{{count}} σφάλματα"
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index e14276aaa..608c58271 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -189,10 +189,10 @@ en-GB:
   mail_body_account_activation_request: "A new user ({{value}}) has registered. The account is pending your approval:"
   mail_subject_reminder: "{{count}} issue(s) due in the next {{days}} days"
   mail_body_reminder: "{{count}} issue(s) that are assigned to you are due in the next {{days}} days:"
-  mail_subject_wiki_content_added: "'{{page}}' wiki page has been added"
-  mail_body_wiki_content_added: "The '{{page}}' wiki page has been added by {{author}}."
-  mail_subject_wiki_content_updated: "'{{page}}' wiki page has been updated"
-  mail_body_wiki_content_updated: "The '{{page}}' wiki page has been updated by {{author}}."
+  mail_subject_wiki_content_added: "'{{id}}' wiki page has been added"
+  mail_body_wiki_content_added: "The '{{id}}' wiki page has been added by {{author}}."
+  mail_subject_wiki_content_updated: "'{{id}}' wiki page has been updated"
+  mail_body_wiki_content_updated: "The '{{id}}' wiki page has been updated by {{author}}."
   
   gui_validation_error: 1 error
   gui_validation_error_plural: "{{count}} errors"
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 083d781b1..5f3387fc3 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -193,10 +193,10 @@ en:
   mail_body_account_activation_request: "A new user ({{value}}) has registered. The account is pending your approval:"
   mail_subject_reminder: "{{count}} issue(s) due in the next {{days}} days"
   mail_body_reminder: "{{count}} issue(s) that are assigned to you are due in the next {{days}} days:"
-  mail_subject_wiki_content_added: "'{{page}}' wiki page has been added"
-  mail_body_wiki_content_added: "The '{{page}}' wiki page has been added by {{author}}."
-  mail_subject_wiki_content_updated: "'{{page}}' wiki page has been updated"
-  mail_body_wiki_content_updated: "The '{{page}}' wiki page has been updated by {{author}}."
+  mail_subject_wiki_content_added: "'{{id}}' wiki page has been added"
+  mail_body_wiki_content_added: "The '{{id}}' wiki page has been added by {{author}}."
+  mail_subject_wiki_content_updated: "'{{id}}' wiki page has been updated"
+  mail_body_wiki_content_updated: "The '{{id}}' wiki page has been updated by {{author}}."
   
   gui_validation_error: 1 error
   gui_validation_error_plural: "{{count}} errors"
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 8f824d204..2dba35f41 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -854,12 +854,12 @@ es:
   text_wiki_page_destroy_children: Eliminar páginas hijas y todos sus descendientes
   setting_password_min_length: Longitud mínima de la contraseña
   field_group_by: Agrupar resultados por
-  mail_subject_wiki_content_updated: "La página wiki '{{page}}' ha sido actualizada"
+  mail_subject_wiki_content_updated: "La página wiki '{{id}}' ha sido actualizada"
   label_wiki_content_added: Página wiki añadida
-  mail_subject_wiki_content_added: "Se ha añadido la página wiki '{{page}}'."
-  mail_body_wiki_content_added: "{{author}} ha añadido la página wiki '{{page}}'."
+  mail_subject_wiki_content_added: "Se ha añadido la página wiki '{{id}}'."
+  mail_body_wiki_content_added: "{{author}} ha añadido la página wiki '{{id}}'."
   label_wiki_content_updated: Página wiki actualizada
-  mail_body_wiki_content_updated: La página wiki '{{page}}' ha sido actualizada por {{author}}.
+  mail_body_wiki_content_updated: La página wiki '{{id}}' ha sido actualizada por {{author}}.
   permission_add_project: Crear proyecto
   setting_new_project_user_role_id: Permiso asignado a un usuario no-administrador para crear proyectos
   label_view_all_revisions: Ver todas las revisiones
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 6072c3b69..e6ffaaee8 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -188,10 +188,10 @@ eu:
   mail_body_account_activation_request: "Erabiltzaile berri bat ({{value}}) erregistratu da. Kontua zure onarpenaren zain dago:"
   mail_subject_reminder: "{{count}} arazo hurrengo {{days}} egunetan amaitzen d(ir)a"
   mail_body_reminder: "Zuri esleituta dauden {{count}} arazo hurrengo {{days}} egunetan amaitzen d(ir)a:"
-  mail_subject_wiki_content_added: "'{{page}}' wiki orria gehitu da"
-  mail_body_wiki_content_added: "{{author}}-(e)k '{{page}}' wiki orria gehitu du."
-  mail_subject_wiki_content_updated: "'{{page}}' wiki orria eguneratu da"
-  mail_body_wiki_content_updated: "{{author}}-(e)k '{{page}}' wiki orria eguneratu du."
+  mail_subject_wiki_content_added: "'{{id}}' wiki orria gehitu da"
+  mail_body_wiki_content_added: "{{author}}-(e)k '{{id}}' wiki orria gehitu du."
+  mail_subject_wiki_content_updated: "'{{id}}' wiki orria eguneratu da"
+  mail_body_wiki_content_updated: "{{author}}-(e)k '{{id}}' wiki orria eguneratu du."
   
   gui_validation_error: akats 1
   gui_validation_error_plural: "{{count}} akats"
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index b1fdae732..e634a7d09 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -840,12 +840,12 @@ fi:
   text_wiki_page_destroy_children: Delete child pages and all their descendants
   setting_password_min_length: Minimum password length
   field_group_by: Group results by
-  mail_subject_wiki_content_updated: "'{{page}}' wiki page has been updated"
+  mail_subject_wiki_content_updated: "'{{id}}' wiki page has been updated"
   label_wiki_content_added: Wiki page added
-  mail_subject_wiki_content_added: "'{{page}}' wiki page has been added"
-  mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}.
+  mail_subject_wiki_content_added: "'{{id}}' wiki page has been added"
+  mail_body_wiki_content_added: The '{{id}}' wiki page has been added by {{author}}.
   label_wiki_content_updated: Wiki page updated
-  mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
+  mail_body_wiki_content_updated: The '{{id}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
   setting_new_project_user_role_id: Role given to a non-admin user who creates a project
   label_view_all_revisions: View all revisions
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 92720abb9..07ed97f9f 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -204,10 +204,10 @@ fr:
   mail_body_account_activation_request: "Un nouvel utilisateur ({{value}}) s'est inscrit. Son compte nécessite votre approbation :"
   mail_subject_reminder: "{{count}} demande(s) arrivent à échéance ({{days}})"
   mail_body_reminder: "{{count}} demande(s) qui vous sont assignées arrivent à échéance dans les {{days}} prochains jours :"
-  mail_subject_wiki_content_added: "Page wiki '{{page}}' ajoutée"
-  mail_body_wiki_content_added: "La page wiki '{{page}}' a été ajoutée par {{author}}."
-  mail_subject_wiki_content_updated: "Page wiki '{{page}}' mise à jour"
-  mail_body_wiki_content_updated: "La page wiki '{{page}}' a été mise à jour par {{author}}."
+  mail_subject_wiki_content_added: "Page wiki '{{id}}' ajoutée"
+  mail_body_wiki_content_added: "La page wiki '{{id}}' a été ajoutée par {{author}}."
+  mail_subject_wiki_content_updated: "Page wiki '{{id}}' mise à jour"
+  mail_body_wiki_content_updated: "La page wiki '{{id}}' a été mise à jour par {{author}}."
   
   gui_validation_error: 1 erreur
   gui_validation_error_plural: "{{count}} erreurs"
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index d3ee6def2..3469a813a 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -831,12 +831,12 @@ gl:
   text_wiki_page_destroy_children: Delete child pages and all their descendants
   setting_password_min_length: Minimum password length
   field_group_by: Group results by
-  mail_subject_wiki_content_updated: "'{{page}}' wiki page has been updated"
+  mail_subject_wiki_content_updated: "'{{id}}' wiki page has been updated"
   label_wiki_content_added: Wiki page added
-  mail_subject_wiki_content_added: "'{{page}}' wiki page has been added"
-  mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}.
+  mail_subject_wiki_content_added: "'{{id}}' wiki page has been added"
+  mail_body_wiki_content_added: The '{{id}}' wiki page has been added by {{author}}.
   label_wiki_content_updated: Wiki page updated
-  mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
+  mail_body_wiki_content_updated: The '{{id}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
   setting_new_project_user_role_id: Role given to a non-admin user who creates a project
   label_view_all_revisions: View all revisions
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 72f5a6cbd..c8616abaa 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -196,10 +196,10 @@ he:
   mail_body_account_activation_request: "משתמש חדש ({{value}}) נרשם. החשבון שלו מחכה לאישור שלך:"
   mail_subject_reminder: "{{count}} נושאים מיועדים להגשה בימים הקרובים ({{days}})"
   mail_body_reminder: "{{count}} נושאים שמיועדים אליך מיועדים להגשה בתוך {{days}} ימים:"
-  mail_subject_wiki_content_added: "דף ה־wiki ‏'{{page}}' נוסף"
-  mail_body_wiki_content_added: דף ה־wiki ‏'{{page}}' נוסף ע"י {{author}}.
-  mail_subject_wiki_content_updated: "דף ה־wiki ‏'{{page}}' עודכן"
-  mail_body_wiki_content_updated: דף ה־wiki ‏'{{page}}' עודכן ע"י {{author}}.
+  mail_subject_wiki_content_added: "דף ה־wiki ‏'{{id}}' נוסף"
+  mail_body_wiki_content_added: דף ה־wiki ‏'{{id}}' נוסף ע"י {{author}}.
+  mail_subject_wiki_content_updated: "דף ה־wiki ‏'{{id}}' עודכן"
+  mail_body_wiki_content_updated: דף ה־wiki ‏'{{id}}' עודכן ע"י {{author}}.
 
   gui_validation_error: שגיאה 1
   gui_validation_error_plural: "{{count}} שגיאות"
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index a9f702e45..1f50dacbb 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -184,10 +184,10 @@ hr:
   mail_body_account_activation_request: "Novi korisnik ({{value}}) je registriran. Njegov korisnički račun čeka vaše odobrenje:"
   mail_subject_reminder: "{{count}} predmet(a) dospijeva sljedećih {{days}} dana"
   mail_body_reminder: "{{count}} vama dodijeljen(ih) predmet(a) dospijeva u sljedećih {{days}} dana:"
-  mail_subject_wiki_content_added: "'{{page}}' wiki page has been added"
-  mail_body_wiki_content_added: "The '{{page}}' wiki page has been added by {{author}}."
-  mail_subject_wiki_content_updated: "'{{page}}' wiki page has been updated"
-  mail_body_wiki_content_updated: "The '{{page}}' wiki page has been updated by {{author}}."
+  mail_subject_wiki_content_added: "'{{id}}' wiki page has been added"
+  mail_body_wiki_content_added: "The '{{id}}' wiki page has been added by {{author}}."
+  mail_subject_wiki_content_updated: "'{{id}}' wiki page has been updated"
+  mail_body_wiki_content_updated: "The '{{id}}' wiki page has been updated by {{author}}."
   
   gui_validation_error: 1 pogreška
   gui_validation_error_plural: "{{count}} pogrešaka"
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index b08e90553..79565b81d 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -838,12 +838,12 @@
   text_wiki_page_destroy_children: Minden aloldal és leszármazottjának törlése
   setting_password_min_length: Minimum jelszó hosszúság
   field_group_by: Szerint csoportosítva
-  mail_subject_wiki_content_updated: "'{{page}}' wiki oldal frissítve"
+  mail_subject_wiki_content_updated: "'{{id}}' wiki oldal frissítve"
   label_wiki_content_added: Wiki oldal hozzáadva
-  mail_subject_wiki_content_added: "Új wiki oldal: '{{page}}'"
-  mail_body_wiki_content_added: A '{{page}}' wiki oldalt {{author}} hozta létre.
+  mail_subject_wiki_content_added: "Új wiki oldal: '{{id}}'"
+  mail_body_wiki_content_added: A '{{id}}' wiki oldalt {{author}} hozta létre.
   label_wiki_content_updated: Wiki oldal frissítve
-  mail_body_wiki_content_updated: A '{{page}}' wiki oldalt {{author}} frissítette.
+  mail_body_wiki_content_updated: A '{{id}}' wiki oldalt {{author}} frissítette.
   permission_add_project: Projekt létrehozása
   setting_new_project_user_role_id: Projekt létrehozási jog nem adminisztrátor felhasználóknak
   label_view_all_revisions: Minden revízió megtekintése
diff --git a/config/locales/id.yml b/config/locales/id.yml
index e3e120f99..43d76c168 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -181,10 +181,10 @@ id:
   mail_body_account_activation_request: "Pengguna baru ({{value}}) sudan didaftarkan. Akun tersebut menunggu persetujuan anda:"
   mail_subject_reminder: "{{count}} masalah harus selesai pada hari berikutnya ({{days}})"
   mail_body_reminder: "{{count}} masalah yang ditugaskan pada anda harus selesai dalam {{days}} hari kedepan:"
-  mail_subject_wiki_content_added: "'{{page}}' halaman wiki sudah ditambahkan"
-  mail_body_wiki_content_added: "The '{{page}}' halaman wiki sudah ditambahkan oleh {{author}}."
-  mail_subject_wiki_content_updated: "'{{page}}' halaman wiki sudah diperbarui"
-  mail_body_wiki_content_updated: "The '{{page}}' halaman wiki sudah diperbarui oleh {{author}}."
+  mail_subject_wiki_content_added: "'{{id}}' halaman wiki sudah ditambahkan"
+  mail_body_wiki_content_added: "The '{{id}}' halaman wiki sudah ditambahkan oleh {{author}}."
+  mail_subject_wiki_content_updated: "'{{id}}' halaman wiki sudah diperbarui"
+  mail_body_wiki_content_updated: "The '{{id}}' halaman wiki sudah diperbarui oleh {{author}}."
   
   gui_validation_error: 1 kesalahan
   gui_validation_error_plural: "{{count}} kesalahan"
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 2faa28bce..00dfbb554 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -819,12 +819,12 @@ it:
   text_wiki_page_destroy_children: Elimina le pagine figlie e tutta la discendenza
   setting_password_min_length: Lunghezza minima password
   field_group_by: Raggruppa risultati per
-  mail_subject_wiki_content_updated: "La pagina wiki '{{page}}' è stata aggiornata"
+  mail_subject_wiki_content_updated: "La pagina wiki '{{id}}' è stata aggiornata"
   label_wiki_content_added: Aggiunta pagina al wiki
-  mail_subject_wiki_content_added: "La pagina '{{page}}' è stata aggiunta al wiki"
-  mail_body_wiki_content_added: La pagina '{{page}}' è stata aggiunta al wiki da {{author}}.
+  mail_subject_wiki_content_added: "La pagina '{{id}}' è stata aggiunta al wiki"
+  mail_body_wiki_content_added: La pagina '{{id}}' è stata aggiunta al wiki da {{author}}.
   label_wiki_content_updated: Aggiornata pagina wiki
-  mail_body_wiki_content_updated: La pagina '{{page}}' wiki è stata aggiornata da{{author}}.
+  mail_body_wiki_content_updated: La pagina '{{id}}' wiki è stata aggiornata da{{author}}.
   permission_add_project: Crea progetto
   setting_new_project_user_role_id: Ruolo assegnato agli utenti non amministratori che creano un progetto
   label_view_all_revisions: Mostra tutte le revisioni
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index a9adc09e7..252c23031 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -218,10 +218,10 @@ ja:
   mail_body_account_activation_request: "新しいユーザ {{value}} が登録されました。このアカウントはあなたの承認待ちです："
   mail_subject_reminder: "{{count}}件のチケットの期日が{{days}}日以内に到来します"
   mail_body_reminder: "{{count}}件の担当チケットの期日が{{days}}日以内に到来します:"
-  mail_subject_wiki_content_added: "Wikiページ {{page}} が追加されました"
-  mail_body_wiki_content_added: "{{author}} によってWikiページ {{page}} が追加されました。"
-  mail_subject_wiki_content_updated: "Wikiページ {{page}} が更新されました"
-  mail_body_wiki_content_updated: "{{author}} によってWikiページ {{page}} が更新されました。"
+  mail_subject_wiki_content_added: "Wikiページ {{id}} が追加されました"
+  mail_body_wiki_content_added: "{{author}} によってWikiページ {{id}} が追加されました。"
+  mail_subject_wiki_content_updated: "Wikiページ {{id}} が更新されました"
+  mail_body_wiki_content_updated: "{{author}} によってWikiページ {{id}} が更新されました。"
   
   gui_validation_error: 1件のエラー
   gui_validation_error_plural: "{{count}}件のエラー"
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index e74ad2aac..6caf22242 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -231,10 +231,10 @@ ko:
   mail_body_account_activation_request: "새 사용자({{value}})가 등록되었습니다. 관리자님의 승인을 기다리고 있습니다.:"
   mail_body_reminder: "당신이 맡고 있는 일감 {{count}}개의 완료 기한이 {{days}}일 후 입니다."
   mail_subject_reminder: "내일이 만기인 일감 {{count}}개 ({{days}})"
-  mail_subject_wiki_content_added: "위키페이지 '{{page}}'이(가) 추가되었습니다."
-  mail_subject_wiki_content_updated: "'위키페이지 {{page}}'이(가) 수정되었습니다."
-  mail_body_wiki_content_added: "{{author}}이(가) 위키페이지 '{{page}}'을(를) 추가하였습니다."
-  mail_body_wiki_content_updated: "{{author}}이(가) 위키페이지 '{{page}}'을(를) 수정하였습니다."
+  mail_subject_wiki_content_added: "위키페이지 '{{id}}'이(가) 추가되었습니다."
+  mail_subject_wiki_content_updated: "'위키페이지 {{id}}'이(가) 수정되었습니다."
+  mail_body_wiki_content_added: "{{author}}이(가) 위키페이지 '{{id}}'을(를) 추가하였습니다."
+  mail_body_wiki_content_updated: "{{author}}이(가) 위키페이지 '{{id}}'을(를) 수정하였습니다."
   
   gui_validation_error: 에러
   gui_validation_error_plural: "{{count}}개 에러"
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index e091422c3..bbb6c53a4 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -241,10 +241,10 @@ lt:
   mail_body_account_activation_request: "Užsiregistravo naujas vartotojas ({{value}}). Jo paskyra laukia jūsų patvirtinimo:"
   mail_subject_reminder: "{{count}} darbas(ai) po kelių {{days}} dienų"
   mail_body_reminder: "{{count}} darbas(ai), kurie yra jums priskirti, baigiasi po {{days}} dienų(os):"
-  mail_subject_wiki_content_added: "'{{page}}' pridėtas wiki puslapis"
-  mail_body_wiki_content_added: "The '{{page}}' wiki puslapi pridėjo {{author}}."
-  mail_subject_wiki_content_updated: "'{{page}}' atnaujintas wiki puslapis"
-  mail_body_wiki_content_updated: "The '{{page}}' wiki puslapį atnaujino {{author}}."
+  mail_subject_wiki_content_added: "'{{id}}' pridėtas wiki puslapis"
+  mail_body_wiki_content_added: "The '{{id}}' wiki puslapi pridėjo {{author}}."
+  mail_subject_wiki_content_updated: "'{{id}}' atnaujintas wiki puslapis"
+  mail_body_wiki_content_updated: "The '{{id}}' wiki puslapį atnaujino {{author}}."
 
   gui_validation_error: 1 klaida
   gui_validation_error_plural: "{{count}} klaidų(os)"
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index c0fd23710..d12fdb514 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -180,10 +180,10 @@ lv:
   mail_body_account_activation_request: "Jauns lietotājs ({{value}}) ir reģistrēts. Lietotāja konts gaida Jūsu apstiprinājumu:"
   mail_subject_reminder: "{{count}} uzdevums(i) sagaidāms(i) tuvākajās {{days}} dienās"
   mail_body_reminder: "{{count}} uzdevums(i), kurš(i) ir nozīmēts(i) Jums, sagaidāms(i) tuvākajās {{days}} dienās:"
-  mail_subject_wiki_content_added: "'{{page}}' Wiki lapa pievienota"
-  mail_body_wiki_content_added: "The '{{page}}' Wiki lapu pievienojis {{author}}."
-  mail_subject_wiki_content_updated: "'{{page}}' Wiki lapa atjaunota"
-  mail_body_wiki_content_updated: "The '{{page}}' Wiki lapu atjaunojis {{author}}."
+  mail_subject_wiki_content_added: "'{{id}}' Wiki lapa pievienota"
+  mail_body_wiki_content_added: "The '{{id}}' Wiki lapu pievienojis {{author}}."
+  mail_subject_wiki_content_updated: "'{{id}}' Wiki lapa atjaunota"
+  mail_body_wiki_content_updated: "The '{{id}}' Wiki lapu atjaunojis {{author}}."
   
   gui_validation_error: 1 kļūda
   gui_validation_error_plural: "{{count}} kļūdas"
diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index 5d7124f74..9d39075b9 100644
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -192,10 +192,10 @@ mk:
   mail_body_account_activation_request: "Нов корисник ({{value}}) е регистриран. The account is pending your approval:"
   mail_subject_reminder: "{{count}} issue(s) due in the next {{days}} days"
   mail_body_reminder: "{{count}} issue(s) that are assigned to you are due in the next {{days}} days:"
-  mail_subject_wiki_content_added: "'{{page}}' wiki page has been added"
-  mail_body_wiki_content_added: "The '{{page}}' wiki page has been added by {{author}}."
-  mail_subject_wiki_content_updated: "'{{page}}' wiki page has been updated"
-  mail_body_wiki_content_updated: "The '{{page}}' wiki page has been updated by {{author}}."
+  mail_subject_wiki_content_added: "'{{id}}' wiki page has been added"
+  mail_body_wiki_content_added: "The '{{id}}' wiki page has been added by {{author}}."
+  mail_subject_wiki_content_updated: "'{{id}}' wiki page has been updated"
+  mail_body_wiki_content_updated: "The '{{id}}' wiki page has been updated by {{author}}."
 
   gui_validation_error: 1 грешка
   gui_validation_error_plural: "{{count}} грешки"
diff --git a/config/locales/mn.yml b/config/locales/mn.yml
index b6032f951..e95625c3c 100644
--- a/config/locales/mn.yml
+++ b/config/locales/mn.yml
@@ -184,10 +184,10 @@ mn:
   mail_body_account_activation_request: "Шинэ хэрэглэгч ({{value}}) бүртгүүлсэн байна. Таны баталгаажуулахыг хүлээж байна:"
   mail_subject_reminder: "Дараагийн өдрүүдэд {{count}} асуудлыг шийдэх хэрэгтэй ({{days}})"
   mail_body_reminder: "Танд оноогдсон {{count}} асуудлуудыг дараагийн {{days}} өдрүүдэд шийдэх хэрэгтэй:"
-  mail_subject_wiki_content_added: "'{{page}}' wiki page has been added"
-  mail_body_wiki_content_added: "The '{{page}}' wiki page has been added by {{author}}."
-  mail_subject_wiki_content_updated: "'{{page}}' wiki page has been updated"
-  mail_body_wiki_content_updated: "The '{{page}}' wiki page has been updated by {{author}}."
+  mail_subject_wiki_content_added: "'{{id}}' wiki page has been added"
+  mail_body_wiki_content_added: "The '{{id}}' wiki page has been added by {{author}}."
+  mail_subject_wiki_content_updated: "'{{id}}' wiki page has been updated"
+  mail_body_wiki_content_updated: "The '{{id}}' wiki page has been updated by {{author}}."
   
   gui_validation_error: 1 алдаа
   gui_validation_error_plural: "{{count}} алдаа"
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index b1516575e..43ef4603a 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -797,12 +797,12 @@ nl:
   text_wiki_page_destroy_children: Verwijder alle subpagina's en onderliggende pagina's
   setting_password_min_length: Minimum wachtwoord lengte
   field_group_by: Groepeer resultaten per
-  mail_subject_wiki_content_updated: "'{{page}}' wiki pagina is bijgewerkt"
+  mail_subject_wiki_content_updated: "'{{id}}' wiki pagina is bijgewerkt"
   label_wiki_content_added: Wiki pagina toegevoegd
-  mail_subject_wiki_content_added: "'{{page}}' wiki pagina is toegevoegd"
-  mail_body_wiki_content_added: The '{{page}}' wiki pagina is toegevoegd door {{author}}.
+  mail_subject_wiki_content_added: "'{{id}}' wiki pagina is toegevoegd"
+  mail_body_wiki_content_added: The '{{id}}' wiki pagina is toegevoegd door {{author}}.
   label_wiki_content_updated: Wiki pagina bijgewerkt
-  mail_body_wiki_content_updated: The '{{page}}' wiki pagina is bijgewerkt door {{author}}.
+  mail_body_wiki_content_updated: The '{{id}}' wiki pagina is bijgewerkt door {{author}}.
   permission_add_project: Maak project
   setting_new_project_user_role_id: Rol van gebruiker die een project maakt
   label_view_all_revisions: Bekijk alle revisies
diff --git a/config/locales/no.yml b/config/locales/no.yml
index b21eba1b5..588c02187 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -806,12 +806,12 @@
   text_wiki_page_destroy_children: Delete child pages and all their descendants
   setting_password_min_length: Minimum password length
   field_group_by: Group results by
-  mail_subject_wiki_content_updated: "'{{page}}' wiki page has been updated"
+  mail_subject_wiki_content_updated: "'{{id}}' wiki page has been updated"
   label_wiki_content_added: Wiki page added
-  mail_subject_wiki_content_added: "'{{page}}' wiki page has been added"
-  mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}.
+  mail_subject_wiki_content_added: "'{{id}}' wiki page has been added"
+  mail_body_wiki_content_added: The '{{id}}' wiki page has been added by {{author}}.
   label_wiki_content_updated: Wiki page updated
-  mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
+  mail_body_wiki_content_updated: The '{{id}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
   setting_new_project_user_role_id: Role given to a non-admin user who creates a project
   label_view_all_revisions: View all revisions
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 25099c98d..966089e90 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -835,12 +835,12 @@ pl:
   text_wiki_page_destroy_children: Usuń wszystkie podstrony
   setting_password_min_length: Minimalna długość hasła
   field_group_by: Grupuj wyniki wg
-  mail_subject_wiki_content_updated: "Strona wiki '{{page}}' została uaktualniona"
+  mail_subject_wiki_content_updated: "Strona wiki '{{id}}' została uaktualniona"
   label_wiki_content_added: Dodano stronę wiki
-  mail_subject_wiki_content_added: "Strona wiki '{{page}}' została dodana"
-  mail_body_wiki_content_added: Strona wiki '{{page}}' została dodana przez {{author}}.
+  mail_subject_wiki_content_added: "Strona wiki '{{id}}' została dodana"
+  mail_body_wiki_content_added: Strona wiki '{{id}}' została dodana przez {{author}}.
   label_wiki_content_updated: Uaktualniono stronę wiki
-  mail_body_wiki_content_updated: Strona wiki '{{page}}' została uaktualniona przez {{author}}.
+  mail_body_wiki_content_updated: Strona wiki '{{id}}' została uaktualniona przez {{author}}.
   permission_add_project: Tworzenie projektu
   setting_new_project_user_role_id: Rola nadawana twórcom projektów, którzy nie posiadają uprawnień administatora
   label_view_all_revisions: Pokaż wszystkie rewizje
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 78448f7a5..f310c0687 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -839,12 +839,12 @@ pt-BR:
   text_wiki_page_destroy_children: Excluir páginas filhas e todas suas descendentes
   setting_password_min_length: Comprimento mínimo para senhas
   field_group_by: Agrupar por
-  mail_subject_wiki_content_updated: "A página wiki '{{page}}' foi atualizada"
+  mail_subject_wiki_content_updated: "A página wiki '{{id}}' foi atualizada"
   label_wiki_content_added: Página wiki adicionada
-  mail_subject_wiki_content_added: "A página wiki '{{page}}' foi adicionada"
-  mail_body_wiki_content_added: A página wiki '{{page}}' foi adicionada por {{author}}.
+  mail_subject_wiki_content_added: "A página wiki '{{id}}' foi adicionada"
+  mail_body_wiki_content_added: A página wiki '{{id}}' foi adicionada por {{author}}.
   label_wiki_content_updated: Página wiki atualizada
-  mail_body_wiki_content_updated: A página wiki '{{page}}' foi atualizada por {{author}}.
+  mail_body_wiki_content_updated: A página wiki '{{id}}' foi atualizada por {{author}}.
   permission_add_project: Criar projeto
   setting_new_project_user_role_id: Papel atribuído a um usuário não-administrador que cria um projeto
   label_view_all_revisions: Ver todas as revisões
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 24ee86834..5382a8aea 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -823,12 +823,12 @@ pt:
   text_wiki_page_destroy_children: Apagar as páginas subordinadas e todos os seus descendentes
   setting_password_min_length: Tamanho mínimo de palavra-chave
   field_group_by: Agrupar resultados por
-  mail_subject_wiki_content_updated: "A página Wiki '{{page}}' foi actualizada"
+  mail_subject_wiki_content_updated: "A página Wiki '{{id}}' foi actualizada"
   label_wiki_content_added: Página Wiki adicionada
-  mail_subject_wiki_content_added: "A página Wiki '{{page}}' foi adicionada"
-  mail_body_wiki_content_added: A página Wiki '{{page}}' foi adicionada por {{author}}.
+  mail_subject_wiki_content_added: "A página Wiki '{{id}}' foi adicionada"
+  mail_body_wiki_content_added: A página Wiki '{{id}}' foi adicionada por {{author}}.
   label_wiki_content_updated: Página Wiki actualizada
-  mail_body_wiki_content_updated: A página Wiki '{{page}}' foi actualizada por {{author}}.
+  mail_body_wiki_content_updated: A página Wiki '{{id}}' foi actualizada por {{author}}.
   permission_add_project: Criar projecto
   setting_new_project_user_role_id: Função atribuída a um utilizador não-administrador que cria um projecto
   label_view_all_revisions: Ver todas as revisões
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 7076ef855..1933d1233 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -808,12 +808,12 @@ ro:
   text_wiki_page_destroy_children: Șterge paginile și descendenții
   setting_password_min_length: Lungime minimă parolă
   field_group_by: Grupează după
-  mail_subject_wiki_content_updated: "Pagina wiki '{{page}}' a fost actualizată"
+  mail_subject_wiki_content_updated: "Pagina wiki '{{id}}' a fost actualizată"
   label_wiki_content_added: Adăugat
-  mail_subject_wiki_content_added: "Pagina wiki '{{page}}' a fost adăugată"
-  mail_body_wiki_content_added: Pagina wiki '{{page}}' a fost adăugată de {{author}}.
+  mail_subject_wiki_content_added: "Pagina wiki '{{id}}' a fost adăugată"
+  mail_body_wiki_content_added: Pagina wiki '{{id}}' a fost adăugată de {{author}}.
   label_wiki_content_updated: Actualizat
-  mail_body_wiki_content_updated: Pagina wiki '{{page}}' a fost actualizată de {{author}}.
+  mail_body_wiki_content_updated: Pagina wiki '{{id}}' a fost actualizată de {{author}}.
   permission_add_project: Crează proiect
   setting_new_project_user_role_id: Rol atribuit utilizatorului non-admin care crează un proiect.
   label_view_all_revisions: Arată toate reviziile
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index b0ed5cbb9..c8acff556 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -959,12 +959,12 @@ ru:
   text_wiki_page_destroy_children: Удалить дочерние страницы и всех их потомков
   setting_password_min_length: Минимальная длина пароля
   field_group_by: Группировать результаты по
-  mail_subject_wiki_content_updated: "Wiki-страница '{{page}}' была обновлена"
+  mail_subject_wiki_content_updated: "Wiki-страница '{{id}}' была обновлена"
   label_wiki_content_added: Добавлена wiki-страница
-  mail_subject_wiki_content_added: "Wiki-страница  '{{page}}' была добавлена"
-  mail_body_wiki_content_added: "{{author}} добавил(а) wiki-страницу '{{page}}'."
+  mail_subject_wiki_content_added: "Wiki-страница  '{{id}}' была добавлена"
+  mail_body_wiki_content_added: "{{author}} добавил(а) wiki-страницу '{{id}}'."
   label_wiki_content_updated: Обновлена wiki-страница
-  mail_body_wiki_content_updated: "{{author}} обновил(а) wiki-страницу '{{page}}'."
+  mail_body_wiki_content_updated: "{{author}} обновил(а) wiki-страницу '{{id}}'."
   permission_add_project: Создание проекта
   setting_new_project_user_role_id: Роль, назначаемая пользователю, создавшему проект
   label_view_all_revisions: Показать все ревизии
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index c26bca760..38a95ef5a 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -809,13 +809,13 @@ sk:
   text_wiki_page_destroy_children: Vymazať podstránky a všetkých ich potomkov
   setting_password_min_length: Minimálna dĺžka hesla
   field_group_by: Skupinové výsledky podľa
-  mail_subject_wiki_content_updated: "'{{page}}' Wiki stránka bola aktualizovaná"
+  mail_subject_wiki_content_updated: "'{{id}}' Wiki stránka bola aktualizovaná"
   label_wiki_content_added: Wiki stránka pridaná
-  mail_subject_wiki_content_added: "'{{page}}' Wiki stránka bola pridaná"
-  mail_body_wiki_content_added: The '{{page}}' Wiki stránka bola pridaná užívateľom {{author}}.
+  mail_subject_wiki_content_added: "'{{id}}' Wiki stránka bola pridaná"
+  mail_body_wiki_content_added: The '{{id}}' Wiki stránka bola pridaná užívateľom {{author}}.
   permission_add_project: Vytvorenie projektu
   label_wiki_content_updated: Wiki stránka aktualizovaná
-  mail_body_wiki_content_updated: Wiki stránka '{{page}}' bola aktualizovaná užívateľom {{author}}.
+  mail_body_wiki_content_updated: Wiki stránka '{{id}}' bola aktualizovaná užívateľom {{author}}.
   setting_repositories_encodings: Kódovanie repozitára
   setting_new_project_user_role_id: Rola dána non-admin užívateľovi, ktorý vytvorí projekt
   label_view_all_revisions: Zobraziť všetkz revízie
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 417a19a24..75ae608cd 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -811,12 +811,12 @@ sl:
   text_wiki_page_destroy_children: Delete child pages and all their descendants
   setting_password_min_length: Minimum password length
   field_group_by: Group results by
-  mail_subject_wiki_content_updated: "'{{page}}' wiki page has been updated"
+  mail_subject_wiki_content_updated: "'{{id}}' wiki page has been updated"
   label_wiki_content_added: Wiki page added
-  mail_subject_wiki_content_added: "'{{page}}' wiki page has been added"
-  mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}.
+  mail_subject_wiki_content_added: "'{{id}}' wiki page has been added"
+  mail_body_wiki_content_added: The '{{id}}' wiki page has been added by {{author}}.
   label_wiki_content_updated: Wiki page updated
-  mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
+  mail_body_wiki_content_updated: The '{{id}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
   setting_new_project_user_role_id: Role given to a non-admin user who creates a project
   label_view_all_revisions: View all revisions
diff --git a/config/locales/sr-YU.yml b/config/locales/sr-YU.yml
index 53c8e5e6e..eb68128e2 100644
--- a/config/locales/sr-YU.yml
+++ b/config/locales/sr-YU.yml
@@ -192,10 +192,10 @@ sr-YU:
   mail_body_account_activation_request: "Novi korisnik ({{value}}) je registrovan. Nalog čeka na vaše odobrenje:"
   mail_subject_reminder: "{{count}} problema dospeva narednih {{days}} dana"
   mail_body_reminder: "{{count}} problema dodeljenih vama dospeva u narednih {{days}} dana:"
-  mail_subject_wiki_content_added: "Wiki stranica '{{page}}' je dodata"
-  mail_body_wiki_content_added: "{{author}} je dodao wiki stranicu '{{page}}'."
-  mail_subject_wiki_content_updated: "Wiki stranica '{{page}}' je ažurirana"
-  mail_body_wiki_content_updated: "{{author}} je ažurirao wiki stranicu '{{page}}'."
+  mail_subject_wiki_content_added: "Wiki stranica '{{id}}' je dodata"
+  mail_body_wiki_content_added: "{{author}} je dodao wiki stranicu '{{id}}'."
+  mail_subject_wiki_content_updated: "Wiki stranica '{{id}}' je ažurirana"
+  mail_body_wiki_content_updated: "{{author}} je ažurirao wiki stranicu '{{id}}'."
   
   gui_validation_error: jedna greška
   gui_validation_error_plural: "{{count}} grešaka"
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index dd492404c..a1157dedb 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -192,10 +192,10 @@ sr:
   mail_body_account_activation_request: "Нови корисник ({{value}}) је регистрован. Налог чека на ваше одобрење:"
   mail_subject_reminder: "{{count}} проблема доспева наредних {{days}} дана"
   mail_body_reminder: "{{count}} проблема додељених вама доспева у наредних {{days}} дана:"
-  mail_subject_wiki_content_added: "Wiki страница '{{page}}' је додата"
-  mail_body_wiki_content_added: "{{author}} је додао wiki страницу '{{page}}'."
-  mail_subject_wiki_content_updated: "Wiki страница '{{page}}' је ажурирана"
-  mail_body_wiki_content_updated: "{{author}} је ажурирао wiki страницу '{{page}}'."
+  mail_subject_wiki_content_added: "Wiki страница '{{id}}' је додата"
+  mail_body_wiki_content_added: "{{author}} је додао wiki страницу '{{id}}'."
+  mail_subject_wiki_content_updated: "Wiki страница '{{id}}' је ажурирана"
+  mail_body_wiki_content_updated: "{{author}} је ажурирао wiki страницу '{{id}}'."
   
   gui_validation_error: једна грешка
   gui_validation_error_plural: "{{count}} грешака"
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 8509a035a..b8de5ebf0 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -238,10 +238,10 @@ sv:
   mail_body_account_activation_request: "En ny användare ({{value}}) har registrerat sig och avvaktar ditt godkännande:"
   mail_subject_reminder: "{{count}} ärende(n) har deadline under de kommande {{days}} dagarna"
   mail_body_reminder: "{{count}} ärende(n) som är tilldelat dig har deadline under de {{days}} dagarna:"
-  mail_subject_wiki_content_added: "'{{page}}' wikisida has lagts till"
-  mail_body_wiki_content_added: The '{{page}}' wikisida has lagts till av {{author}}.
-  mail_subject_wiki_content_updated: "'{{page}}' wikisida har uppdaterats"
-  mail_body_wiki_content_updated: The '{{page}}' wikisida har uppdaterats av {{author}}.
+  mail_subject_wiki_content_added: "'{{id}}' wikisida has lagts till"
+  mail_body_wiki_content_added: The '{{id}}' wikisida has lagts till av {{author}}.
+  mail_subject_wiki_content_updated: "'{{id}}' wikisida har uppdaterats"
+  mail_body_wiki_content_updated: The '{{id}}' wikisida har uppdaterats av {{author}}.
   
   gui_validation_error: 1 fel
   gui_validation_error_plural: "{{count}} fel"
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 7344a928b..2aab01845 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -812,12 +812,12 @@ th:
   text_wiki_page_destroy_children: Delete child pages and all their descendants
   setting_password_min_length: Minimum password length
   field_group_by: Group results by
-  mail_subject_wiki_content_updated: "'{{page}}' wiki page has been updated"
+  mail_subject_wiki_content_updated: "'{{id}}' wiki page has been updated"
   label_wiki_content_added: Wiki page added
-  mail_subject_wiki_content_added: "'{{page}}' wiki page has been added"
-  mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}.
+  mail_subject_wiki_content_added: "'{{id}}' wiki page has been added"
+  mail_body_wiki_content_added: The '{{id}}' wiki page has been added by {{author}}.
   label_wiki_content_updated: Wiki page updated
-  mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
+  mail_body_wiki_content_updated: The '{{id}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
   setting_new_project_user_role_id: Role given to a non-admin user who creates a project
   label_view_all_revisions: View all revisions
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 3fd0b7447..72c1e4990 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -838,12 +838,12 @@ tr:
   text_wiki_page_destroy_children: Delete child pages and all their descendants
   setting_password_min_length: Minimum password length
   field_group_by: Group results by
-  mail_subject_wiki_content_updated: "'{{page}}' wiki page has been updated"
+  mail_subject_wiki_content_updated: "'{{id}}' wiki page has been updated"
   label_wiki_content_added: Wiki page added
-  mail_subject_wiki_content_added: "'{{page}}' wiki page has been added"
-  mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}.
+  mail_subject_wiki_content_added: "'{{id}}' wiki page has been added"
+  mail_body_wiki_content_added: The '{{id}}' wiki page has been added by {{author}}.
   label_wiki_content_updated: Wiki page updated
-  mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
+  mail_body_wiki_content_updated: The '{{id}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
   setting_new_project_user_role_id: Role given to a non-admin user who creates a project
   label_view_all_revisions: View all revisions
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index f7556417a..b6001f4bc 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -811,12 +811,12 @@ uk:
   text_wiki_page_destroy_children: Delete child pages and all their descendants
   setting_password_min_length: Minimum password length
   field_group_by: Group results by
-  mail_subject_wiki_content_updated: "'{{page}}' wiki page has been updated"
+  mail_subject_wiki_content_updated: "'{{id}}' wiki page has been updated"
   label_wiki_content_added: Wiki page added
-  mail_subject_wiki_content_added: "'{{page}}' wiki page has been added"
-  mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}.
+  mail_subject_wiki_content_added: "'{{id}}' wiki page has been added"
+  mail_body_wiki_content_added: The '{{id}}' wiki page has been added by {{author}}.
   label_wiki_content_updated: Wiki page updated
-  mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
+  mail_body_wiki_content_updated: The '{{id}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
   setting_new_project_user_role_id: Role given to a non-admin user who creates a project
   label_view_all_revisions: View all revisions
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index b1e1662c7..7b4134279 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -870,12 +870,12 @@ vi:
   text_wiki_page_destroy_children: Delete child pages and all their descendants
   setting_password_min_length: Minimum password length
   field_group_by: Group results by
-  mail_subject_wiki_content_updated: "'{{page}}' wiki page has been updated"
+  mail_subject_wiki_content_updated: "'{{id}}' wiki page has been updated"
   label_wiki_content_added: Wiki page added
-  mail_subject_wiki_content_added: "'{{page}}' wiki page has been added"
-  mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}.
+  mail_subject_wiki_content_added: "'{{id}}' wiki page has been added"
+  mail_body_wiki_content_added: The '{{id}}' wiki page has been added by {{author}}.
   label_wiki_content_updated: Wiki page updated
-  mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
+  mail_body_wiki_content_updated: The '{{id}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
   setting_new_project_user_role_id: Role given to a non-admin user who creates a project
   label_view_all_revisions: View all revisions
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 82db9271a..37fef21c5 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -277,10 +277,10 @@
   mail_body_account_activation_request: "有位新用戶 ({{value}}) 已經完成註冊，正等候您的審核："
   mail_subject_reminder: "您有 {{count}} 個項目即將到期 ({{days}})"
   mail_body_reminder: "{{count}} 個指派給您的項目，將於 {{days}} 天之內到期："
-  mail_subject_wiki_content_added: "'{{page}}' wiki 頁面已被新增"
-  mail_body_wiki_content_added: "The '{{page}}' wiki 頁面已被 {{author}} 新增。"
-  mail_subject_wiki_content_updated: "'{{page}}' wiki 頁面已被更新"
-  mail_body_wiki_content_updated: "The '{{page}}' wiki 頁面已被 {{author}} 更新。"
+  mail_subject_wiki_content_added: "'{{id}}' wiki 頁面已被新增"
+  mail_body_wiki_content_added: "The '{{id}}' wiki 頁面已被 {{author}} 新增。"
+  mail_subject_wiki_content_updated: "'{{id}}' wiki 頁面已被更新"
+  mail_body_wiki_content_updated: "The '{{id}}' wiki 頁面已被 {{author}} 更新。"
   
   gui_validation_error: 1 個錯誤
   gui_validation_error_plural: "{{count}} 個錯誤"
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index ba933290e..42f667b2d 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -204,10 +204,10 @@ zh:
   mail_body_account_activation_request: "新用户（{{value}}）已完成注册，正在等候您的审核："
   mail_subject_reminder: "{{count}} 个问题需要尽快解决 ({{days}})"
   mail_body_reminder: "指派给您的 {{count}} 个问题需要在 {{days}} 天内完成："
-  mail_subject_wiki_content_added: "'{{page}}' wiki页面已添加"
-  mail_body_wiki_content_added: "'{{page}}' wiki页面已由 {{author}} 添加。"
-  mail_subject_wiki_content_updated: "'{{page}}' wiki页面已更新"
-  mail_body_wiki_content_updated: "'{{page}}' wiki页面已由 {{author}} 更新。"
+  mail_subject_wiki_content_added: "'{{id}}' wiki页面已添加"
+  mail_body_wiki_content_added: "'{{id}}' wiki页面已由 {{author}} 添加。"
+  mail_subject_wiki_content_updated: "'{{id}}' wiki页面已更新"
+  mail_body_wiki_content_updated: "'{{id}}' wiki页面已由 {{author}} 更新。"
 
   gui_validation_error: 1 个错误
   gui_validation_error_plural: "{{count}} 个错误"
diff --git a/config/routes.rb b/config/routes.rb
index 63c7dd765..0fa76f235 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -32,21 +32,21 @@ ActionController::Routing::Routes.draw do |map|
       wiki_views.connect 'projects/:project_id/wiki/export', :action => 'export'
       wiki_views.connect 'projects/:project_id/wiki/index', :action => 'index'
       wiki_views.connect 'projects/:project_id/wiki/date_index', :action => 'date_index'
-      wiki_views.connect 'projects/:project_id/wiki/:page', :action => 'show', :page => nil
-      wiki_views.connect 'projects/:project_id/wiki/:page/edit', :action => 'edit'
-      wiki_views.connect 'projects/:project_id/wiki/:page/rename', :action => 'rename'
-      wiki_views.connect 'projects/:project_id/wiki/:page/history', :action => 'history'
-      wiki_views.connect 'projects/:project_id/wiki/:page/diff/:version/vs/:version_from', :action => 'diff'
-      wiki_views.connect 'projects/:project_id/wiki/:page/annotate/:version', :action => 'annotate'
+      wiki_views.connect 'projects/:project_id/wiki/:id', :action => 'show', :id => nil
+      wiki_views.connect 'projects/:project_id/wiki/:id/edit', :action => 'edit'
+      wiki_views.connect 'projects/:project_id/wiki/:id/rename', :action => 'rename'
+      wiki_views.connect 'projects/:project_id/wiki/:id/history', :action => 'history'
+      wiki_views.connect 'projects/:project_id/wiki/:id/diff/:version/vs/:version_from', :action => 'diff'
+      wiki_views.connect 'projects/:project_id/wiki/:id/annotate/:version', :action => 'annotate'
     end
     
-    wiki_routes.connect 'projects/:project_id/wiki/:page/:action', 
+    wiki_routes.connect 'projects/:project_id/wiki/:id/:action', 
       :action => /rename|preview|protect|add_attachment/,
       :conditions => {:method => :post}
 
-    wiki_routes.connect 'projects/:project_id/wiki/:page/edit', :action => 'update', :conditions => {:method => :post}
+    wiki_routes.connect 'projects/:project_id/wiki/:id/edit', :action => 'update', :conditions => {:method => :post}
 
-    wiki_routes.connect 'projects/:project_id/wiki/:page', :action => 'destroy', :conditions => {:method => :delete}
+    wiki_routes.connect 'projects/:project_id/wiki/:id', :action => 'destroy', :conditions => {:method => :delete}
   end
   
   map.with_options :controller => 'messages' do |messages_routes|
diff --git a/lib/redmine.rb b/lib/redmine.rb
index e813950ce..1e6a71810 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -195,7 +195,7 @@ Redmine::MenuManager.map :project_menu do |menu|
   menu.push :calendar, { :controller => 'calendars', :action => 'show' }, :param => :project_id, :caption => :label_calendar
   menu.push :news, { :controller => 'news', :action => 'index' }, :param => :project_id, :caption => :label_news_plural
   menu.push :documents, { :controller => 'documents', :action => 'index' }, :param => :project_id, :caption => :label_document_plural
-  menu.push :wiki, { :controller => 'wiki', :action => 'show', :page => nil }, :param => :project_id,
+  menu.push :wiki, { :controller => 'wiki', :action => 'show', :id => nil }, :param => :project_id,
               :if => Proc.new { |p| p.wiki && !p.wiki.new_record? }
   menu.push :boards, { :controller => 'boards', :action => 'index', :id => nil }, :param => :project_id,
               :if => Proc.new { |p| p.boards.any? }, :caption => :label_board_plural
diff --git a/test/functional/wiki_controller_test.rb b/test/functional/wiki_controller_test.rb
index 9124dad34..5bbeba9dc 100644
--- a/test/functional/wiki_controller_test.rb
+++ b/test/functional/wiki_controller_test.rb
@@ -45,7 +45,7 @@ class WikiControllerTest < ActionController::TestCase
   end
   
   def test_show_page_with_name
-    get :show, :project_id => 1, :page => 'Another_page'
+    get :show, :project_id => 1, :id => 'Another_page'
     assert_response :success
     assert_template 'show'
     assert_tag :tag => 'h1', :content => /Another page/
@@ -60,20 +60,20 @@ class WikiControllerTest < ActionController::TestCase
     page.content = WikiContent.new(:text => 'Side bar content for test_show_with_sidebar')
     page.save!
     
-    get :show, :project_id => 1, :page => 'Another_page'
+    get :show, :project_id => 1, :id => 'Another_page'
     assert_response :success
     assert_tag :tag => 'div', :attributes => {:id => 'sidebar'},
                               :content => /Side bar content for test_show_with_sidebar/
   end
   
   def test_show_unexistent_page_without_edit_right
-    get :show, :project_id => 1, :page => 'Unexistent page'
+    get :show, :project_id => 1, :id => 'Unexistent page'
     assert_response 404
   end
   
   def test_show_unexistent_page_with_edit_right
     @request.session[:user_id] = 2
-    get :show, :project_id => 1, :page => 'Unexistent page'
+    get :show, :project_id => 1, :id => 'Unexistent page'
     assert_response :success
     assert_template 'edit'
   end
@@ -81,11 +81,11 @@ class WikiControllerTest < ActionController::TestCase
   def test_create_page
     @request.session[:user_id] = 2
     post :update, :project_id => 1,
-                :page => 'New page',
+                :id => 'New page',
                 :content => {:comments => 'Created the page',
                              :text => "h1. New page\n\nThis is a new page",
                              :version => 0}
-    assert_redirected_to :action => 'show', :project_id => 'ecookbook', :page => 'New_page'
+    assert_redirected_to :action => 'show', :project_id => 'ecookbook', :id => 'New_page'
     page = Project.find(1).wiki.find_page('New page')
     assert !page.new_record?
     assert_not_nil page.content
@@ -97,7 +97,7 @@ class WikiControllerTest < ActionController::TestCase
     assert_difference 'WikiPage.count' do
       assert_difference 'Attachment.count' do
         post :update, :project_id => 1,
-                    :page => 'New page',
+                    :id => 'New page',
                     :content => {:comments => 'Created the page',
                                  :text => "h1. New page\n\nThis is a new page",
                                  :version => 0},
@@ -111,7 +111,7 @@ class WikiControllerTest < ActionController::TestCase
   
   def test_preview
     @request.session[:user_id] = 2
-    xhr :post, :preview, :project_id => 1, :page => 'CookBook_documentation',
+    xhr :post, :preview, :project_id => 1, :id => 'CookBook_documentation',
                                    :content => { :comments => '',
                                                  :text => 'this is a *previewed text*',
                                                  :version => 3 }
@@ -122,7 +122,7 @@ class WikiControllerTest < ActionController::TestCase
   
   def test_preview_new_page
     @request.session[:user_id] = 2
-    xhr :post, :preview, :project_id => 1, :page => 'New page',
+    xhr :post, :preview, :project_id => 1, :id => 'New page',
                                    :content => { :text => 'h1. New page',
                                                  :comments => '',
                                                  :version => 0 }
@@ -132,7 +132,7 @@ class WikiControllerTest < ActionController::TestCase
   end
   
   def test_history
-    get :history, :project_id => 1, :page => 'CookBook_documentation'
+    get :history, :project_id => 1, :id => 'CookBook_documentation'
     assert_response :success
     assert_template 'history'
     assert_not_nil assigns(:versions)
@@ -141,7 +141,7 @@ class WikiControllerTest < ActionController::TestCase
   end
 
   def test_history_with_one_version
-    get :history, :project_id => 1, :page => 'Another_page'
+    get :history, :project_id => 1, :id => 'Another_page'
     assert_response :success
     assert_template 'history'
     assert_not_nil assigns(:versions)
@@ -150,7 +150,7 @@ class WikiControllerTest < ActionController::TestCase
   end
   
   def test_diff
-    get :diff, :project_id => 1, :page => 'CookBook_documentation', :version => 2, :version_from => 1
+    get :diff, :project_id => 1, :id => 'CookBook_documentation', :version => 2, :version_from => 1
     assert_response :success
     assert_template 'diff'
     assert_tag :tag => 'span', :attributes => { :class => 'diff_in'},
@@ -158,7 +158,7 @@ class WikiControllerTest < ActionController::TestCase
   end
   
   def test_annotate
-    get :annotate, :project_id => 1, :page =>  'CookBook_documentation', :version => 2
+    get :annotate, :project_id => 1, :id =>  'CookBook_documentation', :version => 2
     assert_response :success
     assert_template 'annotate'
     # Line 1
@@ -173,10 +173,10 @@ class WikiControllerTest < ActionController::TestCase
   
   def test_rename_with_redirect
     @request.session[:user_id] = 2
-    post :rename, :project_id => 1, :page => 'Another_page',
+    post :rename, :project_id => 1, :id => 'Another_page',
                             :wiki_page => { :title => 'Another renamed page',
                                             :redirect_existing_links => 1 }
-    assert_redirected_to :action => 'show', :project_id => 'ecookbook', :page => 'Another_renamed_page'
+    assert_redirected_to :action => 'show', :project_id => 'ecookbook', :id => 'Another_renamed_page'
     wiki = Project.find(1).wiki
     # Check redirects
     assert_not_nil wiki.find_page('Another page')
@@ -185,10 +185,10 @@ class WikiControllerTest < ActionController::TestCase
 
   def test_rename_without_redirect
     @request.session[:user_id] = 2
-    post :rename, :project_id => 1, :page => 'Another_page',
+    post :rename, :project_id => 1, :id => 'Another_page',
                             :wiki_page => { :title => 'Another renamed page',
                                             :redirect_existing_links => "0" }
-    assert_redirected_to :action => 'show', :project_id => 'ecookbook', :page => 'Another_renamed_page'
+    assert_redirected_to :action => 'show', :project_id => 'ecookbook', :id => 'Another_renamed_page'
     wiki = Project.find(1).wiki
     # Check that there's no redirects
     assert_nil wiki.find_page('Another page')
@@ -196,14 +196,14 @@ class WikiControllerTest < ActionController::TestCase
   
   def test_destroy_child
     @request.session[:user_id] = 2
-    delete :destroy, :project_id => 1, :page => 'Child_1'
+    delete :destroy, :project_id => 1, :id => 'Child_1'
     assert_redirected_to :action => 'index', :project_id => 'ecookbook'
   end
   
   def test_destroy_parent
     @request.session[:user_id] = 2
     assert_no_difference('WikiPage.count') do
-      delete :destroy, :project_id => 1, :page => 'Another_page'
+      delete :destroy, :project_id => 1, :id => 'Another_page'
     end
     assert_response :success
     assert_template 'destroy'
@@ -212,7 +212,7 @@ class WikiControllerTest < ActionController::TestCase
   def test_destroy_parent_with_nullify
     @request.session[:user_id] = 2
     assert_difference('WikiPage.count', -1) do
-      delete :destroy, :project_id => 1, :page => 'Another_page', :todo => 'nullify'
+      delete :destroy, :project_id => 1, :id => 'Another_page', :todo => 'nullify'
     end
     assert_redirected_to :action => 'index', :project_id => 'ecookbook'
     assert_nil WikiPage.find_by_id(2)
@@ -221,7 +221,7 @@ class WikiControllerTest < ActionController::TestCase
   def test_destroy_parent_with_cascade
     @request.session[:user_id] = 2
     assert_difference('WikiPage.count', -3) do
-      delete :destroy, :project_id => 1, :page => 'Another_page', :todo => 'destroy'
+      delete :destroy, :project_id => 1, :id => 'Another_page', :todo => 'destroy'
     end
     assert_redirected_to :action => 'index', :project_id => 'ecookbook'
     assert_nil WikiPage.find_by_id(2)
@@ -231,7 +231,7 @@ class WikiControllerTest < ActionController::TestCase
   def test_destroy_parent_with_reassign
     @request.session[:user_id] = 2
     assert_difference('WikiPage.count', -1) do
-      delete :destroy, :project_id => 1, :page => 'Another_page', :todo => 'reassign', :reassign_to_id => 1
+      delete :destroy, :project_id => 1, :id => 'Another_page', :todo => 'reassign', :reassign_to_id => 1
     end
     assert_redirected_to :action => 'index', :project_id => 'ecookbook'
     assert_nil WikiPage.find_by_id(2)
@@ -280,7 +280,7 @@ class WikiControllerTest < ActionController::TestCase
         get :export, :project_id => 'ecookbook'
 
         should_respond_with :redirect
-        should_redirect_to('wiki index') { {:action => 'show', :project_id => @project, :page => nil} }
+        should_redirect_to('wiki index') { {:action => 'show', :project_id => @project, :id => nil} }
       end
     end
   end
@@ -306,8 +306,8 @@ class WikiControllerTest < ActionController::TestCase
     page = WikiPage.find_by_wiki_id_and_title(1, 'Another_page')
     assert !page.protected?
     @request.session[:user_id] = 2
-    post :protect, :project_id => 1, :page => page.title, :protected => '1'
-    assert_redirected_to :action => 'show', :project_id => 'ecookbook', :page => 'Another_page'
+    post :protect, :project_id => 1, :id => page.title, :protected => '1'
+    assert_redirected_to :action => 'show', :project_id => 'ecookbook', :id => 'Another_page'
     assert page.reload.protected?
   end
   
@@ -315,8 +315,8 @@ class WikiControllerTest < ActionController::TestCase
     page = WikiPage.find_by_wiki_id_and_title(1, 'CookBook_documentation')
     assert page.protected?
     @request.session[:user_id] = 2
-    post :protect, :project_id => 1, :page => page.title, :protected => '0'
-    assert_redirected_to :action => 'show', :project_id => 'ecookbook', :page => 'CookBook_documentation'
+    post :protect, :project_id => 1, :id => page.title, :protected => '0'
+    assert_redirected_to :action => 'show', :project_id => 'ecookbook', :id => 'CookBook_documentation'
     assert !page.reload.protected?
   end
   
@@ -339,7 +339,7 @@ class WikiControllerTest < ActionController::TestCase
   def test_edit_unprotected_page
     # Non members can edit unprotected wiki pages
     @request.session[:user_id] = 4
-    get :edit, :project_id => 1, :page => 'Another_page'
+    get :edit, :project_id => 1, :id => 'Another_page'
     assert_response :success
     assert_template 'edit'
   end
@@ -347,19 +347,19 @@ class WikiControllerTest < ActionController::TestCase
   def test_edit_protected_page_by_nonmember
     # Non members can't edit protected wiki pages
     @request.session[:user_id] = 4
-    get :edit, :project_id => 1, :page => 'CookBook_documentation'
+    get :edit, :project_id => 1, :id => 'CookBook_documentation'
     assert_response 403
   end
   
   def test_edit_protected_page_by_member
     @request.session[:user_id] = 2
-    get :edit, :project_id => 1, :page => 'CookBook_documentation'
+    get :edit, :project_id => 1, :id => 'CookBook_documentation'
     assert_response :success
     assert_template 'edit'    
   end
   
   def test_history_of_non_existing_page_should_return_404
-    get :history, :project_id => 1, :page => 'Unknown_page'
+    get :history, :project_id => 1, :id => 'Unknown_page'
     assert_response 404
   end
 end
diff --git a/test/integration/routing_test.rb b/test/integration/routing_test.rb
index e41a04bd2..011193ea0 100644
--- a/test/integration/routing_test.rb
+++ b/test/integration/routing_test.rb
@@ -312,23 +312,23 @@ class RoutingTest < ActionController::IntegrationTest
 
   context "wiki (singular, project's pages)" do
     should_route :get, "/projects/567/wiki", :controller => 'wiki', :action => 'show', :project_id => '567'
-    should_route :get, "/projects/567/wiki/lalala", :controller => 'wiki', :action => 'show', :project_id => '567', :page => 'lalala'
-    should_route :get, "/projects/567/wiki/my_page/edit", :controller => 'wiki', :action => 'edit', :project_id => '567', :page => 'my_page'
-    should_route :get, "/projects/1/wiki/CookBook_documentation/history", :controller => 'wiki', :action => 'history', :project_id => '1', :page => 'CookBook_documentation'
-    should_route :get, "/projects/1/wiki/CookBook_documentation/diff/2/vs/1", :controller => 'wiki', :action => 'diff', :project_id => '1', :page => 'CookBook_documentation', :version => '2', :version_from => '1'
-    should_route :get, "/projects/1/wiki/CookBook_documentation/annotate/2", :controller => 'wiki', :action => 'annotate', :project_id => '1', :page => 'CookBook_documentation', :version => '2'
-    should_route :get, "/projects/22/wiki/ladida/rename", :controller => 'wiki', :action => 'rename', :project_id => '22', :page => 'ladida'
+    should_route :get, "/projects/567/wiki/lalala", :controller => 'wiki', :action => 'show', :project_id => '567', :id => 'lalala'
+    should_route :get, "/projects/567/wiki/my_page/edit", :controller => 'wiki', :action => 'edit', :project_id => '567', :id => 'my_page'
+    should_route :get, "/projects/1/wiki/CookBook_documentation/history", :controller => 'wiki', :action => 'history', :project_id => '1', :id => 'CookBook_documentation'
+    should_route :get, "/projects/1/wiki/CookBook_documentation/diff/2/vs/1", :controller => 'wiki', :action => 'diff', :project_id => '1', :id => 'CookBook_documentation', :version => '2', :version_from => '1'
+    should_route :get, "/projects/1/wiki/CookBook_documentation/annotate/2", :controller => 'wiki', :action => 'annotate', :project_id => '1', :id => 'CookBook_documentation', :version => '2'
+    should_route :get, "/projects/22/wiki/ladida/rename", :controller => 'wiki', :action => 'rename', :project_id => '22', :id => 'ladida'
     should_route :get, "/projects/567/wiki/index", :controller => 'wiki', :action => 'index', :project_id => '567'
     should_route :get, "/projects/567/wiki/date_index", :controller => 'wiki', :action => 'date_index', :project_id => '567'
     should_route :get, "/projects/567/wiki/export", :controller => 'wiki', :action => 'export', :project_id => '567'
     
-    should_route :post, "/projects/567/wiki/my_page/edit", :controller => 'wiki', :action => 'update', :project_id => '567', :page => 'my_page'
-    should_route :post, "/projects/567/wiki/CookBook_documentation/preview", :controller => 'wiki', :action => 'preview', :project_id => '567', :page => 'CookBook_documentation'
-    should_route :post, "/projects/22/wiki/ladida/rename", :controller => 'wiki', :action => 'rename', :project_id => '22', :page => 'ladida'
-    should_route :post, "/projects/22/wiki/ladida/protect", :controller => 'wiki', :action => 'protect', :project_id => '22', :page => 'ladida'
-    should_route :post, "/projects/22/wiki/ladida/add_attachment", :controller => 'wiki', :action => 'add_attachment', :project_id => '22', :page => 'ladida'
+    should_route :post, "/projects/567/wiki/my_page/edit", :controller => 'wiki', :action => 'update', :project_id => '567', :id => 'my_page'
+    should_route :post, "/projects/567/wiki/CookBook_documentation/preview", :controller => 'wiki', :action => 'preview', :project_id => '567', :id => 'CookBook_documentation'
+    should_route :post, "/projects/22/wiki/ladida/rename", :controller => 'wiki', :action => 'rename', :project_id => '22', :id => 'ladida'
+    should_route :post, "/projects/22/wiki/ladida/protect", :controller => 'wiki', :action => 'protect', :project_id => '22', :id => 'ladida'
+    should_route :post, "/projects/22/wiki/ladida/add_attachment", :controller => 'wiki', :action => 'add_attachment', :project_id => '22', :id => 'ladida'
 
-    should_route :delete, "/projects/22/wiki/ladida", :controller => 'wiki', :action => 'destroy', :project_id => '22', :page => 'ladida'
+    should_route :delete, "/projects/22/wiki/ladida", :controller => 'wiki', :action => 'destroy', :project_id => '22', :id => 'ladida'
   end
 
   context "wikis (plural, admin setup)" do