Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge pull request #344 from marijn/patch-1

Semantic changes to the documentation
  • Loading branch information...
commit 0e2180e8c7f97c13e7747221b126f06ee76496e7 2 parents 6821a51 + 1eea035
Johannes authored September 06, 2011

Showing 1 changed file with 15 additions and 21 deletions. Show diff stats Hide diff stats

  1. 36  Resources/doc/index.md
36  Resources/doc/index.md
Source Rendered
@@ -109,11 +109,9 @@ and place your `User` class in it.
109 109
 
110 110
 **Warning:**
111 111
 
112  
-```
113  
-If you override the __construct() method in your User class, be sure
114  
-to call parent::__construct(), as the base User class depends on
115  
-this to initialize some fields.
116  
-```
  112
+> If you override the __construct() method in your User class, be sure
  113
+> to call parent::__construct(), as the base User class depends on
  114
+> this to initialize some fields.
117 115
 
118 116
 **a) Doctrine ORM User class**
119 117
 
@@ -151,7 +149,9 @@ class User extends BaseUser
151 149
 }
152 150
 ```
153 151
 
154  
-**Note**: `User` is a reserved keyword in SQL so you cannot use it as table name.
  152
+**Note:**
  153
+
  154
+> `User` is a reserved keyword in SQL so you cannot use it as table name.
155 155
 
156 156
 **b) MongoDB User class**
157 157
 
@@ -268,12 +268,10 @@ provider for the firewall to use as part of the authentication process.
268 268
 
269 269
 **Note:**
270 270
 
271  
-```
272  
-Although we have used the form login mechanism in this example, the FOSUserBundle
273  
-user provider is compatible with many other authentication methods as well. Please
274  
-read the Symfony2 Security component documention for more information on the
275  
-other types of authentication methods.
276  
-```
  271
+> Although we have used the form login mechanism in this example, the FOSUserBundle
  272
+> user provider is compatible with many other authentication methods as well. Please
  273
+> read the Symfony2 Security component documention for more information on the
  274
+> other types of authentication methods.
277 275
 
278 276
 The `access_control` section is where you specify the credentials necessary for
279 277
 users trying to access specific parts of your application. The bundle requires
@@ -290,11 +288,9 @@ security component [documentation](http://symfony.com/doc/current/book/security.
290 288
 
291 289
 **Note:**
292 290
 
293  
-```
294  
-Pay close attention to the name, `main`, that we have given to the firewall which
295  
-the FOSUserBundle is configured in. You will use this in the next step when you
296  
-configure the FOSUserBundle.
297  
-```
  291
+> Pay close attention to the name, `main`, that we have given to the firewall which
  292
+> the FOSUserBundle is configured in. You will use this in the next step when you
  293
+> configure the FOSUserBundle.
298 294
 
299 295
 ### Step 6: Configure the FOSUserBundle
300 296
 
@@ -378,10 +374,8 @@ Or if you prefer XML:
378 374
 
379 375
 **Note:**
380 376
 
381  
-```
382  
-In order to use the built-in email functionality (confirmation of the account,
383  
-resetting of the password), you must activate and configure the SwiftmailerBundle.
384  
-```
  377
+> In order to use the built-in email functionality (confirmation of the account,
  378
+> resetting of the password), you must activate and configure the SwiftmailerBundle.
385 379
 
386 380
 ### Step 8: Update your database schema
387 381
 

0 notes on commit 0e2180e

Please sign in to comment.
Something went wrong with that request. Please try again.