Merge branch '2.2'

ezecosystem · Aug 9, 2018 · a2fb484 · a2fb484
2 parents 677ea54 + d3697cb
commit a2fb484
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/doc/apache2/Readme.md b/doc/apache2/Readme.md
@@ -76,7 +76,7 @@ Example config for Apache 2.4 in prefork mode:
         RewriteRule ^/assets/ - [L]
 
         # Additional Assetic rules for environments different from dev,
-        # remember to run php app/console assetic:dump --env=prod
+        # remember to run php bin/console assetic:dump --env=prod
         RewriteCond %{ENV:SYMFONY_ENV} !^(dev)
         RewriteRule ^/(css|js|fonts?)/.*\.(css|js|otf|eot|ttf|svg|woff) - [L]
 

diff --git a/doc/apache2/vhost.2.2.template b/doc/apache2/vhost.2.2.template
@@ -80,7 +80,7 @@
         RewriteRule ^/assets/ - [L]
 
         # Additional Assetic rules for environments different from dev,
-        # remember to run php app/console assetic:dump --env=prod
+        # remember to run php bin/console assetic:dump --env=prod
         RewriteCond %{ENV:SYMFONY_ENV} !^(dev)
         RewriteRule ^/(css|js|fonts?)/.*\.(css|js|otf|eot|ttf|svg|woff) - [L]
 

diff --git a/doc/apache2/vhost.template b/doc/apache2/vhost.template
@@ -91,7 +91,7 @@
         RewriteRule ^/assets/ - [L]
 
         # Additional Assetic rules for environments different from dev,
-        # remember to run php app/console assetic:dump --env=prod
+        # remember to run php bin/console assetic:dump --env=prod
         RewriteCond %{ENV:SYMFONY_ENV} !^(dev)
         RewriteRule ^/(css|js|fonts?)/.*\.(css|js|otf|eot|ttf|svg|woff) - [L]
 

diff --git a/doc/nginx/Readme.md b/doc/nginx/Readme.md
@@ -42,7 +42,7 @@ Example config:
         root /var/www/ezinstall/web;
 
         # Additional Assetic rules for environments different from dev,
-        # remember to run php app/console assetic:dump --env=prod
+        # remember to run php bin/console assetic:dump --env=prod
         # and make sure to comment these out in "dev" environment.
         include ez_params.d/ez_prod_rewrite_params;
 

diff --git a/doc/nginx/ez_params.d/ez_prod_rewrite_params b/doc/nginx/ez_params.d/ez_prod_rewrite_params
@@ -1,6 +1,6 @@
 
-# Additional Assetic rules for eZ Publish 5.1 / 2013.4 and higher.
-## Don't forget to run php app/console assetic:dump --env=prod
+# Additional Assetic rules
+## Don't forget to run php bin/console assetic:dump --env=prod
 ## and make sure to comment these out in DEV environment.
 rewrite "^/css/(.*)\.css" "/css/$1.css" break;
 rewrite "^/js/(.*)\.js" "/js/$1.js" break;

diff --git a/doc/nginx/vhost.template b/doc/nginx/vhost.template
@@ -6,8 +6,8 @@ server {
 
     root %BASEDIR%/web;
 
-    # Additional Assetic rules for eZ Publish 5.1 / 2013.4 and higher.
-    ## Don't forget to run php app/console assetic:dump --env=prod
+    # Additional Assetic rules
+    ## Don't forget to run php bin/console assetic:dump --env=prod
     ## and make sure to comment these out in DEV environment.
     #if[SYMFONY_ENV!=dev] include ez_params.d/ez_prod_rewrite_params;