fixing merge issue for blade comments pull

laravel/blade.php

@@ -186,9 +186,9 @@ protected static function extract($value, $expression)
 	 */
 	protected static function compile_comments($value)
 	{
-		$value = preg_replace('/\{\{--(.+?)(--\}\})?\n/s', "<?php // $1 ?>", $value);
-
-		return preg_replace('/\{\{--((.|\s)*?)--\}\}/s', "<?php /* $1 */ ?>\n", $value);
+		$value = preg_replace('/\{\{--(.*?)--\}\}/', "<?php // $1 ?>", $value);
+		
+		return preg_replace('/\{\{--(.*?)--\}\}/s', "<?php /* ?>$1<?php */ ?>", $value);
 	}
 
 	/**

laravel/documentation/views/templating.md

@@ -132,6 +132,12 @@ #### Blade comments:
 		{{-- This is a comment --}}
 		...
 	@endif
+	
+	{{--
+		This is
+		a multi-line
+		comment.
+	--}}
 
 > **Note:** Blade comments, unlike HTML comments, are not visible in the HTML source.