Skip to content

Commit

Permalink
Changed license to BSD 3-Clause.
Browse files Browse the repository at this point in the history
  • Loading branch information
feuzeu committed May 6, 2017
1 parent 0bb7f2f commit b4c9273
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 3 deletions.
8 changes: 7 additions & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
Copyright (c) 2016, lagdo
BSD 3-Clause License

Copyright (c) 2017, jaxon-php
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand All @@ -11,6 +13,10 @@ modification, are permitted provided that the following conditions are met:
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

* Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,12 @@ Import the service definition and configuration file of the Jaxon bundle in the
```yaml
imports:
...
- { resource: jaxon.yml }
- { resource: "@JaxonAjaxBundle/Resources/config/services.yml" }
```

Create and edit the `app/config/jaxon.yml` file to suit the needs of your application.
A sample config file is available online in [the examples repo](https://github.com/jaxon-php/jaxon-examples/blob/master/frameworks/symfony/app/config/jaxon.yml).
A sample config file is available online at [the examples repo](https://github.com/jaxon-php/jaxon-examples/blob/master/frameworks/symfony/app/config/jaxon.yml).

Configuration
------------
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
{"name": "Thierry Feuzeu"}
],
"homepage": "https://github.com/jaxon-php/jaxon-symfony",
"license": "BSD-2-Clause",
"license": "BSD-3-Clause",
"keywords": ["Jaxon", "Xajax", "Ajax", "PHP", "Framework", "Symfony"],
"support": {
"issues": "https://github.com/jaxon-php/jaxon-symfony/issues",
Expand Down

0 comments on commit b4c9273

Please sign in to comment.