Merge branch 'ldap_group_explanation' of /home/git/repositories/gitlab/gitlab-ee

app/views/groups/edit.html.haml

@@ -75,12 +75,20 @@
                   LDAP Group cn
                 .controls
                   = f.hidden_field :ldap_cn, placeholder: "Ex. QA group", class: "xxlarge ajax-ldap-groups-select"
+                  .help-block
+                    Synchronize #{@group.name}'s members with this LDAP group.
+                    %br
+                    If you select an LDAP group you do not belong to you will lose ownership of #{@group.name}.
 
               .control-group
                 = f.label :ldap_access do
                   LDAP Access
                 .controls
                   = f.select :ldap_access, options_for_select(UsersGroup.group_access_roles, @group.ldap_access)
+                  .help-block
+                    Default, minimum permission level for LDAP group members of #{@group.name}.
+                    %br
+                    You can manage permission levels for individual group members in the Members tab.
 
               .form-actions
                 = f.submit 'Save group', class: "btn btn-save"