Merge branch 'master' of github.com:diaspora/diaspora

45 files changed, 701 insertions, 681 deletions

diff --git a/app/controllers/albums_controller.rb b/app/controllers/albums_controller.rb
index 094f7e469..76de92450 100644
--- a/app/controllers/albums_controller.rb
+++ b/app/controllers/albums_controller.rb
@@ -30,6 +30,7 @@ class AlbumsController < ApplicationController
   
   def create
     @album = current_user.post(:album, params[:album])
+    flash[:notice] = "You've created an album called #{@album.name}."
     respond_with @album
   end
   
@@ -40,6 +41,7 @@ class AlbumsController < ApplicationController
   def destroy
     @album = Album.find_by_id params[:id]
     @album.destroy
+    flash[:notice] = "Album #{@album.name} deleted."
     respond_with :location => albums_url
   end
   
@@ -58,7 +60,13 @@ class AlbumsController < ApplicationController
 
   def update
     @album = Album.find_params_by_id params[:id]
-    respond_with @album
+    if @album.update_attributes params[:album]
+      flash[:notice] = "Album #{@album.name} successfully edited." 
+      respond_with @album
+    else
+      flash[:error] = "Failed to edit album #{@album.name}."
+      render :action => :edit
+    end
   end
 
 end
diff --git a/app/controllers/aspects_controller.rb b/app/controllers/aspects_controller.rb
index 0253e819f..7bc9c9584 100644
--- a/app/controllers/aspects_controller.rb
+++ b/app/controllers/aspects_controller.rb
@@ -30,6 +30,7 @@ class AspectsController < ApplicationController
 
   def create
     @aspect = current_user.aspect params[:aspect]
+    flash[:notice] = "Click on the plus on the left side to tell Diaspora who can see your new aspect."
     respond_with @aspect
   end
   
@@ -40,6 +41,7 @@ class AspectsController < ApplicationController
   def destroy
     @aspect = Aspect.find_by_id params[:id]
     @aspect.destroy
+    flash[:notice] = "You are no longer sharing the aspect called #{@aspect.name}."
     respond_with :location => aspects_url
   end
   
@@ -59,6 +61,7 @@ class AspectsController < ApplicationController
   def update
     @aspect = Aspect.find_by_id(params[:id])
     @aspect.update_attributes(params[:aspect])
+    flash[:notice] = "Your aspect, #{@aspect.name}, has been successfully edited."
     respond_with @aspect
   end
 
@@ -81,9 +84,11 @@ class AspectsController < ApplicationController
       flash[:error] = "didn't work #{params.inspect}"
     end
     if aspect = Aspect.first(:id => params[:to][:to])
-      redirect_to aspect 
+      flash[:notice] = "You are now showing your friend a different aspect of yourself."
+      respond_with aspect
     else
-      redirect_to Person.first(:id => params[:friend_id])
+      flash[:notice] = "You are now showing your friend a different aspect of yourself."
+      respond_with Person.first(:id => params[:friend_id])
     end
   end
 end
diff --git a/app/controllers/photos_controller.rb b/app/controllers/photos_controller.rb
index 7df4fe55a..7f23882f3 100644
--- a/app/controllers/photos_controller.rb
+++ b/app/controllers/photos_controller.rb
@@ -77,6 +77,7 @@ class PhotosController < ApplicationController
   def destroy
     @photo = Photo.find_by_id params[:id]
     @photo.destroy
+    flash[:notice] = "Photo deleted."
     respond_with :location => @photo.album
   end
   
@@ -96,8 +97,12 @@ class PhotosController < ApplicationController
 
   def update
     @photo = Photo.find_by_id params[:id]
-    @photo.update_attributes params[:photo]
-
-    respond_with @photo
+    if @photo.update_attributes params[:photo]
+      flash[:notice] = "Photo successfully updated."
+      respond_with @photo
+    else
+      flash[:error] = "Failed to edit photo."
+      render :action => :edit
+    end
   end
 end
diff --git a/app/controllers/requests_controller.rb b/app/controllers/requests_controller.rb
index 5d863661c..3f98eefb5 100644
--- a/app/controllers/requests_controller.rb
+++ b/app/controllers/requests_controller.rb
@@ -35,15 +35,16 @@ class RequestsController < ApplicationController
     if params[:accept]
       if params[:aspect_id]
         @friend = current_user.accept_and_respond( params[:id], params[:aspect_id])
-        flash[:notice] = "you are now friends"
+        flash[:notice] = "You are now friends."
         respond_with :location => current_user.aspect_by_id(params[:aspect_id])
       else
-        flash[:error] = "please select a aspect!"
+        flash[:error] = "Please select an aspect!"
         respond_with :location => requests_url
       end
     else
       current_user.ignore_friend_request params[:id]
-      respond_with :location => requests_url, :notice => "Ignored friend request."
+      flash[:notice] = "Ignored friend request."
+      respond_with :location => requests_url
     end
   end
   
@@ -57,7 +58,8 @@ class RequestsController < ApplicationController
     begin 
       rel_hash = relationship_flow(params[:request][:destination_url])
     rescue Exception => e
-      respond_with :location => aspect, :error => "No diaspora seed found with this email!" 
+      flash[:error] = "No diaspora seed found with this email!" 
+      respond_with :location => aspect
       return
     end
     
@@ -67,17 +69,17 @@ class RequestsController < ApplicationController
       @request = current_user.send_friend_request_to(rel_hash[:friend], aspect)
     rescue Exception => e
       raise e unless e.message.include? "already friends"
-      message = "You are already friends with #{params[:request][:destination_url]}!"
-      respond_with :location => aspect, :notice => message
+      flash[:notice] = "You are already friends with #{params[:request][:destination_url]}!"
+      respond_with :location => aspect
       return
     end
 
     if @request
-      message = "A friend request was sent to #{@request.destination_url}."
-      respond_with :location => aspect, :notice => message
+      flash[:notice] =  "A friend request was sent to #{@request.destination_url}."
+      respond_with :location => aspect
     else
-      message = "Something went horribly wrong."
-      respond_with :location => aspect, :error => message
+      flash[:error] = "Something went horribly wrong."
+      respond_with :location => aspect
     end
   end
 
diff --git a/app/views/albums/_album.html.haml b/app/views/albums/_album.html.haml
index 2d4d370a0..bd777e0dd 100644
--- a/app/views/albums/_album.html.haml
+++ b/app/views/albums/_album.html.haml
@@ -1,20 +1,20 @@
-/    Copyright 2010 Diaspora Inc.
-/
-/    This file is part of Diaspora.
-/
-/    Diaspora is free software: you can redistribute it and/or modify
-/    it under the terms of the GNU Affero General Public License as published by
-/    the Free Software Foundation, either version 3 of the License, or
-/    (at your option) any later version.
-/
-/    Diaspora is distributed in the hope that it will be useful,
-/    but WITHOUT ANY WARRANTY; without even the implied warranty of
-/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/    GNU Affero General Public License for more details.
-/
-/    You should have received a copy of the GNU Affero General Public License
-/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
-/
+-#    Copyright 2010 Diaspora Inc.
+-#
+-#    This file is part of Diaspora.
+-#
+-#    Diaspora is free software: you can redistribute it and/or modify
+-#    it under the terms of the GNU Affero General Public License as published by
+-#    the Free Software Foundation, either version 3 of the License, or
+-#    (at your option) any later version.
+-#
+-#    Diaspora is distributed in the hope that it will be useful,
+-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-#    GNU Affero General Public License for more details.
+-#
+-#    You should have received a copy of the GNU Affero General Public License
+-#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+-#
 
 
 .album{:id => post.id, :class => ("mine" if current_user.owns?(post))}
diff --git a/app/views/albums/_new_album.haml b/app/views/albums/_new_album.haml
index aef2a6ae1..743bae2fd 100644
--- a/app/views/albums/_new_album.haml
+++ b/app/views/albums/_new_album.haml
@@ -1,20 +1,20 @@
-/    Copyright 2010 Diaspora Inc.
-/
-/    This file is part of Diaspora.
-/
-/    Diaspora is free software: you can redistribute it and/or modify
-/    it under the terms of the GNU Affero General Public License as published by
-/    the Free Software Foundation, either version 3 of the License, or
-/    (at your option) any later version.
-/
-/    Diaspora is distributed in the hope that it will be useful,
-/    but WITHOUT ANY WARRANTY; without even the implied warranty of
-/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/    GNU Affero General Public License for more details.
-/
-/    You should have received a copy of the GNU Affero General Public License
-/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
-/
+-#    Copyright 2010 Diaspora Inc.
+-#
+-#    This file is part of Diaspora.
+-#
+-#    Diaspora is free software: you can redistribute it and/or modify
+-#    it under the terms of the GNU Affero General Public License as published by
+-#    the Free Software Foundation, either version 3 of the License, or
+-#    (at your option) any later version.
+-#
+-#    Diaspora is distributed in the hope that it will be useful,
+-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-#    GNU Affero General Public License for more details.
+-#
+-#    You should have received a copy of the GNU Affero General Public License
+-#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+-#
 
 
 %h1 Add a new album
diff --git a/app/views/albums/edit.html.haml b/app/views/albums/edit.html.haml
index 6eb5c1f97..fbba84431 100644
--- a/app/views/albums/edit.html.haml
+++ b/app/views/albums/edit.html.haml
@@ -1,20 +1,20 @@
-/    Copyright 2010 Diaspora Inc.
-/
-/    This file is part of Diaspora.
-/
-/    Diaspora is free software: you can redistribute it and/or modify
-/    it under the terms of the GNU Affero General Public License as published by
-/    the Free Software Foundation, either version 3 of the License, or
-/    (at your option) any later version.
-/
-/    Diaspora is distributed in the hope that it will be useful,
-/    but WITHOUT ANY WARRANTY; without even the implied warranty of
-/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/    GNU Affero General Public License for more details.
-/
-/    You should have received a copy of the GNU Affero General Public License
-/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
-/
+-#    Copyright 2010 Diaspora Inc.
+-#
+-#    This file is part of Diaspora.
+-#
+-#    Diaspora is free software: you can redistribute it and/or modify
+-#    it under the terms of the GNU Affero General Public License as published by
+-#    the Free Software Foundation, either version 3 of the License, or
+-#    (at your option) any later version.
+-#
+-#    Diaspora is distributed in the hope that it will be useful,
+-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-#    GNU Affero General Public License for more details.
+-#
+-#    You should have received a copy of the GNU Affero General Public License
+-#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+-#
 
 
 .back= link_to "⇧ #{@album.name}", @album
diff --git a/app/views/albums/index.html.haml b/app/views/albums/index.html.haml
index 2c1078ff9..a6d1fcd59 100644
--- a/app/views/albums/index.html.haml
+++ b/app/views/albums/index.html.haml
@@ -1,20 +1,20 @@
-/    Copyright 2010 Diaspora Inc.
-/
-/    This file is part of Diaspora.
-/
-/    Diaspora is free software: you can redistribute it and/or modify
-/    it under the terms of the GNU Affero General Public License as published by
-/    the Free Software Foundation, either version 3 of the License, or
-/    (at your option) any later version.
-/
-/    Diaspora is distributed in the hope that it will be useful,
-/    but WITHOUT ANY WARRANTY; without even the implied warranty of
-/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/    GNU Affero General Public License for more details.
-/
-/    You should have received a copy of the GNU Affero General Public License
-/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
-/
+-#    Copyright 2010 Diaspora Inc.
+-#
+-#    This file is part of Diaspora.
+-#
+-#    Diaspora is free software: you can redistribute it and/or modify
+-#    it under the terms of the GNU Affero General Public License as published by
+-#    the Free Software Foundation, either version 3 of the License, or
+-#    (at your option) any later version.
+-#
+-#    Diaspora is distributed in the hope that it will be useful,
+-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-#    GNU Affero General Public License for more details.
+-#
+-#    You should have received a copy of the GNU Affero General Public License
+-#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+-#
 
 
 - content_for :head do
diff --git a/app/views/albums/show.html.haml b/app/views/albums/show.html.haml
index b3a3e0170..c7bc1c2f5 100644
--- a/app/views/albums/show.html.haml
+++ b/app/views/albums/show.html.haml
@@ -1,20 +1,20 @@
-/    Copyright 2010 Diaspora Inc.
-/
-/    This file is part of Diaspora.
-/
-/    Diaspora is free software: you can redistribute it and/or modify
-/    it under the terms of the GNU Affero General Public License as published by
-/    the Free Software Foundation, either version 3 of the License, or
-/    (at your option) any later version.
-/
-/    Diaspora is distributed in the hope that it will be useful,
-/    but WITHOUT ANY WARRANTY; without even the implied warranty of
-/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/    GNU Affero General Public License for more details.
-/
-/    You should have received a copy of the GNU Affero General Public License
-/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
-/
+-#    Copyright 2010 Diaspora Inc.
+-#
+-#    This file is part of Diaspora.
+-#
+-#    Diaspora is free software: you can redistribute it and/or modify
+-#    it under the terms of the GNU Affero General Public License as published by
+-#    the Free Software Foundation, either version 3 of the License, or
+-#    (at your option) any later version.
+-#
+-#    Diaspora is distributed in the hope that it will be useful,
+-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-#    GNU Affero General Public License for more details.
+-#
+-#    You should have received a copy of the GNU Affero General Public License
+-#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+-#
 
 
 :javascript
diff --git a/app/views/aspects/_new_aspect.haml b/app/views/aspects/_new_aspect.haml
index b72ced438..bcaae22f3 100644
--- a/app/views/aspects/_new_aspect.haml
+++ b/app/views/aspects/_new_aspect.haml
@@ -1,20 +1,20 @@
-/    Copyright 2010 Diaspora Inc.
-/
-/    This file is part of Diaspora.
-/
-/    Diaspora is free software: you can redistribute it and/or modify
-/    it under the terms of the GNU Affero General Public License as published by
-/    the Free Software Foundation, either version 3 of the License, or
-/    (at your option) any later version.
-/
-/    Diaspora is distributed in the hope that it will be useful,
-/    but WITHOUT ANY WARRANTY; without even the implied warranty of
-/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/    GNU Affero General Public License for more details.
-/
-/    You should have received a copy of the GNU Affero General Public License
-/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
-/
+-#    Copyright 2010 Diaspora Inc.
+-#
+-#    This file is part of Diaspora.
+-#
+-#    Diaspora is free software: you can redistribute it and/or modify
+-#    it under the terms of the GNU Affero General Public License as published by
+-#    the Free Software Foundation, either version 3 of the License, or
+-#    (at your option) any later version.
+-#
+-#    Diaspora is distributed in the hope that it will be useful,
+-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-#    GNU Affero General Public License for more details.
+-#
+-#    You should have received a copy of the GNU Affero General Public License
+-#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+-#
 
 
 %h1 Add a new aspect
diff --git a/app/views/aspects/edit.html.haml b/app/views/aspects/edit.html.haml
index 683da67f1..aef241111 100644
--- a/app/views/aspects/edit.html.haml
+++ b/app/views/aspects/edit.html.haml
@@ -1,20 +1,20 @@
-/    Copyright 2010 Diaspora Inc.
-/
-/    This file is part of Diaspora.
-/
-/    Diaspora is free software: you can redistribute it and/or modify
-/    it under the terms of the GNU Affero General Public License as published by
-/    the Free Software Foundation, either version 3 of the License, or
-/    (at your option) any later version.
-/
-/    Diaspora is distributed in the hope that it will be useful,
-/    but WITHOUT ANY WARRANTY; without even the implied warranty of
-/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/    GNU Affero General Public License for more details.
-/
-/    You should have received a copy of the GNU Affero General Public License
-/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
-/
+-#    Copyright 2010 Diaspora Inc.
+-#
+-#    This file is part of Diaspora.
+-#
+-#    Diaspora is free software: you can redistribute it and/or modify
+-#    it under the terms of the GNU Affero General Public License as published by
+-#    the Free Software Foundation, either version 3 of the License, or
+-#    (at your option) any later version.
+-#
+-#    Diaspora is distributed in the hope that it will be useful,
+-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-#    GNU Affero General Public License for more details.
+-#
+-#    You should have received a copy of the GNU Affero General Public License
+-#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+-#
 
 
 - content_for :head do 
diff --git a/app/views/aspects/index.html.haml b/app/views/aspects/index.html.haml
index ab4fdfd06..919c8110d 100644
--- a/app/views/aspects/index.html.haml
+++ b/app/views/aspects/index.html.haml
@@ -1,20 +1,20 @@
-/    Copyright 2010 Diaspora Inc.
-/
-/    This file is part of Diaspora.
-/
-/    Diaspora is free software: you can redistribute it and/or modify
-/    it under the terms of the GNU Affero General Public License as published by
-/    the Free Software Foundation, either version 3 of the License, or
-/    (at your option) any later version.
-/
-/    Diaspora is distributed in the hope that it will be useful,
-/    but WITHOUT ANY WARRANTY; without even the implied warranty of
-/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/    GNU Affero General Public License for more details.
-/
-/    You should have received a copy of the GNU Affero General Public License
-/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
-/
+-#    Copyright 2010 Diaspora Inc.
+-#
+-#    This file is part of Diaspora.
+-#
+-#    Diaspora is free software: you can redistribute it and/or modify
+-#    it under the terms of the GNU Affero General Public License as published by
+-#    the Free Software Foundation, either version 3 of the License, or
+-#    (at your option) any later version.
+-#
+-#    Diaspora is distributed in the hope that it will be useful,
+-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-#    GNU Affero General Public License for more details.
+-#
+-#    You should have received a copy of the GNU Affero General Public License
+-#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+-#
 
 
 - content_for :page_title do
diff --git a/app/views/aspects/new.html.haml b/app/views/aspects/new.html.haml
index 5777171d7..67ce736a0 100644
--- a/app/views/aspects/new.html.haml
+++ b/app/views/aspects/new.html.haml
@@ -1,20 +1,20 @@
-/    Copyright 2010 Diaspora Inc.
-/
-/    This file is part of Diaspora.
-/
-/    Diaspora is free software: you can redistribute it and/or modify
-/    it under the terms of the GNU Affero General Public License as published by
-/    the Free Software Foundation, either version 3 of the License, or
-/    (at your option) any later version.
-/
-/    Diaspora is distributed in the hope that it will be useful,
-/    but WITHOUT ANY WARRANTY; without even the implied warranty of
-/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/    GNU Affero General Public License for more details.
-/
-/    You should have received a copy of the GNU Affero General Public License
-/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
-/
+-#    Copyright 2010 Diaspora Inc.
+-#
+-#    This file is part of Diaspora.
+-#
+-#    Diaspora is free software: you can redistribute it and/or modify
+-#    it under the terms of the GNU Affero General Public License as published by
+-#    the Free Software Foundation, either version 3 of the License, or
+-#    (at your option) any later version.
+-#
+-#    Diaspora is distributed in the hope that it will be useful,
+-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-#    GNU Affero General Public License for more details.
+-#
+-#    You should have received a copy of the GNU Affero General Public License
+-#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+-#
 
 
 %h1.big_text
diff --git a/app/views/aspects/show.html.haml b/app/views/aspects/show.html.haml
index ab4fdfd06..919c8110d 100644
--- a/app/views/aspects/show.html.haml
+++ b/app/views/aspects/show.html.haml
@@ -1,20 +1,20 @@
-/    Copyright 2010 Diaspora Inc.
-/
-/    This file is part of Diaspora.
-/
-/    Diaspora is free software: you can redistribute it and/or modify
-/    it under the terms of the GNU Affero General Public License as published by
-/    the Free Software Foundation, either version 3 of the License, or
-/    (at your option) any later version.
-/
-/    Diaspora is distributed in the hope that it will be useful,
-/    but WITHOUT ANY WARRANTY; without even the implied warranty of
-/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/    GNU Affero General Public License for more details.
-/
-/    You should have received a copy of the GNU Affero General Public License
-/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
-/
+-#    Copyright 2010 Diaspora Inc.
+-#
+-#    This file is part of Diaspora.
+-#
+-#    Diaspora is free software: you can redistribute it and/or modify
+-#    it under the terms of the GNU Affero General Public License as published by
+-#    the Free Software Foundation, either version 3 of the License, or
+-#    (at your option) any later version.
+-#
+-#    Diaspora is distributed in the hope that it will be useful,
+-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-#    GNU Affero General Public License for more details.
+-#
+-#    You should have received a copy of the GNU Affero General Public License
+-#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+-#
 
 
 - content_for :page_title do
diff --git a/app/views/comments/_comment.html.haml b/app/views/comments/_comment.html.haml
index 710cc115b..1dcb06334 100644
--- a/app/views/comments/_comment.html.haml
+++ b/app/views/comments/_comment.html.haml
@@ -1,20 +1,20 @@
-/    Copyright 2010 Diaspora Inc.
-/
-/    This file is part of Diaspora.
-/
-/    Diaspora is free software: you can redistribute it and/or modify
-/    it under the terms of the GNU Affero General Public License as published by
-/    the Free Software Foundation, either version 3 of the License, or
-/    (at your option) any later version.
-/
-/    Diaspora is distributed in the hope that it will be useful,
-/    but WITHOUT ANY WARRANTY; without even the implied warranty of
-/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/    GNU Affero General Public License for more details.
-/
-/    You should have received a copy of the GNU Affero General Public License
-/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
-/
+-#    Copyright 2010 Diaspora Inc.
+-#
+-#    This file is part of Diaspora.
+-#
+-#    Diaspora is free software: you can redistribute it and/or modify
+-#    it under the terms of the GNU Affero General Public License as published by
+-#    the Free Software Foundation, either version 3 of the License, or
+-#    (at your option) any later version.
+-#
+-#    Diaspora is distributed in the hope that it will be useful,
+-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-#    GNU Affero General Public License for more details.
+-#
+-#    You should have received a copy of the GNU Affero General Public License
+-#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+-#
 
 
 %li.comment{:id => post.id} 
diff --git a/app/views/comments/_comments.html.haml b/app/views/comments/_comments.html.haml
index 30fc8643d..04a5ae31d 100644
--- a/app/views/comments/_comments.html.haml
+++ b/app/views/comments/_comments.html.haml
@@ -1,20 +1,20 @@
-/    Copyright 2010 Diaspora Inc.
-/
-/    This file is part of Diaspora.
-/
-/    Diaspora is free software: you can redistribute it and/or modify
-/    it under the terms of the GNU Affero General Public License as published by
-/    the Free Software Foundation, either version 3 of the License, or
-/    (at your option) any later version.
-/
-/    Diaspora is distributed in the hope that it will be useful,
-/    but WITHOUT ANY WARRANTY; without even the implied warranty of
-/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/    GNU Affero General Public License for more details.
-/
-/    You should have received a copy of the GNU Affero General Public License
-/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
-/
+-#    Copyright 2010 Diaspora Inc.
+-#
+-#    This file is part of Diaspora.
+-#
+-#    Diaspora is free software: you can redistribute it and/or modify
+-#    it under the terms of the GNU Affero General Public License as published by
+-#    the Free Software Foundation, either version 3 of the License, or
+-#    (at your option) any later version.
+-#
+-#    Diaspora is distributed in the hope that it will be useful,
+-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-#    GNU Affero General Public License for more details.
+-#
+-#    You should have received a copy of the GNU Affero General Public License
+-#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+-#
 
 
 %div.comments
diff --git a/app/views/comments/_new_comment.html.haml b/app/views/comments/_new_comment.html.haml
index f5dbe73c7..9b3366799 100644
--- a/app/views/comments/_new_comment.html.haml
+++ b/app/views/comments/_new_comment.html.haml
@@ -1,20 +1,20 @@
-/    Copyright 2010 Diaspora Inc.
-/
-/    This file is part of Diaspora.
-/
-/    Diaspora is free software: you can redistribute it and/or modify
-/    it under the terms of the GNU Affero General Public License as published by
-/    the Free Software Foundation, either version 3 of the License, or
-/    (at your option) any later version.
-/
-/    Diaspora is distributed in the hope that it will be useful,
-/    but WITHOUT ANY WARRANTY; without even the implied warranty of
-/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/    GNU Affero General Public License for more details.
-/
-/    You should have received a copy of the GNU Affero General Public License
-/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
-/
+-#    Copyright 2010 Diaspora Inc.
+-#
+-#    This file is part of Diaspora.
+-#
+-#    Diaspora is free software: you can redistribute it and/or modify
+-#    it under the terms of the GNU Affero General Public License as published by
+-#    the Free Software Foundation, either version 3 of the License, or
+-#    (at your option) any later version.
+-#
+-#    Diaspora is distributed in the hope that it will be useful,
+-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-#    GNU Affero General Public License for more details.
+-#
+-#    You should have received a copy of the GNU Affero General Public License
+-#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+-#
 
 
 = form_for Comment.new, :remote => true do |f|
diff --git a/app/views/js/_websocket_js.haml b/app/views/js/_websocket_js.haml
index 5d52500da..e2641c511 100644
--- a/app/views/js/_websocket_js.haml
+++ b/app/views/js/_websocket_js.haml
@@ -1,20 +1,20 @@
-/    Copyright 2010 Diaspora Inc.
-/
-/    This file is part of Diaspora.
-/
-/    Diaspora is free software: you can redistribute it and/or modify
-/    it under the terms of the GNU Affero General Public License as published by
-/    the Free Software Foundation, either version 3 of the License, or
-/    (at your option) any later version.
-/
-/    Diaspora is distributed in the hope that it will be useful,
-/    but WITHOUT ANY WARRANTY; without even the implied warranty of
-/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/    GNU Affero General Public License for more details.
-/
-/    You should have received a copy of the GNU Affero General Public License
-/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
-/
+-#    Copyright 2010 Diaspora Inc.
+-#
+-#    This file is part of Diaspora.
+-#
+-#    Diaspora is free software: you can redistribute it and/or modify
+-#    it under the terms of the GNU Affero General Public License as published by
+-#    the Free Software Foundation, either version 3 of the License, or
+-#    (at your option) any later version.
+-#
+-#    Diaspora is distributed in the hope that it will be useful,
+-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-#    GNU Affero General Public License for more details.
+-#
+-#    You should have received a copy of the GNU Affero General Public License
+-#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+-#
 
 
 = javascript_include_tag 'FABridge', 'swfobject', 'web_socket'
diff --git a/app/views/people/index.html.haml b/app/views/people/index.html.haml
index 3c1d27b9e..eff4b3459 100644
--- a/app/views/people/index.html.haml
+++ b/app/views/people/index.html.haml
@@ -1,20 +1,20 @@
-/    Copyright 2010 Diaspora Inc.
-/
-/    This file is part of Diaspora.
-/
-/    Diaspora is free software: you can redistribute it and/or modify
-/    it under the terms of the GNU Affero General Public License as published by
-/    the Free Software Foundation, either version 3 of the License, or
-/    (at your option) any later version.
-/
-/    Diaspora is distributed in the hope that it will be useful,
-/    but WITHOUT ANY WARRANTY; without even the implied warranty of
-/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/    GNU Affero General Public License for more details.
-/
-/    You should have received a copy of the GNU Affero General Public License
-/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
-/
+-#    Copyright 2010 Diaspora Inc.
+-#
+-#    This file is part of Diaspora.
+-#
+-#    Diaspora is free software: you can redistribute it and/or modify
+-#    it under the terms of the GNU Affero General Public License as published by
+-#    the Free Software Foundation, either version 3 of the License, or
+-#    (at your option) any later version.
+-#
+-#    Diaspora is distributed in the hope that it will be useful,
+-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-#    GNU Affero General Public License for more details.
+-#
+-#    You should have received a copy of the GNU Affero General Public License
+-#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+-#
 
 
 %h1.big_text
diff --git a/app/views/people/new.html.haml b/app/views/people/new.html.haml
index 4f85ff3c4..f7c1a029d 100644
--- a/app/views/people/new.html.haml
+++ b/app/views/people/new.html.haml
@@ -1,20 +1,20 @@
-/    Copyright 2010 Diaspora Inc.
-/
-/    This file is part of Diaspora.
-/
-/    Diaspora is free software: you can redistribute it and/or modify
-/    it under the terms of the GNU Affero General Public License as published by
-/    the Free Software Foundation, either version 3 of the License, or
-/    (at your option) any later version.
-/
-/    Diaspora is distributed in the hope that it will be useful,
-/    but WITHOUT ANY WARRANTY; without even the implied warranty of
-/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/    GNU Affero General Public License for more details.
-/
-/    You should have received a copy of the GNU Affero General Public License
-/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
-/
+-#    Copyright 2010 Diaspora Inc.
+-#
+-#    This file is part of Diaspora.
+-#
+-#    Diaspora is free software: you can redistribute it and/or modify
+-#    it under the terms of the GNU Affero General Public License as published by
+-#    the Free Software Foundation, either version 3 of the License, or
+-#    (at your option) any later version.
+-#
+-#    Diaspora is distributed in the hope that it will be useful,
+-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-#    GNU Affero General Public License for more details.
+-#
+-#    You should have received a copy of the GNU Affero General Public License
+-#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+-#
 
 
 - title "New Person"
diff --git a/app/views/people/show.html.haml b/app/views/people/show.html.haml
index 423f3016c..64d71defc 100644
--- a/app/views/people/show.html.haml
+++ b/app/views/people/show.html.haml
@@ -1,20 +1,20 @@
-/    Copyright 2010 Diaspora Inc.
-/
-/    This file is part of Diaspora.
-/
-/    Diaspora is free software: you can redistribute it and/or modify
-/    it under the terms of the GNU Affero General Public License as published by
-/    the Free Software Foundation, either version 3 of the License, or
-/    (at your option) any later version.
-/
-/    Diaspora is distributed in the hope that it will be useful,
-/    but WITHOUT ANY WARRANTY; without even the implied warranty of
-/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/    GNU Affero General Public License for more details.
-/
-/    You should have received a copy of the GNU Affero General Public License
-/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
-/
+-#    Copyright 2010 Diaspora Inc.
+-#
+-#    This file is part of Diaspora.
+-#
+-#    Diaspora is free software: you can redistribute it and/or modify
+-#    it under the terms of the GNU Affero General Public License as published by
+-#    the Free Software Foundation, either version 3 of the License, or
+-#    (at your option) any later version.
+-#
+-#    Diaspora is distributed in the hope that it will be useful,
+-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-#    GNU Affero General Public License for more details.
+-#
+-#    You should have received a copy of the GNU Affero General Public License
+-#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+-#
 
 
 - content_for :page_title do
diff --git a/app/views/photos/_new_photo.haml b/app/views/photos/_new_photo.haml
index 6c57d9d96..dce4dc68e 100644
--- a/app/views/photos/_new_photo.haml
+++ b/app/views/photos/_new_photo.haml
@@ -1,20 +1,20 @@
-/    Copyright 2010 Diaspora Inc.
-/
-/    This file is part of Diaspora.
-/
-/    Diaspora is free software: you can redistribute it and/or modify
-/    it under the terms of the GNU Affero General Public License as published by
-/    the Free Software Foundation, either version 3 of the License, or
-/    (at your option) any later version.
-/
-/    Diaspora is distributed in the hope that it will be useful,
-/    but WITHOUT ANY WARRANTY; without even the implied warranty of
-/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/    GNU Affero General Public License for more details.
-/
-/    You should have received a copy of the GNU Affero General Public License
-/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
-/
+-#    Copyright 2010 Diaspora Inc.
+-#
+-#    This file is part of Diaspora.
+-#
+-#    Diaspora is free software: you can redistribute it and/or modify
+-#    it under the terms of the GNU Affero General Public License as published by
+-#    the Free Software Foundation, either version 3 of the License, or
+-#    (at your option) any later version.
+-#
+-#    Diaspora is distributed in the hope that it will be useful,
+-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-#    GNU Affero General Public License for more details.
+-#
+-#    You should have received a copy of the GNU Affero General Public License
+-#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+-#
 
 
 :javascript
diff --git a/app/views/photos/_photo.haml b/app/views/photos/_photo.haml
index 9d734c315..57b81ee41 100644
--- a/app/views/photos/_photo.haml
+++ b/app/views/photos/_photo.haml
@@ -1,20 +1,20 @@
-/    Copyright 2010 Diaspora Inc.
-/
-/    This file is part of Diaspora.
-/
-/    Diaspora is free software: you can redistribute it and/or modify
-/    it under the terms of the GNU Affero General Public License as published by
-/    the Free Software Foundation, either version 3 of the License, or
-/    (at your option) any later version.
-/
-/    Diaspora is distributed in the hope that it will be useful,
-/    but WITHOUT ANY WARRANTY; without even the implied warranty of
-/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/    GNU Affero General Public License for more details.
-/
-/    You should have received a copy of the GNU Affero General Public License
-/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
-/
+-#    Copyright 2010 Diaspora Inc.
+-#
+-#    This file is part of Diaspora.
+-#
+-#    Diaspora is free software: you can redistribute it and/or modify
+-#    it under the terms of the GNU Affero General Public License as published by
+-#    the Free Software Foundation, either version 3 of the License, or
+-#    (at your option) any later version.
+-#
+-#    Diaspora is distributed in the hope that it will be useful,
+-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-#    GNU Affero General Public License for more details.
+-#
+-#    You should have received a copy of the GNU Affero General Public License
+-#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+-#
 
 
 %li.message{:id => post.id}
diff --git a/app/views/photos/edit.html.haml b/app/views/photos/edit.html.haml
index fa5ea839f..dafdb62ff 100644
--- a/app/views/photos/edit.html.haml
+++ b/app/views/photos/edit.html.haml
@@ -1,20 +1,20 @@
-/    Copyright 2010 Diaspora Inc.
-/
-/    This file is part of Diaspora.
-/
-/    Diaspora is free software: you can redistribute it and/or modify
-/    it under the terms of the GNU Affero General Public License as published by
-/    the Free Software Foundation, either version 3 of the License, or
-/    (at your option) any later version.
-/
-/    Diaspora is distributed in the hope that it will be useful,
-/    but WITHOUT ANY WARRANTY; without even the implied warranty of
-/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/    GNU Affero General Public License for more details.
-/
-/    You should have received a copy of the GNU Affero General Public License
-/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
-/
+-#    Copyright 2010 Diaspora Inc.
+-#
+-#    This file is part of Diaspora.
+-#
+-#    Diaspora is free software: you can redistribute it and/or modify
+-#    it under the terms of the GNU Affero General Public License as published by
+-#    the Free Software Foundation, either version 3 of the License, or
+-#    (at your option) any later version.
+-#
+-#    Diaspora is distributed in the hope that it will be useful,
+-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-#    GNU Affero General Public License for more details.
+-#
+-#    You should have received a copy of the GNU Affero General Public License
+-#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+-#
 
 
 %h1.big_text
diff --git a/app/views/photos/new.html.haml b/app/views/photos/new.html.haml
index 02d6448e1..fcf7309f6 100644
--- a/app/views/photos/new.html.haml
+++ b/app/views/photos/new.html.haml
@@ -1,20 +1,20 @@
-/    Copyright 2010 Diaspora Inc.
-/
-/    This file is part of Diaspora.
-/
-/    Diaspora is free software: you can redistribute it and/or modify
-/    it under the terms of the GNU Affero General Public License as published by
-/    the Free Software Foundation, either version 3 of the License, or
-/    (at your option) any later version.
-/
-/    Diaspora is distributed in the hope that it will be useful,
-/    but WITHOUT ANY WARRANTY; without even the implied warranty of
-/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/    GNU Affero General Public License for more details.
-/
-/    You should have received a copy of the GNU Affero General Public License
-/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
-/
+-#    Copyright 2010 Diaspora Inc.
+-#
+-#    This file is part of Diaspora.
+-#
+-#    Diaspora is free software: you can redistribute it and/or modify
+-#    it under the terms of the GNU Affero General Public License as published by
+-#    the Free Software Foundation, either version 3 of the License, or
+-#    (at your option) any later version.
+-#
+-#    Diaspora is distributed in the hope that it will be useful,
+-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-#    GNU Affero General Public License for more details.
+-#
+-#    You should have received a copy of the GNU Affero General Public License
+-#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+-#
 
 
 - title "New Photo"
diff --git a/app/views/photos/show.html.haml b/app/views/photos/show.html.haml
index bbd1ec21f..d659124a7 100644
--- a/app/views/photos/show.html.haml
+++ b/app/views/photos/show.html.haml
@@ -1,20 +1,20 @@
-/    Copyright 2010 Diaspora Inc.
-/
-/    This file is part of Diaspora.
-/
-/    Diaspora is free software: you can redistribute it and/or modify
-/    it under the terms of the GNU Affero General Public License as published by
-/    the Free Software Foundation, either version 3 of the License, or
-/    (at your option) any later version.
-/
-/    Diaspora is distributed in the hope that it will be useful,
-/    but WITHOUT ANY WARRANTY; without even the implied warranty of
-/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/    GNU Affero General Public License for more details.
-/
-/    You should have received a copy of the GNU Affero General Public License
-/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
-/
+-#    Copyright 2010 Diaspora Inc.
+-#
+-#    This file is part of Diaspora.
+-#
+-#    Diaspora is free software: you can redistribute it and/or modify
+-#    it under the terms of the GNU Affero General Public License as published by
+-#    the Free Software Foundation, either version 3 of the License, or
+-#    (at your option) any later version.
+-#
+-#    Diaspora is distributed in the hope that it will be useful,
+-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-#    GNU Affero General Public License for more details.
+-#
+-#    You should have received a copy of the GNU Affero General Public License
+-#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+-#
 
 
 :javascript
diff --git a/app/views/posts/_debug.haml b/app/views/posts/_debug.haml
index 43978ecb8..0eaf5310d 100644
--- a/app/views/posts/_debug.haml
+++ b/app/views/posts/_debug.haml
@@ -1,20 +1,20 @@
-/    Copyright 2010 Diaspora Inc.
-/
-/    This file is part of Diaspora.
-/
-/    Diaspora is free software: you can redistribute it and/or modify
-/    it under the terms of the GNU Affero General Public License as published by
-/    the Free Software Foundation, either version 3 of the License, or
-/    (at your option) any later version.
-/
-/    Diaspora is distributed in the hope that it will be useful,
-/    but WITHOUT ANY WARRANTY; without even the implied warranty of
-/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/    GNU Affero General Public License for more details.
-/
-/    You should have received a copy of the GNU Affero General Public License
-/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
-/
+-#    Copyright 2010 Diaspora Inc.
+-#
+-#    This file is part of Diaspora.
+-#
+-#    Diaspora is free software: you can redistribute it and/or modify
+-#    it under the terms of the GNU Affero General Public License as published by
+-#    the Free Software Foundation, either version 3 of the License, or
+-#    (at your option) any later version.
+-#
+-#    Diaspora is distributed in the hope that it will be useful,
+-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-#    GNU Affero General Public License for more details.
+-#
+-#    You should have received a copy of the GNU Affero General Public License
+-#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+-#
 
 
 #debug_info
diff --git a/app/views/posts/_post.html.haml b/app/views/posts/_post.html.haml
index d14ef4ed7..562c7fd46 100644
--- a/app/views/posts/_post.html.haml
+++ b/app/views/posts/_post.html.haml
@@ -1,20 +1,20 @@
-/    Copyright 2010 Diaspora Inc.
-/
-/    This file is part of Diaspora.
-/
-/    Diaspora is free software: you can redistribute it and/or modify
-/    it under the terms of the GNU Affero General Public License as published by
-/    the Free Software Foundation, either version 3 of the License, or
-/    (at your option) any later version.
-/
-/    Diaspora is distributed in the hope that it will be useful,
-/    but WITHOUT ANY WARRANTY; without even the implied warranty of
-/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/    GNU Affero General Public License for more details.
-/
-/    You should have received a copy of the GNU Affero General Public License
-/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
-/
+-#    Copyright 2010 Diaspora Inc.
+-#
+-#    This file is part of Diaspora.
+-#
+-#    Diaspora is free software: you can redistribute it and/or modify
+-#    it under the terms of the GNU Affero General Public License as published by
+-#    the Free Software Foundation, either version 3 of the License, or
+-#    (at your option) any later version.
+-#
+-#    Diaspora is distributed in the hope that it will be useful,
+-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-#    GNU Affero General Public License for more details.
+-#
+-#    You should have received a copy of the GNU Affero General Public License
+-#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+-#
 
 
 %ul
diff --git a/app/views/requests/_new_request.haml b/app/views/requests/_new_request.haml
index 54642ffaf..c9aed0c49 100644
--- a/app/views/requests/_new_request.haml
+++ b/app/views/requests/_new_request.haml
@@ -1,20 +1,20 @@
-/    Copyright 2010 Diaspora Inc.
-/
-/    This file is part of Diaspora.
-/
-/    Diaspora is free software: you can redistribute it and/or modify
-/    it under the terms of the GNU Affero General Public License as published by
-/    the Free Software Foundation, either version 3 of the License, or
-/    (at your option) any later version.
-/
-/    Diaspora is distributed in the hope that it will be useful,
-/    but WITHOUT ANY WARRANTY; without even the implied warranty of
-/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/    GNU Affero General Public License for more details.
-/
-/    You should have received a copy of the GNU Affero General Public License
-/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
-/
+-#    Copyright 2010 Diaspora Inc.
+-#
+-#    This file is part of Diaspora.
+-#
+-#    Diaspora is free software: you can redistribute it and/or modify
+-#    it under the terms of the GNU Affero General Public License as published by
+-#    the Free Software Foundation, either version 3 of the License, or
+-#    (at your option) any later version.
+-#
+-#    Diaspora is distributed in the hope that it will be useful,
+-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-#    GNU Affero General Public License for more details.
+-#
+-#    You should have received a copy of the GNU Affero General Public License
+-#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+-#
 
 
 %h1
diff --git a/app/views/requests/_request.html.haml b/app/views/requests/_request.html.haml
index 87fa09cb3..f003958e2 100644
--- a/app/views/requests/_request.html.haml
+++ b/app/views/requests/_request.html.haml
@@ -1,20 +1,20 @@
-/    Copyright 2010 Diaspora Inc.
-/
-/    This file is part of Diaspora.
-/
-/    Diaspora is free software: you can redistribute it and/or modify
-/    it under the terms of the GNU Affero General Public License as published by
-/    the Free Software Foundation, either version 3 of the License, or
-/    (at your option) any later version.
-/
-/    Diaspora is distributed in the hope that it will be useful,
-/    but WITHOUT ANY WARRANTY; without even the implied warranty of
-/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/    GNU Affero General Public License for more details.
-/
-/    You should have received a copy of the GNU Affero General Public License
-/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
-/
+-#    Copyright 2010 Diaspora Inc.
+-#
+-#    This file is part of Diaspora.
+-#
+-#    Diaspora is free software: you can redistribute it and/or modify
+-#    it under the terms of the GNU Affero General Public License as published by
+-#    the Free Software Foundation, either version 3 of the License, or
+-#    (at your option) any later version.
+-#
+-#    Diaspora is distributed in the hope that it will be useful,
+-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-#    GNU Affero General Public License for more details.
+-#
+-#    You should have received a copy of the GNU Affero General Public License
+-#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+-#
 
 
 :javascript
diff --git a/app/views/requests/edit.html.haml b/app/views/requests/edit.html.haml
index 471041049..94e6fd172 100644
--- a/app/views/requests/edit.html.haml
+++ b/app/views/requests/edit.html.haml
@@ -1,20 +1,20 @@
-/    Copyright 2010 Diaspora Inc.
-/
-/    This file is part of Diaspora.
-/
-/    Diaspora is free software: you can redistribute it and/or modify
-/    it under the terms of the GNU Affero General Public License as published by
-/    the Free Software Foundation, either version 3 of the License, or
-/    (at your option) any later version.
-/
-/    Diaspora is distributed in the hope that it will be useful,
-/    but WITHOUT ANY WARRANTY; without even the implied warranty of
-/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/    GNU Affero General Public License for more details.
-/
-/    You should have received a copy of the GNU Affero General Public License
-/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
-/
+-#    Copyright 2010 Diaspora Inc.
+-#
+-#    This file is part of Diaspora.
+-#
+-#    Diaspora is free software: you can redistribute it and/or modify
+-#    it under the terms of the GNU Affero General Public License as published by
+-#    the Free Software Foundation, either version 3 of the License, or
+-#    (at your option) any later version.
+-#
+-#    Diaspora is distributed in the hope that it will be useful,
+-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-#    GNU Affero General Public License for more details.
+-#
+-#    You should have received a copy of the GNU Affero General Public License
+-#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+-#
 
 
 - title "Edit Request"
diff --git a/app/views/requests/index.html.haml b/app/views/requests/index.html.haml
index 5e85697dd..c56c2aa4a 100644
--- a/app/views/requests/index.html.haml
+++ b/app/views/requests/index.html.haml
@@ -1,20 +1,20 @@
-/    Copyright 2010 Diaspora Inc.
-/
-/    This file is part of Diaspora.
-/
-/    Diaspora is free software: you can redistribute it and/or modify
-/    it under the terms of the GNU Affero General Public License as published by
-/    the Free Software Foundation, either version 3 of the License, or
-/    (at your option) any later version.
-/
-/    Diaspora is distributed in the hope that it will be useful,
-/    but WITHOUT ANY WARRANTY; without even the implied warranty of
-/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/    GNU Affero General Public License for more details.
-/
-/    You should have received a copy of the GNU Affero General Public License
-/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
-/
+-#    Copyright 2010 Diaspora Inc.
+-#
+-#    This file is part of Diaspora.
+-#
+-#    Diaspora is free software: you can redistribute it and/or modify
+-#    it under the terms of the GNU Affero General Public License as published by
+-#    the Free Software Foundation, either version 3 of the License, or
+-#    (at your option) any later version.
+-#
+-#    Diaspora is distributed in the hope that it will be useful,
+-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-#    GNU Affero General Public License for more details.
+-#
+-#    You should have received a copy of the GNU Affero General Public License
+-#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+-#
 
 
 %h1.big_text
diff --git a/app/views/requests/show.html.haml b/app/views/requests/show.html.haml
index cb8045c5a..8026a593e 100644
--- a/app/views/requests/show.html.haml
+++ b/app/views/requests/show.html.haml
@@ -1,20 +1,20 @@
-/    Copyright 2010 Diaspora Inc.
-/
-/    This file is part of Diaspora.
-/
-/    Diaspora is free software: you can redistribute it and/or modify
-/    it under the terms of the GNU Affero General Public License as published by
-/    the Free Software Foundation, either version 3 of the License, or
-/    (at your option) any later version.
-/
-/    Diaspora is distributed in the hope that it will be useful,
-/    but WITHOUT ANY WARRANTY; without even the implied warranty of
-/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/    GNU Affero General Public License for more details.
-/
-/    You should have received a copy of the GNU Affero General Public License
-/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
-/
+-#    Copyright 2010 Diaspora Inc.
+-#
+-#    This file is part of Diaspora.
+-#
+-#    Diaspora is free software: you can redistribute it and/or modify
+-#    it under the terms of the GNU Affero General Public License as published by
+-#    the Free Software Foundation, either version 3 of the License, or
+-#    (at your option) any later version.
+-#
+-#    Diaspora is distributed in the hope that it will be useful,
+-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-#    GNU Affero General Public License for more details.
+-#
+-#    You should have received a copy of the GNU Affero General Public License
+-#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+-#
 
 
 - title "Request"
diff --git a/app/views/shared/_aspect_friends.haml b/app/views/shared/_aspect_friends.haml
index f3e3a334b..f0ebafa14 100644
--- a/app/views/shared/_aspect_friends.haml
+++ b/app/views/shared/_aspect_friends.haml
@@ -1,20 +1,20 @@
-/    Copyright 2010 Diaspora Inc.
-/
-/    This file is part of Diaspora.
-/
-/    Diaspora is free software: you can redistribute it and/or modify
-/    it under the terms of the GNU Affero General Public License as published by
-/    the Free Software Foundation, either version 3 of the License, or
-/    (at your option) any later version.
-/
-/    Diaspora is distributed in the hope that it will be useful,
-/    but WITHOUT ANY WARRANTY; without even the implied warranty of
-/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/    GNU Affero General Public License for more details.
-/
-/    You should have received a copy of the GNU Affero General Public License
-/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
-/
+-#    Copyright 2010 Diaspora Inc.
+-#
+-#    This file is part of Diaspora.
+-#
+-#    Diaspora is free software: you can redistribute it and/or modify
+-#    it under the terms of the GNU Affero General Public License as published by
+-#    the Free Software Foundation, either version 3 of the License, or
+-#    (at your option) any later version.
+-#
+-#    Diaspora is distributed in the hope that it will be useful,
+-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-#    GNU Affero General Public License for more details.
+-#
+-#    You should have received a copy of the GNU Affero General Public License
+-#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+-#
 
 
 #friend_pictures
diff --git a/app/views/shared/_aspect_nav.haml b/app/views/shared/_aspect_nav.haml
index bad149c28..13016044d 100644
--- a/app/views/shared/_aspect_nav.haml
+++ b/app/views/shared/_aspect_nav.haml
@@ -1,20 +1,20 @@
-/    Copyright 2010 Diaspora Inc.
-/
-/    This file is part of Diaspora.
-/
-/    Diaspora is free software: you can redistribute it and/or modify
-/    it under the terms of the GNU Affero General Public License as published by
-/    the Free Software Foundation, either version 3 of the License, or
-/    (at your option) any later version.
-/
-/    Diaspora is distributed in the hope that it will be useful,
-/    but WITHOUT ANY WARRANTY; without even the implied warranty of
-/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/    GNU Affero General Public License for more details.
-/
-/    You should have received a copy of the GNU Affero General Public License
-/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
-/
+-#    Copyright 2010 Diaspora Inc.
+-#
+-#    This file is part of Diaspora.
+-#
+-#    Diaspora is free software: you can redistribute it and/or modify
+-#    it under the terms of the GNU Affero General Public License as published by
+-#    the Free Software Foundation, either version 3 of the License, or
+-#    (at your option) any later version.
+-#
+-#    Diaspora is distributed in the hope that it will be useful,
+-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-#    GNU Affero General Public License for more details.
+-#
+-#    You should have received a copy of the GNU Affero General Public License
+-#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+-#
 
 
 #aspect_nav
diff --git a/app/views/shared/_post_wrapper.haml b/app/views/shared/_post_wrapper.haml
index c14e22907..c655ae724 100644
--- a/app/views/shared/_post_wrapper.haml
+++ b/app/views/shared/_post_wrapper.haml
@@ -1,20 +1,20 @@
-/    Copyright 2010 Diaspora Inc.
-/
-/    This file is part of Diaspora.
-/
-/    Diaspora is free software: you can redistribute it and/or modify
-/    it under the terms of the GNU Affero General Public License as published by
-/    the Free Software Foundation, either version 3 of the License, or
-/    (at your option) any later version.
-/
-/    Diaspora is distributed in the hope that it will be useful,
-/    but WITHOUT ANY WARRANTY; without even the implied warranty of
-/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/    GNU Affero General Public License for more details.
-/
-/    You should have received a copy of the GNU Affero General Public License
-/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
-/
+-#    Copyright 2010 Diaspora Inc.
+-#
+-#    This file is part of Diaspora.
+-#
+-#    Diaspora is free software: you can redistribute it and/or modify
+-#    it under the terms of the GNU Affero General Public License as published by
+-#    the Free Software Foundation, either version 3 of the License, or
+-#    (at your option) any later version.
+-#
+-#    Diaspora is distributed in the hope that it will be useful,
+-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-#    GNU Affero General Public License for more details.
+-#
+-#    You should have received a copy of the GNU Affero General Public License
+-#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+-#
 
 
 %li.message{:id => post.id, :class => ("mine" if current_user.owns?(post))}
diff --git a/app/views/shared/_publisher.haml b/app/views/shared/_publisher.haml
index 93ed0b59e..93d445ac6 100644
--- a/app/views/shared/_publisher.haml
+++ b/app/views/shared/_publisher.haml
@@ -1,20 +1,20 @@
-/    Copyright 2010 Diaspora Inc.
-/
-/    This file is part of Diaspora.
-/
-/    Diaspora is free software: you can redistribute it and/or modify
-/    it under the terms of the GNU Affero General Public License as published by
-/    the Free Software Foundation, either version 3 of the License, or
-/    (at your option) any later version.
-/
-/    Diaspora is distributed in the hope that it will be useful,
-/    but WITHOUT ANY WARRANTY; without even the implied warranty of
-/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/    GNU Affero General Public License for more details.
-/
-/    You should have received a copy of the GNU Affero General Public License
-/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
-/
+-#    Copyright 2010 Diaspora Inc.
+-#
+-#    This file is part of Diaspora.
+-#
+-#    Diaspora is free software: you can redistribute it and/or modify
+-#    it under the terms of the GNU Affero General Public License as published by
+-#    the Free Software Foundation, either version 3 of the License, or
+-#    (at your option) any later version.
+-#
+-#    Diaspora is distributed in the hope that it will be useful,
+-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-#    GNU Affero General Public License for more details.
+-#
+-#    You should have received a copy of the GNU Affero General Public License
+-#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+-#
 
 
 #publisher
diff --git a/app/views/shared/log.haml b/app/views/shared/log.haml
index 7a6e43517..636db29f6 100644
--- a/app/views/shared/log.haml
+++ b/app/views/shared/log.haml
@@ -1,20 +1,20 @@
-/    Copyright 2010 Diaspora Inc.
-/
-/    This file is part of Diaspora.
-/
-/    Diaspora is free software: you can redistribute it and/or modify
-/    it under the terms of the GNU Affero General Public License as published by
-/    the Free Software Foundation, either version 3 of the License, or
-/    (at your option) any later version.
-/
-/    Diaspora is distributed in the hope that it will be useful,
-/    but WITHOUT ANY WARRANTY; without even the implied warranty of
-/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/    GNU Affero General Public License for more details.
-/
-/    You should have received a copy of the GNU Affero General Public License
-/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
-/
+-#    Copyright 2010 Diaspora Inc.
+-#
+-#    This file is part of Diaspora.
+-#
+-#    Diaspora is free software: you can redistribute it and/or modify
+-#    it under the terms of the GNU Affero General Public License as published by
+-#    the Free Software Foundation, either version 3 of the License, or
+-#    (at your option) any later version.
+-#
+-#    Diaspora is distributed in the hope that it will be useful,
+-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-#    GNU Affero General Public License for more details.
+-#
+-#    You should have received a copy of the GNU Affero General Public License
+-#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+-#
 
 
 = @log.to_s
diff --git a/app/views/status_messages/_new_status_message.haml b/app/views/status_messages/_new_status_message.haml
index 62ab81778..63220380b 100644
--- a/app/views/status_messages/_new_status_message.haml
+++ b/app/views/status_messages/_new_status_message.haml
@@ -1,20 +1,20 @@
-/    Copyright 2010 Diaspora Inc.
-/
-/    This file is part of Diaspora.
-/
-/    Diaspora is free software: you can redistribute it and/or modify
-/    it under the terms of the GNU Affero General Public License as published by
-/    the Free Software Foundation, either version 3 of the License, or
-/    (at your option) any later version.
-/
-/    Diaspora is distributed in the hope that it will be useful,
-/    but WITHOUT ANY WARRANTY; without even the implied warranty of
-/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/    GNU Affero General Public License for more details.
-/
-/    You should have received a copy of the GNU Affero General Public License
-/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
-/
+-#    Copyright 2010 Diaspora Inc.
+-#
+-#    This file is part of Diaspora.
+-#
+-#    Diaspora is free software: you can redistribute it and/or modify
+-#    it under the terms of the GNU Affero General Public License as published by
+-#    the Free Software Foundation, either version 3 of the License, or
+-#    (at your option) any later version.
+-#
+-#    Diaspora is distributed in the hope that it will be useful,
+-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-#    GNU Affero General Public License for more details.
+-#
+-#    You should have received a copy of the GNU Affero General Public License
+-#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+-#
 
 
 = form_for StatusMessage.new, :remote => true do |f|
diff --git a/app/views/status_messages/_status_message.html.haml b/app/views/status_messages/_status_message.html.haml
index 14c402529..9581e4c1d 100644
--- a/app/views/status_messages/_status_message.html.haml
+++ b/app/views/status_messages/_status_message.html.haml
@@ -1,20 +1,20 @@
-/    Copyright 2010 Diaspora Inc.
-/
-/    This file is part of Diaspora.
-/
-/    Diaspora is free software: you can redistribute it and/or modify
-/    it under the terms of the GNU Affero General Public License as published by
-/    the Free Software Foundation, either version 3 of the License, or
-/    (at your option) any later version.
-/
-/    Diaspora is distributed in the hope that it will be useful,
-/    but WITHOUT ANY WARRANTY; without even the implied warranty of
-/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/    GNU Affero General Public License for more details.
-/
-/    You should have received a copy of the GNU Affero General Public License
-/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
-/
+-#    Copyright 2010 Diaspora Inc.
+-#
+-#    This file is part of Diaspora.
+-#
+-#    Diaspora is free software: you can redistribute it and/or modify
+-#    it under the terms of the GNU Affero General Public License as published by
+-#    the Free Software Foundation, either version 3 of the License, or
+-#    (at your option) any later version.
+-#
+-#    Diaspora is distributed in the hope that it will be useful,
+-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-#    GNU Affero General Public License for more details.
+-#
+-#    You should have received a copy of the GNU Affero General Public License
+-#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+-#
 
 
 %li.message{:id => post.id, :class => ("mine" if current_user.owns?(post))}
diff --git a/app/views/status_messages/index.html.haml b/app/views/status_messages/index.html.haml
index a86eb1bbd..d35fd0d71 100644
--- a/app/views/status_messages/index.html.haml
+++ b/app/views/status_messages/index.html.haml
@@ -1,20 +1,20 @@
-/    Copyright 2010 Diaspora Inc.
-/
-/    This file is part of Diaspora.
-/
-/    Diaspora is free software: you can redistribute it and/or modify
-/    it under the terms of the GNU Affero General Public License as published by
-/    the Free Software Foundation, either version 3 of the License, or
-/    (at your option) any later version.
-/
-/    Diaspora is distributed in the hope that it will be useful,
-/    but WITHOUT ANY WARRANTY; without even the implied warranty of
-/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/    GNU Affero General Public License for more details.
-/
-/    You should have received a copy of the GNU Affero General Public License
-/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
-/
+-#    Copyright 2010 Diaspora Inc.
+-#
+-#    This file is part of Diaspora.
+-#
+-#    Diaspora is free software: you can redistribute it and/or modify
+-#    it under the terms of the GNU Affero General Public License as published by
+-#    the Free Software Foundation, either version 3 of the License, or
+-#    (at your option) any later version.
+-#
+-#    Diaspora is distributed in the hope that it will be useful,
+-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-#    GNU Affero General Public License for more details.
+-#
+-#    You should have received a copy of the GNU Affero General Public License
+-#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+-#
 
 
 %h1.big_text status messages
diff --git a/app/views/status_messages/show.html.haml b/app/views/status_messages/show.html.haml
index 641f382c6..7f49a3bcd 100644
--- a/app/views/status_messages/show.html.haml
+++ b/app/views/status_messages/show.html.haml
@@ -1,20 +1,20 @@
-/    Copyright 2010 Diaspora Inc.
-/
-/    This file is part of Diaspora.
-/
-/    Diaspora is free software: you can redistribute it and/or modify
-/    it under the terms of the GNU Affero General Public License as published by
-/    the Free Software Foundation, either version 3 of the License, or
-/    (at your option) any later version.
-/
-/    Diaspora is distributed in the hope that it will be useful,
-/    but WITHOUT ANY WARRANTY; without even the implied warranty of
-/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/    GNU Affero General Public License for more details.
-/
-/    You should have received a copy of the GNU Affero General Public License
-/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
-/
+-#    Copyright 2010 Diaspora Inc.
+-#
+-#    This file is part of Diaspora.
+-#
+-#    Diaspora is free software: you can redistribute it and/or modify
+-#    it under the terms of the GNU Affero General Public License as published by
+-#    the Free Software Foundation, either version 3 of the License, or
+-#    (at your option) any later version.
+-#
+-#    Diaspora is distributed in the hope that it will be useful,
+-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-#    GNU Affero General Public License for more details.
+-#
+-#    You should have received a copy of the GNU Affero General Public License
+-#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+-#
 
 
 - title "Status Message"
diff --git a/app/views/users/edit.html.haml b/app/views/users/edit.html.haml
index e6d0e1e88..20c30ea11 100644
--- a/app/views/users/edit.html.haml
+++ b/app/views/users/edit.html.haml
@@ -1,20 +1,20 @@
-/    Copyright 2010 Diaspora Inc.
-/
-/    This file is part of Diaspora.
-/
-/    Diaspora is free software: you can redistribute it and/or modify
-/    it under the terms of the GNU Affero General Public License as published by
-/    the Free Software Foundation, either version 3 of the License, or
-/    (at your option) any later version.
-/
-/    Diaspora is distributed in the hope that it will be useful,
-/    but WITHOUT ANY WARRANTY; without even the implied warranty of
-/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/    GNU Affero General Public License for more details.
-/
-/    You should have received a copy of the GNU Affero General Public License
-/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
-/
+-#    Copyright 2010 Diaspora Inc.
+-#
+-#    This file is part of Diaspora.
+-#
+-#    Diaspora is free software: you can redistribute it and/or modify
+-#    it under the terms of the GNU Affero General Public License as published by
+-#    the Free Software Foundation, either version 3 of the License, or
+-#    (at your option) any later version.
+-#
+-#    Diaspora is distributed in the hope that it will be useful,
+-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-#    GNU Affero General Public License for more details.
+-#
+-#    You should have received a copy of the GNU Affero General Public License
+-#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+-#
 
 
 %h1.big_text
diff --git a/public/404.html b/public/404.html
index 9a48320a5..13597a69a 100644
--- a/public/404.html
+++ b/public/404.html
@@ -20,7 +20,7 @@
   <!-- This file lives in public/404.html -->
   <div class="dialog">
     <h1>The page you were looking for doesn't exist.</h1>
-    <p>You may have mistyped the address or the page may have moved.</p>
+    <p>You should try going outside.</p>
   </div>
 </body>
 </html>
diff --git a/public/500.html b/public/500.html
index b80307fc1..6762d986b 100644
--- a/public/500.html
+++ b/public/500.html
@@ -19,7 +19,7 @@
 <body>
   <!-- This file lives in public/500.html -->
   <div class="dialog">
-    <h1>We're sorry, but something went wrong.</h1>
+    <h1>Please, stop that.</h1>
     <p>We've been notified about this issue and we'll take a look at it shortly.</p>
   </div>
 </body>