Merge branch '29881-default-project-view-highlighted-tab-when-changing-settings' into 'master'

app/views/profiles/preferences/show.html.haml

@@ -37,9 +37,9 @@
       = f.select :dashboard, dashboard_choices, {}, class: 'form-control'
     .form-group
       = f.label :project_view, class: 'label-light' do
-        Project view
+        Project home page content
       = f.select :project_view, project_view_choices, {}, class: 'form-control'
       .help-block
-        Choose what content you want to see on a project's home page.
+        Choose what content you want to see on a project’s home page
     .form-group
       = f.submit 'Save changes', class: 'btn btn-save'

doc/user/profile/preferences.md

@@ -50,15 +50,15 @@ You have 6 options here that you can use for your default dashboard view:
 - Your groups
 - Your [Todos]
 
-### Default project view
+### Project home page content
 
-The default project view settings allows you to choose what content you want to
-see on a project's landing page.
+The project home page content setting allows you to choose what content you want to
+see on a project’s home page.
 
 You can choose between 2 options:
 
 - Show the files and the readme (default)
-- Show the project's activity
+- Show the project’s activity
 
 [rouge]: http://rouge.jneen.net/ "Rouge website"
 [todos]: ../../workflow/todos.md