Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[Doc] Improve Readme and installation document

  • Loading branch information...
commit 164cfcbb614ba3be28181ff78e9b2b5af20ee92b 1 parent b64eb9b
@Maks3w authored
Showing with 12 additions and 13 deletions.
  1. +6 −7 README.md
  2. +6 −6 Resources/doc/index.md
View
13 README.md
@@ -16,11 +16,10 @@ Features included:
**Note:** This bundle cannot work as standalone at this moment and requires an User Manager like `FOSUserBundle`
**Versions and compatibilities:**
-- 1.5.x is compatible with Symfony 2.0.x and is recommended for stable projects.
-- 1.6.x is compatible with Symfony 2.1.x and has the same features than 1.5.x
-- 2.0.x is actually compatible with Symfony 2.0.x and have new features. This version is actually under development and is subject to changes.
-
-[![Build Status](https://secure.travis-ci.org/Maks3w/FR3DLdapBundle.png?branch=master)](http://travis-ci.org/Maks3w/FR3DLdapBundle)
+- [![Build Status](https://secure.travis-ci.org/Maks3w/FR3DLdapBundle.png?branch=1.5.x)](http://travis-ci.org/Maks3w/FR3DLdapBundle) `1.5.x` is compatible with Symfony 2.0.x and is recommended for stable projects.
+- [![Build Status](https://secure.travis-ci.org/Maks3w/FR3DLdapBundle.png?branch=1.6.x)](http://travis-ci.org/Maks3w/FR3DLdapBundle) `1.6.x` is compatible with Symfony 2.1.x and has the same features than 1.5.x
+- [![Build Status](https://secure.travis-ci.org/Maks3w/FR3DLdapBundle.png?branch=2.0.x)](http://travis-ci.org/Maks3w/FR3DLdapBundle) `2.0.x` is actually compatible with Symfony 2.0.x and have new features. This version is actually under development and is subject to changes.
+- [![Build Status](https://secure.travis-ci.org/Maks3w/FR3DLdapBundle.png?branch=master)](http://travis-ci.org/Maks3w/FR3DLdapBundle) `Master` is, at this moment, synced with 1.5.x but I encourage you fix your installation to the 1.5.x version branch unless you like the risk.
Documentation
-------------
@@ -28,12 +27,12 @@ Documentation
The bulk of the documentation is stored in the `Resources/doc/index.md`
file in this bundle:
-[Read the Documentation](https://github.com/Maks3w/FR3DLdapBundle/blob/master/Resources/doc/index.md)
+[Read the Documentation](Resources/doc/index.md)
Installation
------------
-All the installation instructions are located in [documentation](https://github.com/Maks3w/FR3DLdapBundle/blob/master/Resources/doc/index.md).
+All the installation instructions are located in [documentation](Resources/doc/index.md).
License
-------
View
12 Resources/doc/index.md
@@ -17,11 +17,11 @@ Install
### 1. Download LdapBundle
-Add this bundle to your ``vendor/`` dir:
+Add this bundle to your `vendor/` dir:
* Using the vendors script.
- Add the following lines in your ``deps`` file::
+ Add the following lines in your `deps` file::
[FR3DLdapBundle]
git=git://github.com/Maks3w/FR3DLdapBundle.git
@@ -69,13 +69,13 @@ public function registerBundles()
security:
firewalls:
main:
- pattern: ^/
- fr3d_ldap: ~
+ pattern: ^/
+ fr3d_ldap: ~
form_login:
always_use_default_target_path: true
default_target_path: /profile
- logout: true
- anonymous: true
+ logout: true
+ anonymous: true
providers:
fr3d_ldapbundle:
Please sign in to comment.
Something went wrong with that request. Please try again.