From f5de6a809dcb60c5f46791ed54cb58aa5671677f Mon Sep 17 00:00:00 2001
From: bootstraponline <cafe@bootstraponline.com>
Date: Fri, 18 May 2012 12:09:42 -0600
Subject: [PATCH] Remove name2 now that name is fixed.

---
 lib/gollum/file_view.rb | 15 ++++++++-------
 lib/gollum/page.rb      | 11 ++---------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/lib/gollum/file_view.rb b/lib/gollum/file_view.rb
index f0e3cf3c..a3072634 100644
--- a/lib/gollum/file_view.rb
+++ b/lib/gollum/file_view.rb
@@ -14,19 +14,20 @@ module Gollum
     end
 
     def new_page page
-      %Q(  <li class="file"><a href="#{page.name}">#{page.name2}</a></li>\n)
+      name = page.name
+      %Q(  <li class="file"><a href="#{name}">#{name}</a></li>\n)
     end
 
     def new_folder page
-      new_sub_folder ::File.dirname(page.path), page.name, page.name2
+      new_sub_folder ::File.dirname(page.path), page.name
     end
 
-    def new_sub_folder path, name, name2
+    def new_sub_folder path, name
       <<-HTML
       <li>
         <label>#{path}</label> <input type="checkbox" checked />
         <ol>
-          <li class="file"><a href="#{name}">#{name2}</a></li>
+          <li class="file"><a href="#{name}">#{name}</a></li>
       HTML
     end
 
@@ -63,12 +64,12 @@ module Gollum
       # Handle special case of only one folder.
       if (count - folder_start == 1)
         path = @pages[ folder_start ]
-        
+        name = page.name
         html += <<-HTML
         <li>
           <label>#{::File.dirname(path)}</label> <input type="checkbox" checked />
           <ol>
-            <li class="file"><a href="#{page.name}">#{page.name2}</a></li>
+            <li class="file"><a href="#{name}">#{name}</a></li>
          </ol>
         </li>
         HTML
@@ -128,7 +129,7 @@ module Gollum
             end
 
             # subfolder
-            html += new_sub_folder ::File.dirname(page.path).split('/').last, page.name, page.name2
+            html += new_sub_folder ::File.dirname(page.path).split('/').last, page.name
           else
             # depth+1 because we need an additional end_folder
             (depth+1).times { html += end_folder; }
diff --git a/lib/gollum/page.rb b/lib/gollum/page.rb
index 04b71974..6894ca2b 100644
--- a/lib/gollum/page.rb
+++ b/lib/gollum/page.rb
@@ -116,21 +116,14 @@ module Gollum
       self.class.strip_filename(filename)
     end
 
-    # Public: The canonical page name without extension.
+    # Public: The canonical page name without extension, and dashes converted
+    # to spaces.
     #
     # Returns the String name.
     def name
       self.class.canonicalize_filename(filename)
     end
 
-    # Public: The canonical page name without extension, and dashes
-    # really converted to spaces.
-    #
-    # Returns the String name.
-    def name2
-      self.class.canonicalize_filename(filename).gsub('-', ' ')
-    end
-
     # Public: The title will be constructed from the
     # filename by stripping the extension and replacing any dashes with
     # spaces.