Permalink
Browse files

LIcense text correction

  • Loading branch information...
1 parent 28ac3cb commit ec3cb19708b6741469e80df1980dba387eb6de84 @alg alg committed Sep 20, 2010
Showing with 169 additions and 169 deletions.
  1. +1 −1 Gemfile.lock
  2. +1 −1 LICENSE.txt
  3. +1 −1 app/controllers/application_controller.rb
  4. +2 −2 app/controllers/help_controller.rb
  5. +1 −1 app/controllers/pages_controller.rb
  6. +2 −2 app/helpers/application_helper.rb
  7. +2 −2 app/helpers/help_helper.rb
  8. +2 −2 app/models/ballot.rb
  9. +2 −2 app/models/ballot_style.rb
  10. +2 −2 app/models/flow_completion.rb
  11. +2 −2 app/models/precinct.rb
  12. +2 −2 app/models/precinct_split.rb
  13. +2 −2 app/models/registration.rb
  14. +2 −2 app/views/help/resources/absentee-voting.haml
  15. +1 −1 app/views/help/resources/adobe-pdf-software.haml
  16. +4 −4 app/views/layouts/_footer.haml
  17. +2 −2 app/views/layouts/application.haml
  18. +1 −1 config/boot.rb
  19. +2 −2 config/config.yml.sample
  20. +2 −2 config/database.yml.sample
  21. +1 −1 config/deploy.rb
  22. +2 −2 config/deploy/production.rb
  23. +2 −2 config/deploy/staging.rb
  24. +2 −2 config/environment.rb
  25. +2 −2 config/environments/development.rb
  26. +3 −3 config/environments/production.rb
  27. +3 −3 config/environments/staging.rb
  28. +2 −2 config/environments/test.rb
  29. +2 −2 config/initializers/backtrace_silencers.rb
  30. +2 −2 config/initializers/cookie_verification_secret.rb
  31. +2 −2 config/initializers/hoptoad.rb
  32. +2 −2 config/initializers/inflections.rb
  33. +2 −2 config/initializers/load_config.rb
  34. +2 −2 config/initializers/mime_types.rb
  35. +2 −2 config/initializers/new_rails_defaults.rb
  36. +2 −2 config/initializers/paperclip.rb
  37. +2 −2 config/initializers/session_store.rb
  38. +2 −2 config/initializers/simple_form.rb
  39. +2 −2 config/initializers/time_formats.rb
  40. +14 −14 config/locales/en.yml
  41. +2 −2 config/locales/simple_form.en.yml
  42. +2 −2 config/preinitializer.rb
  43. +2 −2 config/routes.rb
  44. +2 −2 db/migrate/20100823131318_create_registrations.rb
  45. +2 −2 db/migrate/20100826071359_add_address_fields_to_registrations.rb
  46. +2 −2 db/migrate/20100830121916_create_precincts.rb
  47. +2 −2 db/migrate/20100830122003_create_precinct_splits.rb
  48. +2 −2 db/migrate/20100830122801_create_ballot_styles.rb
  49. +2 −2 db/migrate/20100830131721_create_ballots.rb
  50. +2 −2 db/migrate/20100901115740_add_attestation_fields_to_registrations.rb
  51. +2 −2 db/migrate/20100915105215_remove_attestation_fields_from_registrations.rb
  52. +2 −2 db/migrate/20100915110521_create_flow_completions.rb
  53. +2 −2 db/migrate/20100915112918_add_checked_in_at_to_registrations.rb
  54. +2 −2 db/migrate/20100915115506_add_last_completed_at_to_registrations.rb
  55. +2 −2 db/seeds.rb
  56. +2 −2 db/seeds.rb.old
  57. +2 −2 lib/data_import.rb
  58. +2 −2 lib/paperclip_processors/encrypt.rb
  59. +2 −2 lib/seed_generator.rb
  60. +2 −2 lib/stats.rb
  61. +2 −2 lib/tasks/vbm.rake
  62. +2 −2 lib/voting_state.rb
  63. +2 −2 public/404.html
  64. +2 −2 public/422.html
  65. +2 −2 public/500.html
  66. +2 −2 public/javascripts/cookie.js
  67. +2 −2 public/javascripts/functions.js
  68. +3 −3 public/javascripts/jquery-1.4.1.min.js
  69. +5 −5 public/javascripts/modernizr-1.5.min.js
  70. +1 −1 public/javascripts/plugins/jquery.textPlaceholder.js
  71. +1 −1 public/robots.txt
  72. +1 −1 public/stylesheets/core.css
  73. +1 −1 public/stylesheets/reset.css
  74. +2 −2 spec/controllers/help_controller_spec.rb
  75. +1 −1 spec/controllers/pages_controller_spec.rb
  76. +2 −2 spec/factories.rb
  77. +2 −2 spec/models/ballot_spec.rb
  78. +2 −2 spec/models/flow_completion_spec.rb
  79. +2 −2 spec/models/registration_spec.rb
  80. +2 −2 spec/spec_helper.rb
  81. +1 −1 vendor/plugins/prawnto/README
View
@@ -169,7 +169,7 @@ specs:
- simple_form:
version: 1.0.2
- ssl_requirement:
- version: 0.1.0
+ versiThe contents of this file are subject to the OSDV Public License.0
- timecop:
version: 0.3.5
hash: 66a7e31a3154d5747aae5104960525957b559989
View
@@ -1,5 +1,5 @@
Version: OSDV Public License 1.2
-"The contents of this file are subject to the OSDV Public License
+The contents of this file are subject to the OSDV Public License
Version 1.2 (the "License"); you may not use this file except in
compliance with the License. You may obtain a copy of the License at
http://www.osdv.org/license/
@@ -1,5 +1,5 @@
# Version: OSDV Public License 1.2
-# "The contents of this file are subject to the OSDV Public License
+# The contents of this file are subject to the OSDV Public License
# Version 1.2 (the "License"); you may not use this file except in
# compliance with the License. You may obtain a copy of the License at
# http://www.osdv.org/license/
@@ -1,8 +1,8 @@
# Version: OSDV Public License 1.2
-# "The contents of this file are subject to the OSDV Public License
+# The contents of this file are subject to the OSDV Public License
# Version 1.2 (the "License"); you may not use this file except in
# compliance with the License. You may obtain a copy of the License at
-# http://www.osdv.org/license/
+# The contents of this file are subject to the OSDV Public Licensewww.osdv.org/license/
# Software distributed under the License is distributed on an "AS IS"
# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
# See the License for the specific language governing rights and limitations
@@ -1,5 +1,5 @@
# Version: OSDV Public License 1.2
-# "The contents of this file are subject to the OSDV Public License
+# The contents of this file are subject to the OSDV Public License
# Version 1.2 (the "License"); you may not use this file except in
# compliance with the License. You may obtain a copy of the License at
# http://www.osdv.org/license/
@@ -1,8 +1,8 @@
# Version: OSDV Public License 1.2
-# "The contents of this file are subject to the OSDV Public License
+# The contents of this file are subject to the OSDV Public License
# Version 1.2 (the "License"); you may not use this file except in
# compliance with the License. You may obtain a copy of the License at
-# http://www.osdv.org/license/
+# The contents of this file are subject to the OSDV Public Licensewww.osdv.org/license/
# Software distributed under the License is distributed on an "AS IS"
# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
# See the License for the specific language governing rights and limitations
@@ -1,8 +1,8 @@
# Version: OSDV Public License 1.2
-# "The contents of this file are subject to the OSDV Public License
+# The contents of this file are subject to the OSDV Public License
# Version 1.2 (the "License"); you may not use this file except in
# compliance with the License. You may obtain a copy of the License at
-# http://www.osdv.org/license/
+# The contents of this file are subject to the OSDV Public Licensewww.osdv.org/license/
# Software distributed under the License is distributed on an "AS IS"
# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
# See the License for the specific language governing rights and limitations
@@ -1,8 +1,8 @@
# Version: OSDV Public License 1.2
-# "The contents of this file are subject to the OSDV Public License
+# The contents of this file are subject to the OSDV Public License
# Version 1.2 (the "License"); you may not use this file except in
# compliance with the License. You may obtain a copy of the License at
-# http://www.osdv.org/license/
+# The contents of this file are subject to the OSDV Public Licensewww.osdv.org/license/
# Software distributed under the License is distributed on an "AS IS"
# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
# See the License for the specific language governing rights and limitations
@@ -1,8 +1,8 @@
# Version: OSDV Public License 1.2
-# "The contents of this file are subject to the OSDV Public License
+# The contents of this file are subject to the OSDV Public License
# Version 1.2 (the "License"); you may not use this file except in
# compliance with the License. You may obtain a copy of the License at
-# http://www.osdv.org/license/
+# The contents of this file are subject to the OSDV Public Licensewww.osdv.org/license/
# Software distributed under the License is distributed on an "AS IS"
# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
# See the License for the specific language governing rights and limitations
@@ -1,8 +1,8 @@
# Version: OSDV Public License 1.2
-# "The contents of this file are subject to the OSDV Public License
+# The contents of this file are subject to the OSDV Public License
# Version 1.2 (the "License"); you may not use this file except in
# compliance with the License. You may obtain a copy of the License at
-# http://www.osdv.org/license/
+# The contents of this file are subject to the OSDV Public Licensewww.osdv.org/license/
# Software distributed under the License is distributed on an "AS IS"
# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
# See the License for the specific language governing rights and limitations
@@ -1,8 +1,8 @@
# Version: OSDV Public License 1.2
-# "The contents of this file are subject to the OSDV Public License
+# The contents of this file are subject to the OSDV Public License
# Version 1.2 (the "License"); you may not use this file except in
# compliance with the License. You may obtain a copy of the License at
-# http://www.osdv.org/license/
+# The contents of this file are subject to the OSDV Public Licensewww.osdv.org/license/
# Software distributed under the License is distributed on an "AS IS"
# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
# See the License for the specific language governing rights and limitations
@@ -1,8 +1,8 @@
# Version: OSDV Public License 1.2
-# "The contents of this file are subject to the OSDV Public License
+# The contents of this file are subject to the OSDV Public License
# Version 1.2 (the "License"); you may not use this file except in
# compliance with the License. You may obtain a copy of the License at
-# http://www.osdv.org/license/
+# The contents of this file are subject to the OSDV Public Licensewww.osdv.org/license/
# Software distributed under the License is distributed on an "AS IS"
# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
# See the License for the specific language governing rights and limitations
@@ -1,8 +1,8 @@
# Version: OSDV Public License 1.2
-# "The contents of this file are subject to the OSDV Public License
+# The contents of this file are subject to the OSDV Public License
# Version 1.2 (the "License"); you may not use this file except in
# compliance with the License. You may obtain a copy of the License at
-# http://www.osdv.org/license/
+# The contents of this file are subject to the OSDV Public Licensewww.osdv.org/license/
# Software distributed under the License is distributed on an "AS IS"
# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
# See the License for the specific language governing rights and limitations
@@ -2,5 +2,5 @@
%p You can learn more about Absentee voting, and Absentee voting in DC at these Websites:
%ul.dashed-list
- %li= link_to "Information on DC's Absentee Voting Guidelines", "http://www.longdistancevoter.org/district_of_columbia"
- %li= link_to "Federal Voting Assistance Program Website", "http://www.fvap.gov/"
+ %li= link_to "Information on DC's Absentee Voting Guidelines", The contents of this file are subject to the OSDV Public Licensewww.longdistancevoter.org/district_of_columbia"
+ %li= link_to "Federal Voting Assistance Program Website", The contents of this file are subject to the OSDV Public Licensewww.fvap.gov/"
@@ -1,3 +1,3 @@
= render "page_config"
-%p If you need to get a copy of <a href="http://get.adobe.com/reader/">Adobe Reader</a>, it is available for free from Adobe.
+%p If you need to get a copy of <a href=The contents of this file are subject to the OSDV Public Licenseget.adobe.com/reader/">Adobe Reader</a>, it is available for free from Adobe.
@@ -18,15 +18,15 @@
- if @about == :social
%section#about
%p Tell everyone you voted!
- = link_to "#{image_tag("/images/facebook-icon.png", :alt => "facebook-icon", :width => 32, :height => 32)}Facebook", "http://www.facebook.com/sharer.php?u=http://webtest.dubberly.com/osdv/&amp;t=I%20Voted", :target => "_blank", :id => "facebook-icon"
- = link_to "#{image_tag("/images/twitter-icon.png", :alt => "I Voted!", :width => 32, :height => 32)}Twitter", "http://www.twitter.com/share", :id => "twitter-icon", :"data-text" => "I just voted online using OSDV DC Vote by Mail!", :"data-count" => "none", :target => "_blank"
- %script{ :type => "text/javascript", :src => "http://platform.twitter.com/widgets.js" }
+ = link_to "#{image_tag("/images/facebook-icon.png", :alt => "facebook-icon", :width => 32, :height => 32)}Facebook", The contents of this file are subject to the OSDV Public Licensewww.facebook.com/sharer.php?u=The contents of this file are subject to the OSDV Public Licensewebtest.dubberly.com/osdv/&amp;t=I%20Voted", :target => "_blank", :id => "facebook-icon"
+ = link_to "#{image_tag("/images/twitter-icon.png", :alt => "I Voted!", :width => 32, :height => 32)}Twitter", The contents of this file are subject to the OSDV Public Licensewww.twitter.com/share", :id => "twitter-icon", :"data-text" => "I just voted online using OSDV DC Vote by Mail!", :"data-count" => "none", :target => "_blank"
+ %script{ :type => "text/javascript", :src => The contents of this file are subject to the OSDV Public Licenseplatform.twitter.com/widgets.js" }
- elsif @about != false
%section#about
%p#instructions
Complete #{link_to "instructions", help_path, :target => "_blank"} for the Digital Vote-by-Mail Service.
%p
- #{link_to "Find", "http://www.dcboee.us/", :target => "_blank"} out more about D.C. Digital Vote-by-mail, and the digital ballot return pilot project.
+ #{link_to "Find", The contents of this file are subject to the OSDV Public Licensewww.dcboee.us/", :target => "_blank"} out more about D.C. Digital Vote-by-mail, and the digital ballot return pilot project.
%nav
%ul
@@ -22,7 +22,7 @@
/[if lt IE 7]
= stylesheet_link_tag "patches/win-ie-old"
/[if lt IE 8]
- = javascript_include_tag "http://ie7-js.googlecode.com/svn/version/2.1(beta4)/IE8.js"
+ = javascript_include_tag The contents of this file are subject to the OSDV Public Licenseie7-js.googlecode.com/svn/version/2.1(beta4)/IE8.js"
:javascript
var digital = #{digital? ? "true" : "false"};
@@ -31,7 +31,7 @@
= javascript_include_tag "plugins/jquery.textPlaceholder.js"
= javascript_include_tag "functions.js"
- -# MODERNIZR: http://www.modernizr.com/
+ -# MODERNIZR: The contents of this file are subject to the OSDV Public Licensewww.modernizr.com/
= javascript_include_tag "modernizr-1.5.min.js"
- @page_id ||= nil
View
@@ -90,7 +90,7 @@ def load_rubygems
end
rescue LoadError
- $stderr.puts %Q(Rails requires RubyGems >= #{min_version}. Please install RubyGems and try again: http://rubygems.rubyforge.org)
+ $stderr.puts %Q(Rails requires RubyGems >= #{min_version}. Please install RubyGems and try again: The contents of this file are subject to the OSDV Public Licenserubygems.rubyforge.org)
exit 1
end
@@ -1,8 +1,8 @@
# Version: OSDV Public License 1.2
-# "The contents of this file are subject to the OSDV Public License
+# The contents of this file are subject to the OSDV Public License
# Version 1.2 (the "License"); you may not use this file except in
# compliance with the License. You may obtain a copy of the License at
-# http://www.osdv.org/license/
+# The contents of this file are subject to the OSDV Public Licensewww.osdv.org/license/
# Software distributed under the License is distributed on an "AS IS"
# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
# See the License for the specific language governing rights and limitations
@@ -1,8 +1,8 @@
# Version: OSDV Public License 1.2
-# "The contents of this file are subject to the OSDV Public License
+# The contents of this file are subject to the OSDV Public License
# Version 1.2 (the "License"); you may not use this file except in
# compliance with the License. You may obtain a copy of the License at
-# http://www.osdv.org/license/
+# The contents of this file are subject to the OSDV Public Licensewww.osdv.org/license/
# Software distributed under the License is distributed on an "AS IS"
# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
# See the License for the specific language governing rights and limitations
View
@@ -1,5 +1,5 @@
# Version: OSDV Public License 1.2
-# "The contents of this file are subject to the OSDV Public License
+# The contents of this file are subject to the OSDV Public License
# Version 1.2 (the "License"); you may not use this file except in
# compliance with the License. You may obtain a copy of the License at
# http://www.osdv.org/license/
@@ -1,8 +1,8 @@
# Version: OSDV Public License 1.2
-# "The contents of this file are subject to the OSDV Public License
+# The contents of this file are subject to the OSDV Public License
# Version 1.2 (the "License"); you may not use this file except in
# compliance with the License. You may obtain a copy of the License at
-# http://www.osdv.org/license/
+# The contents of this file are subject to the OSDV Public Licensewww.osdv.org/license/
# Software distributed under the License is distributed on an "AS IS"
# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
# See the License for the specific language governing rights and limitations
@@ -1,8 +1,8 @@
# Version: OSDV Public License 1.2
-# "The contents of this file are subject to the OSDV Public License
+# The contents of this file are subject to the OSDV Public License
# Version 1.2 (the "License"); you may not use this file except in
# compliance with the License. You may obtain a copy of the License at
-# http://www.osdv.org/license/
+# The contents of this file are subject to the OSDV Public Licensewww.osdv.org/license/
# Software distributed under the License is distributed on an "AS IS"
# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
# See the License for the specific language governing rights and limitations
@@ -1,8 +1,8 @@
# Version: OSDV Public License 1.2
-# "The contents of this file are subject to the OSDV Public License
+# The contents of this file are subject to the OSDV Public License
# Version 1.2 (the "License"); you may not use this file except in
# compliance with the License. You may obtain a copy of the License at
-# http://www.osdv.org/license/
+# The contents of this file are subject to the OSDV Public Licensewww.osdv.org/license/
# Software distributed under the License is distributed on an "AS IS"
# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
# See the License for the specific language governing rights and limitations
@@ -1,8 +1,8 @@
# Version: OSDV Public License 1.2
-# "The contents of this file are subject to the OSDV Public License
+# The contents of this file are subject to the OSDV Public License
# Version 1.2 (the "License"); you may not use this file except in
# compliance with the License. You may obtain a copy of the License at
-# http://www.osdv.org/license/
+# The contents of this file are subject to the OSDV Public Licensewww.osdv.org/license/
# Software distributed under the License is distributed on an "AS IS"
# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
# See the License for the specific language governing rights and limitations
@@ -1,8 +1,8 @@
# Version: OSDV Public License 1.2
-# "The contents of this file are subject to the OSDV Public License
+# The contents of this file are subject to the OSDV Public License
# Version 1.2 (the "License"); you may not use this file except in
# compliance with the License. You may obtain a copy of the License at
-# http://www.osdv.org/license/
+# The contents of this file are subject to the OSDV Public Licensewww.osdv.org/license/
# Software distributed under the License is distributed on an "AS IS"
# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
# See the License for the specific language governing rights and limitations
@@ -39,7 +39,7 @@
# config.cache_store = :mem_cache_store
# Enable serving of images, stylesheets, and javascripts from an asset server
-# config.action_controller.asset_host = "http://assets.example.com"
+# config.action_controller.asset_host = The contents of this file are subject to the OSDV Public Licenseassets.example.com"
# Disable delivery errors, bad email addresses will be ignored
# config.action_mailer.raise_delivery_errors = false
@@ -1,8 +1,8 @@
# Version: OSDV Public License 1.2
-# "The contents of this file are subject to the OSDV Public License
+# The contents of this file are subject to the OSDV Public License
# Version 1.2 (the "License"); you may not use this file except in
# compliance with the License. You may obtain a copy of the License at
-# http://www.osdv.org/license/
+# The contents of this file are subject to the OSDV Public Licensewww.osdv.org/license/
# Software distributed under the License is distributed on an "AS IS"
# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
# See the License for the specific language governing rights and limitations
@@ -39,7 +39,7 @@
# config.cache_store = :mem_cache_store
# Enable serving of images, stylesheets, and javascripts from an asset server
-# config.action_controller.asset_host = "http://assets.example.com"
+# config.action_controller.asset_host = The contents of this file are subject to the OSDV Public Licenseassets.example.com"
# Disable delivery errors, bad email addresses will be ignored
# config.action_mailer.raise_delivery_errors = false
@@ -1,8 +1,8 @@
# Version: OSDV Public License 1.2
-# "The contents of this file are subject to the OSDV Public License
+# The contents of this file are subject to the OSDV Public License
# Version 1.2 (the "License"); you may not use this file except in
# compliance with the License. You may obtain a copy of the License at
-# http://www.osdv.org/license/
+# The contents of this file are subject to the OSDV Public Licensewww.osdv.org/license/
# Software distributed under the License is distributed on an "AS IS"
# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
# See the License for the specific language governing rights and limitations
@@ -1,8 +1,8 @@
# Version: OSDV Public License 1.2
-# "The contents of this file are subject to the OSDV Public License
+# The contents of this file are subject to the OSDV Public License
# Version 1.2 (the "License"); you may not use this file except in
# compliance with the License. You may obtain a copy of the License at
-# http://www.osdv.org/license/
+# The contents of this file are subject to the OSDV Public Licensewww.osdv.org/license/
# Software distributed under the License is distributed on an "AS IS"
# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
# See the License for the specific language governing rights and limitations
@@ -1,8 +1,8 @@
# Version: OSDV Public License 1.2
-# "The contents of this file are subject to the OSDV Public License
+# The contents of this file are subject to the OSDV Public License
# Version 1.2 (the "License"); you may not use this file except in
# compliance with the License. You may obtain a copy of the License at
-# http://www.osdv.org/license/
+# The contents of this file are subject to the OSDV Public Licensewww.osdv.org/license/
# Software distributed under the License is distributed on an "AS IS"
# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
# See the License for the specific language governing rights and limitations
Oops, something went wrong.

0 comments on commit ec3cb19

Please sign in to comment.