|  | @@ -61,6 +61,8 @@ class Has_Many_And_Belongs_To extends Relationship {
 | 
	
		
			
				|  |  |  	 *
 | 
	
		
			
				|  |  |  	 * By default, the name is the models sorted and joined with underscores.
 | 
	
		
			
				|  |  |  	 *
 | 
	
		
			
				|  |  | +	 * @param  Model   $model
 | 
	
		
			
				|  |  | +	 * @param  string  $associated
 | 
	
		
			
				|  |  |  	 * @return string
 | 
	
		
			
				|  |  |  	 */
 | 
	
		
			
				|  |  |  	protected function joining($model, $associated)
 | 
	
	
		
			
				|  | @@ -86,7 +88,7 @@ class Has_Many_And_Belongs_To extends Relationship {
 | 
	
		
			
				|  |  |  	 * Insert a new record into the joining table of the association.
 | 
	
		
			
				|  |  |  	 *
 | 
	
		
			
				|  |  |  	 * @param  int    $id
 | 
	
		
			
				|  |  | -	 * @param  array  $joining
 | 
	
		
			
				|  |  | +	 * @param  array  $attributes
 | 
	
		
			
				|  |  |  	 * @return bool
 | 
	
		
			
				|  |  |  	 */
 | 
	
		
			
				|  |  |  	public function attach($id, $attributes = array())
 | 
	
	
		
			
				|  | @@ -317,8 +319,9 @@ class Has_Many_And_Belongs_To extends Relationship {
 | 
	
		
			
				|  |  |  	/**
 | 
	
		
			
				|  |  |  	 * Match eagerly loaded child models to their parent models.
 | 
	
		
			
				|  |  |  	 *
 | 
	
		
			
				|  |  | -	 * @param  array  $parents
 | 
	
		
			
				|  |  | -	 * @param  array  $children
 | 
	
		
			
				|  |  | +	 * @param  string  $relationship
 | 
	
		
			
				|  |  | +	 * @param  array   $parents
 | 
	
		
			
				|  |  | +	 * @param  array   $children
 | 
	
		
			
				|  |  |  	 * @return void
 | 
	
		
			
				|  |  |  	 */
 | 
	
		
			
				|  |  |  	public function match($relationship, &$parents, $children)
 | 
	
	
		
			
				|  | @@ -383,7 +386,7 @@ class Has_Many_And_Belongs_To extends Relationship {
 | 
	
		
			
				|  |  |  	/**
 | 
	
		
			
				|  |  |  	 * Set the columns on the joining table that should be fetched.
 | 
	
		
			
				|  |  |  	 *
 | 
	
		
			
				|  |  | -	 * @param  array         $column
 | 
	
		
			
				|  |  | +	 * @param  array         $columns
 | 
	
		
			
				|  |  |  	 * @return Relationship
 | 
	
		
			
				|  |  |  	 */
 | 
	
		
			
				|  |  |  	public function with($columns)
 |