Merge MC-13741 into 2.3-bugfixes-070219

dvoskoboinikov · web-flow · commit b8fb7d93161b · 2019-02-11T13:53:40.000-06:00
diff --git a/.htaccess b/.htaccess
@@ -28,10 +28,13 @@
     #AddHandler x-mapp-php5 .php
 
 ############################################
-## default index file
-## Specifies option, to use methods arguments in backtrace or not
+## enable usage of methods arguments in backtrace
+
     SetEnv MAGE_DEBUG_SHOW_ARGS 1
 
+############################################
+## default index file
+
     DirectoryIndex index.php
 
 <IfModule mod_php5.c>
diff --git a/.htaccess.sample b/.htaccess.sample
@@ -28,10 +28,13 @@
     #AddHandler x-mapp-php5 .php
 
 ############################################
-## default index file
-## Specifies option, to use methods arguments in backtrace or not
+## enable usage of methods arguments in backtrace
+
     SetEnv MAGE_DEBUG_SHOW_ARGS 1
 
+############################################
+## default index file
+
     DirectoryIndex index.php
 
 ############################################
diff --git a/nginx.conf.sample b/nginx.conf.sample
@@ -9,7 +9,7 @@
 #    listen 80;
 #    server_name mage.dev;
 #    set $MAGE_ROOT /var/www/magento2;
-#    set $MAGE_DEBUG_SHOW_ARGS 1
+#    set $MAGE_DEBUG_SHOW_ARGS 1;
 #    include /vagrant/magento2/nginx.conf.sample;
 # }
 #

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`# listen 80;`
`10`	`10`	`# server_name mage.dev;`
`11`	`11`	`# set $MAGE_ROOT /var/www/magento2;`
`12`		`-# set $MAGE_DEBUG_SHOW_ARGS 1`
	`12`	`+# set $MAGE_DEBUG_SHOW_ARGS 1;`
`13`	`13`	`# include /vagrant/magento2/nginx.conf.sample;`
`14`	`14`	`# }`
`15`	`15`	`#`