Merge branch 'master' into local_svn

git-svn-id: http://svn.textmate.org/trunk/Bundles/Ruby on Rails.tmbundle@9623 dfb7d73b-c2ec-0310-8fea-fb051d288c6d

CHANGELOG

@@ -29,7 +29,7 @@ Added so far:
       * javascript_include_tag - jit
       * stylesheet_link_tag - slt
     * Models
-      * has_many :though (hmt)
+      * has_many :through (hmt)
       * association snippets give better defaults (e.g. bt + hm)
       * validates_format_of (vf,vfif) [Dean Strelau]
       * validates_numericality_of (vn,vnif) [Tom Morris]

Snippets/has_many (hm).plist

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>content</key>

Snippets/has_many :dependent => :destroy.tmSnippet

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>content</key>
+	<string>has_many :${1:object}s${2:, :class_name =&gt; "${1}", :foreign_key =&gt; "${4:reference}_id"}, :dependent =&gt; :destroy$0</string>
+	<key>name</key>
+	<string>has_many :dependent =&gt; :destroy</string>
+	<key>scope</key>
+	<string>source.ruby.rails</string>
+	<key>tabTrigger</key>
+	<string>hmd</string>
+	<key>uuid</key>
+	<string>3E3AF538-171B-4108-AB92-827AD7E24C77</string>
+</dict>
+</plist>

info.plist

@@ -769,6 +769,7 @@
 		<string>2AC3AC1F-743B-4A33-863C-C37885073806</string>
 		<string>BD2E4045-54E6-450E-B31B-5E1865CFFBC9</string>
 		<string>F396B7BD-8255-48B1-904A-06E7D7CC2741</string>
+		<string>3E3AF538-171B-4108-AB92-827AD7E24C77</string>
 		<string>9D58B6C9-BA52-48B3-B639-D5CB894AF810</string>
 		<string>47944705-F605-4ED4-B4C0-9E823EE25138</string>
 		<string>85E9264C-5414-4FA0-AC07-F305A798ED46</string>