0
@@ -10,23 +10,22 @@ config/database.example.yml & config/deploy.example.rb
0
 Required gems: tzinfo - run: "sudo gem install tzinfo" on your computer and your host's.
0
 Requires Edge Rails for the tztime plugin: http://weblog.jamisbuck.org/2007/2/2/introducing-tztime
0
 
0
-If you're not importing anything (starting a new site), run this command: "rake db:schema:load".
0
-
0
-NOTE: If you're setting things up on your host, add "RAILS_ENV=production" to the end of rake tasks.
0
+Run this command: "rake db:schema:load" if you're not importing anything (starting a new site).
0
+Note: If you're setting things up on your host, add "RAILS_ENV=production" to the end of rake tasks.
0
 
0
 If you're importing from an existing PunBB site (only tested with version 1.2.15), 
0
-fill in the "import" section of config/database.yml and run the command: "rake import:database"
0
+fill in the "import" section of config/database.yml and run the command: "rake import:database".
0
 Other available rake tasks include: import:avatars, import:headers, and import:files.
0
 
0
 # Upgrading #
0
 
0
-http://almosteffortless.com | http://eldorado.googlecode.com/svn
0
-Use "rake db:migrate" to upgrade your database from an older version
0
-Use "cap deploy_with_migrations" to upgrade your database and app at the same time using Capistrano 
0
+Visit http://almosteffortless.com and http://eldorado.googlecode.com/svn for updates and news.
0
+Use "rake db:migrate" to upgrade your database from an older version after new releases.
0
+Use "cap deploy:migrations" to upgrade your database and app at the same time using Capistrano.
0
 
0
 # License #
0
 
0
-Released under the MIT License, Copyright 2006 Trevor Turk (see LICENSE file for details)
0
+Released under the MIT License, Copyright 2006 Trevor Turk (see LICENSE file for details).
0
 
0
 # Thanks #
0
 

0
@@ -29,7 +29,8 @@ module BBCodeizer
0
       :comedycentral         => [ /\[comedycentral\](.+?)comedycentral.com\/motherload\/index.jhtml\?ml_video=(.+?)\[\/comedycentral\]/i, '<embed FlashVars="config=http://www.comedycentral.com/motherload/xml/data_synd.jhtml?vid=\2%26myspace=false" src="http://www.comedycentral.com/motherload/syndicated_player/index.jhtml" quality="high" bgcolor="#006699" width="340" height="325" name="comedy_player" align="middle" allowScriptAccess="always" allownetworking="external" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer"></embed>' ],
0
       :revver                => [ /\[revver\](.+?)revver.com\/watch\/(.+?)\[\/revver\]/i, '<embed type="application/x-shockwave-flash" src="http://flash.revver.com/player/1.0/player.swf" pluginspage="http://www.macromedia.com/go/getflashplayer" scale="noScale" salign="TL" bgcolor="#000000" flashvars="mediaId=\2&affiliateId=0&allowFullScreen=true" allowfullscreen="true" height="392" width="480"></embed>' ],
0
       :myspacetv             => [ /\[myspacetv\](.+?)myspace(.+?)videoid=(.+?)\[\/myspacetv\]/i, '<embed src="http://lads.myspace.com/videos/vplayer.swf" flashvars="m=\3&v=2&type=video" type="application/x-shockwave-flash" width="430" height="346"></embed>' ],
0
-      :collegehumor          => [ /\[collegehumor\](.+?)collegehumor.com\/video:(.+?)\[\/collegehumor\]/i, '<embed src="http://www.collegehumor.com/moogaloop/moogaloop.swf?clip_id=\2" quality="best" width="400" height="300" type="application/x-shockwave-flash"></embed>' ]
0
+      :collegehumor          => [ /\[collegehumor\](.+?)collegehumor.com\/video:(.+?)\[\/collegehumor\]/i, '<embed src="http://www.collegehumor.com/moogaloop/moogaloop.swf?clip_id=\2" quality="best" width="400" height="300" type="application/x-shockwave-flash"></embed>' ],
0
+      :metacafe              => [ /\[metacafe\](.+?)metacafe.com\/watch\/(.+?)\/(.+?)\/\[\/metacafe\]/i, '<embed src="http://www.metacafe.com/fplayer/\2/\3.swf" width="400" height="345" wmode="transparent" pluginspage="http://www.macromedia.com/go/getflashplayer" type="application/x-shockwave-flash"></embed>' ]
0
     }
0
     # removed quotes from cites, added youtube, googlevid, spoiler, mp3, funnyordie, superdeluxe, comedycentral
0
 
0
@@ -38,7 +39,8 @@ module BBCodeizer
0
     TagList = [ :bold, :italic, :underline, :email_with_name, :email_sans_name, 
0
                 :url_with_title, :url_sans_title, :image, :size, :color,
0
                 :code, :quote, :youtube, :googlevid, :flash, :spoiler, :nsfw, :mp3, 
0
-                :superdeluxe, :comedycentral, :revver, :myspacetv, :collegehumor ]
0
+                :superdeluxe, :comedycentral, :revver, :myspacetv, :collegehumor,
0
+                :metacafe ]
0
 
0
     # Parses all bbcode in +text+ and returns a new HTML-formatted string.
0
     def bbcodeize(text)