-/app/SymfonyRequirements.php
-/app/bootstrap.php.cache
-/app/check.php
+# Cache and logs (Symfony2)
/app/cache/*
-/app/config/parameters.yml
/app/logs/*
!app/cache/.gitkeep
!app/logs/.gitkeep
-.idea
-.DS_Store
-.vagrant
+
+# Cache and logs (Symfony3)
+/var/cache/*
+/var/logs/*
+!var/cache/.gitkeep
+!var/logs/.gitkeep
+
+# Parameters
+/app/config/parameters.yml
+/app/config/parameters.ini
+
+# Managed by Composer
+/app/bootstrap.php.cache
+/var/bootstrap.php.cache
+/bin/*
+!bin/console
+!bin/symfony_requirements
/vendor/
-app/db/poche.sqlite
-/bin/
-!bin/install
-!bin/test
-!bin/symfony
+# Assets and user uploads
+/web/bundles/
+/web/uploads/
+
+# PHPUnit
+/app/phpunit.xml
+/phpunit.xml
-/data/
+# Composer PHAR
+/composer.phar
-/web/.htaccess
\ No newline at end of file
+# Data for wallabag
+data/assets/*
+data/db/poche*.sqlite