---

steveklabnik · alexcrichton · commit dec3d638dac6 · 2014-06-24T17:22:50.000-07:00
yaml --- r: 118971 b: refs/heads/master c: 3ed78f5 h: refs/heads/master i: 118969: 4784616 118967: 5187e8d v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: c484c2d1f840a3fd195b951a67745564b51715ad
+refs/heads/master: 3ed78f5b6b5d85c9de5794dcf16cecf5d16f7864
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 71fe44def9676d519f5ce5d7304e581a42cf2c70
 refs/heads/try: 1813e5aa1a03b0596b8de7abd1af31edf5d6098f
diff --git a/trunk/configure b/trunk/configure
@@ -869,6 +869,7 @@ do
     make_dir $h/test/debuginfo-lldb
     make_dir $h/test/codegen
     make_dir $h/test/doc-tutorial
+    make_dir $h/test/doc-guide
     make_dir $h/test/doc-guide-ffi
     make_dir $h/test/doc-guide-runtime
     make_dir $h/test/doc-guide-macros
diff --git a/trunk/mk/docs.mk b/trunk/mk/docs.mk
@@ -26,7 +26,7 @@
 # L10N_LANGS are the languages for which the docs have been
 # translated.
 ######################################################################
-DOCS := index intro tutorial guide-ffi guide-macros guide-lifetimes \
+DOCS := index intro tutorial guide guide-ffi guide-macros guide-lifetimes \
 	guide-tasks guide-container guide-pointers guide-testing \
 	guide-runtime complement-bugreport \
 	complement-lang-faq complement-design-faq complement-project-faq rust \
diff --git a/trunk/src/doc/guide.md b/trunk/src/doc/guide.md
@@ -0,0 +1,10 @@
+% The Rust Guide
+
+<div style="border: 2px solid red; padding:5px;">
+This guide is a work in progress. Until it is ready, we highly recommend that
+you read the <a href="tutorial.html">Tutorial</a> instead. This work-in-progress Guide is being
+displayed here in line with Rust's open development policy. Please open any
+issues you find as usual.
+</div>
+
+Coming soon. :)
diff --git a/trunk/src/doc/tutorial.md b/trunk/src/doc/tutorial.md
@@ -1,5 +1,12 @@
 % The Rust Language Tutorial
 
+<div style="border: 2px solid red; padding:5px;">
+The tutorial is undergoing a complete re-write as <a href="guide.html">the Guide</a>.
+Until it's ready, this tutorial is the right place to come to start learning
+Rust.  Please submit improvements as pull requests, but understand that
+eventually it will be going away.
+</div>
+
 # Introduction
 
 Rust is a programming language with a focus on type safety, memory
