Merge branch 'better-wording-of-features' into 'master'

Better wording of features

Change slogan on front page to: "Create, review and deploy code together"

/cc @sabbap @dzaporozhets

See merge request !592

source/better-than-github/index.html

@@ -66,6 +66,24 @@ extra_css:
   </div>
   <div class="list-of-reasons-container">
     <ol>
+      <li>
+        <p>GitLab handles huge repositories well</p>
+        <p>
+          Big repository? No problem. GitLab is build to handle very large repositories. Huge (binary) files? Keep reading for GitLab Annex!
+        </p>
+      </li>
+
+      <li>
+        <p>GitLab Annex</p>
+        <p>With GitLab Annex you can manage large files in your git repositories without the performance issues.</p>
+        <p><a href="https://about.gitlab.com/2015/02/17/gitlab-annex-solves-the-problem-of-versioning-large-binaries-with-git">Read about GitLab Annex</a></p>
+      </li>
+
+      <li>
+        <p>Rebase before merge in the web UI to prevent merge commits</p>
+        <p>Before merging one branch in the other, GitLab can rebase it automatically.</p>
+        <p><a href="https://about.gitlab.com/2014/12/22/gitlab-7-6-and-ci-5-3-released/">See how to prevent merge commits</a></p>
+      </li>
       <li>
         <p>Access your logs easily</p>
         <p>Everything is logging, so you can analyze your instance using various system log files</p>
@@ -123,24 +141,6 @@ extra_css:
           on their own servers.
         </p>
       </li>
-
-      <li>
-        <p>GitLab handles huge repositories well</p>
-        <p>
-          Big repository? No problem. GitLab is build to handle very large repositories. Huge (binary) files? Keep reading for GitLab Annex!
-        </p>
-      </li>
-
-      <li>
-        <p>Rebase before merge in the web UI to prevent merge commits</p>
-        <p>Before merging one branch in the other, GitLab can rebase it automatically.</p>
-        <p><a href="https://about.gitlab.com/2014/12/22/gitlab-7-6-and-ci-5-3-released/">See how to prevent merge commits</a></p>
-      </li>
-      <li>
-        <p>GitLab Annex</p>
-        <p>With GitLab Annex you can manage large files in your git repositories without the performance issues.</p>
-        <p><a href="https://about.gitlab.com/2015/02/17/gitlab-annex-solves-the-problem-of-versioning-large-binaries-with-git">Read about GitLab Annex</a></p>
-      </li>
     </ol>
   </div>

source/features/index.html

@@ -28,7 +28,7 @@ extra_js:
           <div class="title">GitLab <br> <b>Community edition</b></div>
           <div class="header-text">
             <uL>
-              <li><b>Feature rich</b>: Git repository management, code reviews, issue tracking, activity feeds, wikis and continuous integration</li>
+              <li><b>Feature rich</b>: Git repository management, code reviews, issue tracking, activity feeds and wikis. It comes with <a href="/gitlab-ci/">GitLab CI</a> for continuous integration abd delivery.</li>
               <li><b>Open Source</b>: MIT licensed, community driven, 700+ contributors, inspect and modify the source, easy to integrate into your infrastructure</li>
               <li><b>Scalable</b>: support 25,000 users on one server or a highly available active/active cluster</li>
             </ul>

source/gitlab-com/index.html

@@ -13,7 +13,7 @@ extra_js:
     <div class="color-bg">
       <div>
         <h1>GitLab.com</h1>
-        <h3>GitLab.com will host your software projects for free on our instance</h3>
+        <h3>GitLab.com hosts your (private) software projects for free</h3>
         <div class="header">
          <a href="https://gitlab.com/users/sign_in" id="join-community">Sign Up</button></a>
         </div>     
@@ -21,7 +21,7 @@ extra_js:
           <ul>
             <li>
               <i class="fa fa-chevron-down"></i>
-              <p>Free private repositories, issue-tracking and wikis.</p>
+              <p>Free public and private repositories, issue-tracking and wikis.</p>
             </li>
             <li>
               <i class="fa fa-chevron-down"></i>

source/index.html

@@ -9,7 +9,7 @@ extra_css:
   <div class="container">
     <div class="row">
       <div class="col-sm-12 text-center">
-        <h1 class="landing-header">Version Control for your Server</h1>
+        <h1 class="landing-header">Create, review and deploy code</h1>
         <div class="gitlab-comparison">
           <a href="/better-than-github/" class="comparison">Better than GitHub</a>
         </div>
@@ -81,9 +81,9 @@ extra_css:
             <h3>Feature-packed</h3>
           </div>
           <div class="what-content">
-            <p><b>Future-Proof</b>: Browse your code, review its history and work together on its future. Mention your colleagues anywhere and they get updated automatically.</p>
-            <p><b>The Right Tools</b>: GitLab is an advanced Git-repository manager. It introduces a powerful code review and issue-tracking system, complete with GitLab CI: a powerful continuous integration tool.</p>
-            <p><b>Integrated and Ready</b>: GitLab has integrations for tons of tools such as Hipchat, Slack, LDAP, JIRA and more.</p>
+            <p><b>Batteries included</b>: GitLab includes git repository management, code reviews, an issue tracking and wiki's and <a href="/features/">much more</a>. GitLab comes with GitLab CI, a easy to use continuous integration and deployment tool.</p>
+            <p><b>Do it together</b>: Discuss issues and plan milestones. Do code reviews and make line comments. Mention your colleagues anywhere. View activity streams of projects or people.</p>
+            <p><b>Plays well with others</b>: GitLab has integrations for tons of tools such as Slack, Hipchat, LDAP, JIRA, Jenkins, many types of hooks and a complete API.</p>
           </div>
         </div>
       </div>
@@ -91,12 +91,12 @@ extra_css:
         <div class="what-item">
           <div class="what-image">
             <i class="fa fa-gears"></i>
-            <h3>Scalable and easily-managed</h3>
+            <h3>Self-hosted, scalable and updated monthly</h3>
           </div>
           <div class="what-content">
-            <p><b>Scales Effortlessly</b>: Running smoothly on tiny servers and scaling easily to large clusters of many machines, a single server handles thousands of users and repositories.</p>
-            <p><b>Updated Monthly</b>: Every month a big upgrade is released and it'll only take you 2 minutes to deploy it.</p>
-            <p><b>On Your Servers</b>: Run it on your own infrastructure without a need for Internet access. Own everything.</p>
+            <p><b>On Your Servers</b>: Run it on your own infrastructure. Own everything. Or use our free SaaS <a href="/gitlab-com/">GitLab.com</a></p>
+            <p><b>Scales Effortlessly</b>: It runs smoothly a tiny server but can and scale to multiple active servers. A single server handles more than 25,000 users.</p>
+            <p><b>Updated Monthly</b>: Every month on the 22nd a big upgrade is released and it'll only take you only 2 minutes to update.</p>
           </div>
         </div>
       </div>
@@ -104,12 +104,12 @@ extra_css:
         <div class="what-item">
           <div class="what-image">
             <i class="fa fa-globe"></i>
-            <h3>Community-loved</h3>
+            <h3>Community-loved, enterprise ready</h3>
           </div>
           <div class="what-content">
-            <p><b>GitLab Community Edition</b> is completely free and open source. Built by a community of hundreds and used by over a hundred thousand organizations world-wide. From small workshops to large, security-concerned enterprises.</p>
-            <p><b>GitLab Enterprise</b> Edition comes with our subscriptions and offers deeper LDAP / AD integration, Jira and Jenkins integration and much more.</p>
-            <p>Standard subscribers get 24/7 emergency support and any help they need to get and stay rolling.</p>
+            <p><b>GitLab Community Edition</b> is completely free to <a href="/downloads/">download</a> and it is <a href="https://gitlab.com/gitlab-org/gitlab-ce/tree/master">open source</a>. It is built by a community of more than 700 people.</p>
+            <p><b>GitLab Enterprise Edition</b> comes with a subscription and offers deeper LDAP / AD integration, Jira and Jenkins integration and <a href="/features/#compare">much more</a>.</p>
+            <p><b>Subscriptions</b> allow you to use the Enterprise Edition and includes 24/7 emergency support, more information can be found on our <a href="/pricing/">pricing page</a>.</p>
           </div>
         </div>
       </div>