Prepare for v1.0 release

stfalcon · Mar 29, 2016 · 405a7f6 · 405a7f6
1 parent 04d3242
commit 405a7f6
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 23 deletions.
diff --git a/README.md b/README.md
@@ -4,20 +4,22 @@ This bundle makes it very easy to add the TinyMCE WYSIWYG editor to your Symfony
 
 ## Installation
 
-### Installation by Composer
+### Choose the appropriate version
 
-> NOTE! This version of TinyMCE bundle contains TinyMCE version 4 and works only with Symfony version >= 2.1. To upgrade your configuration, please read UPGRADE.md
+| Bundle Version (X.Y) | PHP     | Symfony            | Comment                                  |
+|:--------------------:|:-------:|:------------------:|------------------------------------------|
+| 2.0                  | >= 5.4  | >= 3.0             | Actual version                           |
+| 1.0                  | >= 5.4  | >= 2.1 and <= 2.8  |                                          |
 
-Add TinyMCE bundle as a dependency to the composer.json of your application
+> NOTE! To upgrade your configuration, please read UPGRADE.md
 
-    "require": {
-        ...
-        "stfalcon/tinymce-bundle": "dev-master"
-        ...
-    },
+### Add TinyMCE bundle as a dependency of your application via composer
 
+```
+$ php composer.phar require stfalcon/tinymce-bundle='X.Y'
+```
 
-## Add StfalconTinymceBundle to your application kernel.
+### Add StfalconTinymceBundle to your application kernel.
 
 ```php
 // app/AppKernel.php
@@ -32,10 +34,10 @@ Add TinyMCE bundle as a dependency to the composer.json of your application
     }
 ```
 
-The bundle needs to copy the resources necessary to the web folder. You can use the command below:
+### The bundle needs to copy the resources necessary to the web folder. You can use the command below:
 
-```bash
-    php app/console assets:install web/
+```
+$ php app/console assets:install web/
 ```
 
 ## Include in template
@@ -50,10 +52,10 @@ You can also override the default configuration by passing an option like this:
 
 ```twig
     {{ tinymce_init({'use_callback_tinymce_init': true, 'theme': {'simple': {'menubar': false}}}) }}
-```   
+```
 
    or
-   
+
 ```
     {{ tinymce_init({
         theme: {'simple':{'language': app.request.locale, 'height': 500 }},

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "stfalcon/tinymce-bundle",
     "description": "This Bundle integrates TinyMCE WYSIWYG editor into a Symfony2 project.",
-    "keywords": ["wysiwyg", "tinymce", "editor"],
+    "keywords": ["wysiwyg", "tinymce", "editor", "symfony2", "bundle"],
     "type": "symfony-bundle",
     "license": "MIT",
     "authors": [
@@ -18,21 +18,20 @@
         {
             "name":     "Symfony Community",
             "homepage": "https://github.com/stfalcon/TinymceBundle/contributors"
-        }        
+        }
     ],
+    "support": {
+        "email": "[email protected]",
+        "issues": "https://github.com/stfalcon/TinymceBundle/issues"
+    },
     "require": {
-        "php":             ">=5.3.0",
+        "php":             ">=5.4.0",
         "symfony/symfony": ">=2.1"
     },
     "autoload": {
         "psr-0": {
             "Stfalcon\\Bundle\\TinymceBundle": ""
         }
     },
-    "target-dir" : "Stfalcon/Bundle/TinymceBundle",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "0.3.x-dev"
-        }
-    }
+    "target-dir" : "Stfalcon/Bundle/TinymceBundle"
 }