Simplify the page "Getting the Code" on WebKit.org

https://bugs.webkit.org/show_bug.cgi?id=113980

Patch by Benjamin Poulain <bpoulain@apple.com> on 2013-04-07
Reviewed by Sam Weinig.

* building/checkout.html:
Instead of interleaving instructions for Mac and Windows, just
copy the things that make sense and have two clear sections.

Also mention Linux, it is the exact same instructions as Mac OS X.

Make svn checkout the alternative to a download of the tarball. It is
almost impossible to do a svn checkout on slow networks nowadays.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@147890 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Websites/webkit.org/ChangeLog b/Websites/webkit.org/ChangeLog
index 65c7c41..f5f7bcb 100644 (file)
--- a/Websites/webkit.org/ChangeLog
+++ b/Websites/webkit.org/ChangeLog
@@ -1,3 +1,19 @@
+2013-04-07  Benjamin Poulain  <bpoulain@apple.com>
+
+        Simplify the page "Getting the Code" on WebKit.org
+        https://bugs.webkit.org/show_bug.cgi?id=113980
+
+        Reviewed by Sam Weinig.
+
+        * building/checkout.html:
+        Instead of interleaving instructions for Mac and Windows, just
+        copy the things that make sense and have two clear sections.
+
+        Also mention Linux, it is the exact same instructions as Mac OS X.
+
+        Make svn checkout the alternative to a download of the tarball. It is
+        almost impossible to do a svn checkout on slow networks nowadays.
+
 2013-04-04  Benjamin Poulain  <bpoulain@apple.com>
 
         Update WebKit.org's contact page

diff --git a/Websites/webkit.org/building/checkout.html b/Websites/webkit.org/building/checkout.html
index fb6c515..ce39918 100644 (file)
--- a/Websites/webkit.org/building/checkout.html
+++ b/Websites/webkit.org/building/checkout.html
@@ -12,48 +12,64 @@ include("../header.inc");
 <p>To work with the WebKit source tree, you will need a Subversion or a Git client installed.
 See <a href="tools.html">Installing Developer Tools</a> for information on how
 to install Subversion.</p>
-<div class="mac-instructions">
-<h4>Mac OS X</h4>
+<div class="unix-instructions">
+<h4>Mac OS X or Linux</h4>
 <ol>
-<li><p>Open Terminal</p>
-<p>Terminal resides in /Applications/Utilities. The Finder Go menu provides a quick way to navigate there.</p>
+    <li>
+        <p>Open a shell.</p>
+        <p>On OS X, you can use the <i>Terminal</i> App, which resides in /Applications/Utilities.</p>
+    </li>
+    <li>
+        <p>You can download a snapshot of the WebKit source tree from
+            <a href="http://nightly.webkit.org/files/WebKit-SVN-source.tar.bz2">http://nightly.webkit.org/files/WebKit-SVN-source.tar.bz2</a>.
+            It is updated every six hours. Note the archived checkout uses an HTTP connection. We recommend running the following command to use HTTPS instead:</p>
+        <p class="code">svn switch --relocate http://svn.webkit.org/repository/webkit/trunk https://svn.webkit.org/repository/webkit/trunk</p>
+        <p>Type these commands to check out the WebKit source tree:</p>
+        <p class="code">tar jxvf WebKit-SVN-source.tar.bz2<br>cd webkit</p>
+        <div>
+            <p>Alternatively, type this command to check out the WebKit source tree:</p>
+            <p class="code">svn checkout https://svn.webkit.org/repository/webkit/trunk WebKit</p>
+        </div>
+    </li>
+    <li>
+        <p>Run the <code>./Tools/Scripts/update-webkit</code> <a href="/coding/scripts.html">script</a> to update your source tree.</p>
+    </li>
 </ol>
 </div>
 
 <div class="windows-instructions">
 <h4>Windows</h4>
 <ol>
-<li><p>Open a Cygwin Shell</p>
-<p>Double-click the Cygwin icon on your Desktop to launch a new shell.
+    <li>
+        <p>Open a Cygwin Shell</p>
+        <p>Double-click the Cygwin icon on your Desktop to launch a new shell.</p>
+    </li>
+    <li>
+        <p>You can download a snapshot of the WebKit source tree from
+            <a href="http://nightly.webkit.org/files/WebKit-SVN-source.tar.bz2">http://nightly.webkit.org/files/WebKit-SVN-source.tar.bz2</a>.
+            It is updated every six hours. Note the archived checkout uses an HTTP connection. We recommend running the following command to use HTTPS instead:</p>
+        <p class="code">svn switch --relocate http://svn.webkit.org/repository/webkit/trunk https://svn.webkit.org/repository/webkit/trunk</p>
+        <p>Type these commands to check out the WebKit source tree:</p>
+        <p class="code">tar jxvf WebKit-SVN-source.tar.bz2<br>cd webkit</p>
+        <div>
+            <p>Alternatively, type this command to check out the WebKit source tree:</p>
+            <p class="code">svn checkout https://svn.webkit.org/repository/webkit/trunk WebKit</p>
+        </div>
+    </li>
+    <li>
+        <p>Install the WebKit Support Libraries</p>
+        <p>Download the <a href="http://developer.apple.com/opensource/internet/webkit_sptlib_agree.html">WebKit Support Libraries</a> to the root of your source tree (<code>C:\cygwin\home\&lt;username&gt;\WebKit</code>).</p>
+        <p>If the file is incorrectly named, rename it to <code>WebKitSupportLibrary.zip</code>. Do not extract its contents.</p>
+    </li>
+    <li>
+        <p>Run the <code>./Tools/Scripts/update-webkit</code> <a href="/coding/scripts.html">script</a> to update your source tree.</p>
+        <p>If you downloaded the tarball, this will bring it up to date.  Windows users
+            must always execute this command after first obtaining the code, since it will
+            download additional libraries that are needed to build.</p>
+    </li>
 </ol>
 </div>
 
-<ol>
-<li><p>Type this command to check out the WebKit source tree:</p>
-<p class="code">svn checkout https://svn.webkit.org/repository/webkit/trunk WebKit</p>
-<p>Alternatively you can download a snapshot of the WebKit source tree from 
-<a href="http://nightly.webkit.org/files/WebKit-SVN-source.tar.bz2">http://nightly.webkit.org/files/WebKit-SVN-source.tar.bz2</a>.  It is updated every six hours. Note the archived checkout uses an HTTP connection. We recommend running the following command to use HTTPS instead:</p>
-<p class="code">svn switch --relocate http://svn.webkit.org/repository/webkit/trunk https://svn.webkit.org/repository/webkit/trunk</p>
-</li>
-</ol>
-
-<div class="windows-instructions">
-<h4>Windows</h4>
-<ol>
-<li><p>Install the WebKit Support Libraries</p>
-<p>Download the <a href="http://developer.apple.com/opensource/internet/webkit_sptlib_agree.html">WebKit Support Libraries</a> to the root of your source tree (<code>C:\cygwin\home\&lt;username&gt;\WebKit</code>).</p>
-<p>If the file is incorrectly named, rename it to <code>WebKitSupportLibrary.zip</code>. Do not extract its contents.</p>
-</ol>
-</div>
-
-<ol>
-<li><p>Run the <code>update-webkit</code> <a href="/coding/scripts.html">script</a>
-to update your source tree.</p>
-<p>If you downloaded the tarball, this will bring it up to date.  Windows users
-must always execute this command after first obtaining the code, since it will
-download additional libraries that are needed to build.</p>
-</ol>
-
 <p>Once you have a current tree, the next step is
 <a href="build.html">building WebKit</a>.</p>
 

diff --git a/Websites/webkit.org/css/main.css b/Websites/webkit.org/css/main.css
index f52ca8f..b410cdd 100644 (file)
--- a/Websites/webkit.org/css/main.css
+++ b/Websites/webkit.org/css/main.css
@@ -202,7 +202,7 @@ dt {
     line-height: normal;
 }
 
-.mac-instructions, .windows-instructions, .gtk-instructions, .qt-instructions, .efl-instructions {
+.mac-instructions, .unix-instructions, .windows-instructions, .gtk-instructions, .qt-instructions, .efl-instructions {
     border: 1px solid black;
     background-color: white;
     -webkit-border-radius: 5px;