Merge branch 'develop' of github.com:sulu/SuluCommunityBundle

sulu · Sep 4, 2017 · 1230d96 · 1230d96
2 parents 8582250 + 42aa5ca
commit 1230d96
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/Resources/doc/2-setup-webspace.md b/Resources/doc/2-setup-webspace.md
@@ -24,7 +24,7 @@ sulu_community:
         <webspace_key>:
             from:
                 name: 'Website'
-                email: %from_email%
+                email: %sulu_admin.email%
 ```
 
 ## Enable Security
@@ -57,11 +57,11 @@ security:
             pattern: ^/
             anonymous: ~
             form_login:
-                login_path: sulu_community.login
-                check_path: sulu_community.login
+                login_path: /login
+                check_path: /login
             logout:
-                path: sulu_community.logout
-                target: sulu_community.login
+                path: /logout
+                target: /
             remember_me:
                 secret:   '%secret%'
                 lifetime: 604800 # 1 week in seconds

diff --git a/Resources/doc/5-registration.md b/Resources/doc/5-registration.md
@@ -154,7 +154,7 @@ class RegistrationContactType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder->add('firstName', TextType::class);
-        $builder->add('lastLame', TextType::class);
+        $builder->add('lastName', TextType::class);
     }
 
     /**

diff --git a/Resources/doc/9-profile.md b/Resources/doc/9-profile.md
@@ -140,7 +140,7 @@ class ProfileContactType extends AbstractType
         );
 
         $builder->add('firstName', TextType::class);
-        $builder->add('lastLame', TextType::class);
+        $builder->add('lastName', TextType::class);
         $builder->add('mainEmail', EmailType::class);
         $builder->add('avatar', FileType::class, ['mapped' => false, 'required' => false]);