Merge 34064 - Update docs to recomment beta channel instead of dev where

appropriate.

TBR=erikkay@chromium.org

TBR=aa@chromium.org
Review URL: http://codereview.chromium.org/501055

git-svn-id: svn://svn.chromium.org/chrome/branches/249/src@34707 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 33 insertions, 9 deletions

diff --git a/chrome/common/extensions/docs/getstarted.html b/chrome/common/extensions/docs/getstarted.html
index 4abc10e2..047cf45 100644
--- a/chrome/common/extensions/docs/getstarted.html
+++ b/chrome/common/extensions/docs/getstarted.html
@@ -284,9 +284,14 @@ The icon and page will look something like this:
 <h2 id="browser">Get your browser ready</h2>
 
 <p>To develop extensions for Google Chrome,
-you need to <a href="http://dev.chromium.org/getting-involved/dev-channel">subscribe
-to the Dev Channel</a> of Google Chrome. Extensions aren't yet available in the beta or stable channels (but we're working hard on that!).
-</p>
+you need to get on an early access release channel of Google Chrome. The normal
+'stable' release of Google Chrome doesn't yet support extensions (but we're working
+hard on that!).
+
+<ul>
+  <li>For <b>Windows</b> and <b>Linux</b>, subscribe to the <a href='http://www.google.com/landing/chrome/beta/'>Beta Channel</a>.
+  <li>For <b>Mac</b>, subscribe to the <a href='http://www.chromium.org/getting-involved/dev-channel#TOC-Mac'>Dev Channel</a>.
+</ul>
 
 <h2 id="load">Create and load an extension</h2>
 <p>
diff --git a/chrome/common/extensions/docs/samples.html b/chrome/common/extensions/docs/samples.html
index 53b5a68..e6f8dd9 100644
--- a/chrome/common/extensions/docs/samples.html
+++ b/chrome/common/extensions/docs/samples.html
@@ -281,9 +281,16 @@ Each sample also has links to the documentation
 for each feature used by the sample.
 </p>
 
-<p><b>Note:</b> To run these samples, you need to be using the <a href="http://dev.chromium.org/getting-involved/dev-channel">Dev Channel</a> of Google Chrome.
+<p><b>Note:</b> To run these samples,
+you need to get on an early access release channel of Google Chrome. The normal
+'stable' release of Google Chrome doesn't yet support extensions.
 
-</p><p>
+<ul>
+  <li>For <b>Windows</b> and <b>Linux</b>, subscribe to the <a href='http://www.google.com/landing/chrome/beta/'>Beta Channel</a>.
+  <li>For <b>Mac</b>, subscribe to the <a href='http://www.chromium.org/getting-involved/dev-channel#TOC-Mac'>Dev Channel</a>.
+</ul>
+
+<p>
 For more example code, see the
 <a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/" target="_blank">Chromium examples directory</a>.
 For tips on using the code viewer, see
diff --git a/chrome/common/extensions/docs/static/getstarted.html b/chrome/common/extensions/docs/static/getstarted.html
index 30d6431..83bc4c3 100644
--- a/chrome/common/extensions/docs/static/getstarted.html
+++ b/chrome/common/extensions/docs/static/getstarted.html
@@ -16,9 +16,14 @@ The icon and page will look something like this:
 <h2 id="browser">Get your browser ready</h2>
 
 <p>To develop extensions for Google Chrome,
-you need to <a href="http://dev.chromium.org/getting-involved/dev-channel">subscribe
-to the Dev Channel</a> of Google Chrome. Extensions aren't yet available in the beta or stable channels (but we're working hard on that!).
-</p>
+you need to get on an early access release channel of Google Chrome. The normal
+'stable' release of Google Chrome doesn't yet support extensions (but we're working
+hard on that!).
+
+<ul>
+  <li>For <b>Windows</b> and <b>Linux</b>, subscribe to the <a href='http://www.google.com/landing/chrome/beta/'>Beta Channel</a>.
+  <li>For <b>Mac</b>, subscribe to the <a href='http://www.chromium.org/getting-involved/dev-channel#TOC-Mac'>Dev Channel</a>.
+</ul>
 
 <h2 id="load">Create and load an extension</h2>
 <p>
diff --git a/chrome/common/extensions/docs/static/samples.html b/chrome/common/extensions/docs/static/samples.html
index b35777c..9ab022c 100644
--- a/chrome/common/extensions/docs/static/samples.html
+++ b/chrome/common/extensions/docs/static/samples.html
@@ -14,7 +14,14 @@ Each sample also has links to the documentation
 for each feature used by the sample.
 </p>
 
-<p><b>Note:</b> To run these samples, you need to be using the <a href="http://dev.chromium.org/getting-involved/dev-channel">Dev Channel</a> of Google Chrome.
+<p><b>Note:</b> To run these samples,
+you need to get on an early access release channel of Google Chrome. The normal
+'stable' release of Google Chrome doesn't yet support extensions.
+
+<ul>
+  <li>For <b>Windows</b> and <b>Linux</b>, subscribe to the <a href='http://www.google.com/landing/chrome/beta/'>Beta Channel</a>.
+  <li>For <b>Mac</b>, subscribe to the <a href='http://www.chromium.org/getting-involved/dev-channel#TOC-Mac'>Dev Channel</a>.
+</ul>
 
 <p>
 For more example code, see the