rust-lang · bors · Aug 4, 2015 · Jul 31, 2015 · brson · Aug 2, 2015
diff --git a/mk/docs.mk b/mk/docs.mk
@@ -77,7 +77,7 @@ ERR_IDX_GEN = $(RPATH_VAR2_T_$(CFG_BUILD)_H_$(CFG_BUILD)) $(ERR_IDX_GEN_EXE)
 
 D := $(S)src/doc
 
-DOC_TARGETS := trpl tarpl style error-index
+DOC_TARGETS := trpl nomicon style error-index
 COMPILER_DOC_TARGETS :=
 DOC_L10N_TARGETS :=
 
@@ -287,12 +287,12 @@ doc/book/index.html: $(RUSTBOOK_EXE) $(wildcard $(S)/src/doc/trpl/*.md) | doc/
 	$(Q)rm -rf doc/book
 	$(Q)$(RUSTBOOK) build $(S)src/doc/trpl doc/book
 
-tarpl: doc/adv-book/index.html
+nomicon: doc/nomicon/index.html
 
-doc/adv-book/index.html: $(RUSTBOOK_EXE) $(wildcard $(S)/src/doc/tarpl/*.md) | doc/
+doc/nomicon/index.html: $(RUSTBOOK_EXE) $(wildcard $(S)/src/doc/nomicon/*.md) | doc/
 	@$(call E, rustbook: $@)
-	$(Q)rm -rf doc/adv-book
-	$(Q)$(RUSTBOOK) build $(S)src/doc/tarpl doc/adv-book
+	$(Q)rm -rf doc/nomicon
+	$(Q)$(RUSTBOOK) build $(S)src/doc/nomicon doc/nomicon
 
 style: doc/style/index.html
 

diff --git a/mk/tests.mk b/mk/tests.mk
@@ -162,8 +162,8 @@ $(foreach doc,$(DOCS), \
   $(eval $(call DOCTEST,md-$(doc),$(S)src/doc/$(doc).md)))
 $(foreach file,$(wildcard $(S)src/doc/trpl/*.md), \
   $(eval $(call DOCTEST,$(file:$(S)src/doc/trpl/%.md=trpl-%),$(file))))
-$(foreach file,$(wildcard $(S)src/doc/tarpl/*.md), \
-  $(eval $(call DOCTEST,$(file:$(S)src/doc/tarpl/%.md=tarpl-%),$(file))))
+$(foreach file,$(wildcard $(S)src/doc/nomicon/*.md), \
+  $(eval $(call DOCTEST,$(file:$(S)src/doc/nomicon/%.md=nomicon-%),$(file))))
 ######################################################################
 # Main test targets
 ######################################################################

diff --git a/src/doc/nomicon/README.md b/src/doc/nomicon/README.md
@@ -0,0 +1,38 @@
+% The Rustonomicon
+
+#### The Dark Arts of Advanced and Unsafe Rust Programming
+
+# NOTE: This is a draft document, and may contain serious errors
+
+> Instead of the programs I had hoped for, there came only a shuddering blackness
+and ineffable loneliness; and I saw at last a fearful truth which no one had
+ever dared to breathe before — the unwhisperable secret of secrets — The fact
+that this language of stone and stridor is not a sentient perpetuation of Rust
+as London is of Old London and Paris of Old Paris, but that it is in fact
+quite unsafe, its sprawling body imperfectly embalmed and infested with queer
+animate things which have nothing to do with it as it was in compilation.
+
+This book digs into all the awful details that are necessary to understand in
+order to write correct Unsafe Rust programs. Due to the nature of this problem,
+it may lead to unleashing untold horrors that shatter your psyche into a billion
+infinitesimal fragments of despair.
+
+Should you wish a long and happy career of writing Rust programs, you should
+turn back now and forget you ever saw this book. It is not necessary. However
+if you intend to write unsafe code -- or just want to dig into the guts of the
+language -- this book contains invaluable information.
+
+Unlike [The Book][trpl] we will be assuming considerable prior knowledge. In
+particular, you should be comfortable with basic systems programming and Rust.
+If you don't feel comfortable with these topics, you should consider [reading
+The Book][trpl] first. Though we will not be assuming that you have, and will
+take care to occasionally give a refresher on the basics where appropriate. You
+can skip straight to this book if you want; just know that we won't be
+explaining everything from the ground up.
+
+To be clear, this book goes into deep detail. We're going to dig into
+exception-safety, pointer aliasing, memory models, and even some type-theory.
+We will also be spending a lot of time talking about the different kinds
+of safety and guarantees.
+
+[trpl]: ../book/
diff --git a/src/doc/tarpl/SUMMARY.md → src/doc/nomicon/SUMMARY.md b/src/doc/tarpl/SUMMARY.md → src/doc/nomicon/SUMMARY.md
diff --git a/src/doc/tarpl/arc-and-mutex.md → src/doc/nomicon/arc-and-mutex.md b/src/doc/tarpl/arc-and-mutex.md → src/doc/nomicon/arc-and-mutex.md
diff --git a/src/doc/tarpl/atomics.md → src/doc/nomicon/atomics.md b/src/doc/tarpl/atomics.md → src/doc/nomicon/atomics.md
diff --git a/src/doc/tarpl/borrow-splitting.md → src/doc/nomicon/borrow-splitting.md b/src/doc/tarpl/borrow-splitting.md → src/doc/nomicon/borrow-splitting.md
diff --git a/src/doc/tarpl/casts.md → src/doc/nomicon/casts.md b/src/doc/tarpl/casts.md → src/doc/nomicon/casts.md
diff --git a/src/doc/tarpl/checked-uninit.md → src/doc/nomicon/checked-uninit.md b/src/doc/tarpl/checked-uninit.md → src/doc/nomicon/checked-uninit.md
diff --git a/src/doc/tarpl/coercions.md → src/doc/nomicon/coercions.md b/src/doc/tarpl/coercions.md → src/doc/nomicon/coercions.md
diff --git a/src/doc/tarpl/concurrency.md → src/doc/nomicon/concurrency.md b/src/doc/tarpl/concurrency.md → src/doc/nomicon/concurrency.md
diff --git a/src/doc/tarpl/constructors.md → src/doc/nomicon/constructors.md b/src/doc/tarpl/constructors.md → src/doc/nomicon/constructors.md
diff --git a/src/doc/tarpl/conversions.md → src/doc/nomicon/conversions.md b/src/doc/tarpl/conversions.md → src/doc/nomicon/conversions.md
diff --git a/src/doc/tarpl/data.md → src/doc/nomicon/data.md b/src/doc/tarpl/data.md → src/doc/nomicon/data.md
diff --git a/src/doc/tarpl/destructors.md → src/doc/nomicon/destructors.md b/src/doc/tarpl/destructors.md → src/doc/nomicon/destructors.md
diff --git a/src/doc/tarpl/dot-operator.md → src/doc/nomicon/dot-operator.md b/src/doc/tarpl/dot-operator.md → src/doc/nomicon/dot-operator.md
diff --git a/src/doc/tarpl/drop-flags.md → src/doc/nomicon/drop-flags.md b/src/doc/tarpl/drop-flags.md → src/doc/nomicon/drop-flags.md
diff --git a/src/doc/tarpl/dropck.md → src/doc/nomicon/dropck.md b/src/doc/tarpl/dropck.md → src/doc/nomicon/dropck.md
diff --git a/src/doc/tarpl/exception-safety.md → src/doc/nomicon/exception-safety.md b/src/doc/tarpl/exception-safety.md → src/doc/nomicon/exception-safety.md
diff --git a/src/doc/tarpl/exotic-sizes.md → src/doc/nomicon/exotic-sizes.md b/src/doc/tarpl/exotic-sizes.md → src/doc/nomicon/exotic-sizes.md
diff --git a/src/doc/tarpl/hrtb.md → src/doc/nomicon/hrtb.md b/src/doc/tarpl/hrtb.md → src/doc/nomicon/hrtb.md
diff --git a/src/doc/tarpl/leaking.md → src/doc/nomicon/leaking.md b/src/doc/tarpl/leaking.md → src/doc/nomicon/leaking.md
diff --git a/src/doc/tarpl/lifetime-elision.md → src/doc/nomicon/lifetime-elision.md b/src/doc/tarpl/lifetime-elision.md → src/doc/nomicon/lifetime-elision.md
diff --git a/src/doc/tarpl/lifetime-mismatch.md → src/doc/nomicon/lifetime-mismatch.md b/src/doc/tarpl/lifetime-mismatch.md → src/doc/nomicon/lifetime-mismatch.md
diff --git a/src/doc/tarpl/lifetimes.md → src/doc/nomicon/lifetimes.md b/src/doc/tarpl/lifetimes.md → src/doc/nomicon/lifetimes.md
diff --git a/src/doc/tarpl/meet-safe-and-unsafe.md → src/doc/nomicon/meet-safe-and-unsafe.md b/src/doc/tarpl/meet-safe-and-unsafe.md → src/doc/nomicon/meet-safe-and-unsafe.md
diff --git a/src/doc/tarpl/obrm.md → src/doc/nomicon/obrm.md b/src/doc/tarpl/obrm.md → src/doc/nomicon/obrm.md
diff --git a/src/doc/tarpl/other-reprs.md → src/doc/nomicon/other-reprs.md b/src/doc/tarpl/other-reprs.md → src/doc/nomicon/other-reprs.md
diff --git a/src/doc/tarpl/ownership.md → src/doc/nomicon/ownership.md b/src/doc/tarpl/ownership.md → src/doc/nomicon/ownership.md
diff --git a/src/doc/tarpl/phantom-data.md → src/doc/nomicon/phantom-data.md b/src/doc/tarpl/phantom-data.md → src/doc/nomicon/phantom-data.md
diff --git a/src/doc/tarpl/poisoning.md → src/doc/nomicon/poisoning.md b/src/doc/tarpl/poisoning.md → src/doc/nomicon/poisoning.md
diff --git a/src/doc/tarpl/races.md → src/doc/nomicon/races.md b/src/doc/tarpl/races.md → src/doc/nomicon/races.md
diff --git a/src/doc/tarpl/references.md → src/doc/nomicon/references.md b/src/doc/tarpl/references.md → src/doc/nomicon/references.md
diff --git a/src/doc/tarpl/repr-rust.md → src/doc/nomicon/repr-rust.md b/src/doc/tarpl/repr-rust.md → src/doc/nomicon/repr-rust.md
diff --git a/src/doc/tarpl/safe-unsafe-meaning.md → src/doc/nomicon/safe-unsafe-meaning.md b/src/doc/tarpl/safe-unsafe-meaning.md → src/doc/nomicon/safe-unsafe-meaning.md
diff --git a/src/doc/tarpl/send-and-sync.md → src/doc/nomicon/send-and-sync.md b/src/doc/tarpl/send-and-sync.md → src/doc/nomicon/send-and-sync.md
diff --git a/src/doc/tarpl/subtyping.md → src/doc/nomicon/subtyping.md b/src/doc/tarpl/subtyping.md → src/doc/nomicon/subtyping.md
diff --git a/src/doc/tarpl/transmutes.md → src/doc/nomicon/transmutes.md b/src/doc/tarpl/transmutes.md → src/doc/nomicon/transmutes.md
diff --git a/src/doc/tarpl/unbounded-lifetimes.md → src/doc/nomicon/unbounded-lifetimes.md b/src/doc/tarpl/unbounded-lifetimes.md → src/doc/nomicon/unbounded-lifetimes.md
diff --git a/src/doc/tarpl/unchecked-uninit.md → src/doc/nomicon/unchecked-uninit.md b/src/doc/tarpl/unchecked-uninit.md → src/doc/nomicon/unchecked-uninit.md
diff --git a/src/doc/tarpl/uninitialized.md → src/doc/nomicon/uninitialized.md b/src/doc/tarpl/uninitialized.md → src/doc/nomicon/uninitialized.md
diff --git a/src/doc/tarpl/unwinding.md → src/doc/nomicon/unwinding.md b/src/doc/tarpl/unwinding.md → src/doc/nomicon/unwinding.md
diff --git a/src/doc/tarpl/vec-alloc.md → src/doc/nomicon/vec-alloc.md b/src/doc/tarpl/vec-alloc.md → src/doc/nomicon/vec-alloc.md
diff --git a/src/doc/tarpl/vec-dealloc.md → src/doc/nomicon/vec-dealloc.md b/src/doc/tarpl/vec-dealloc.md → src/doc/nomicon/vec-dealloc.md
diff --git a/src/doc/tarpl/vec-deref.md → src/doc/nomicon/vec-deref.md b/src/doc/tarpl/vec-deref.md → src/doc/nomicon/vec-deref.md
diff --git a/src/doc/tarpl/vec-drain.md → src/doc/nomicon/vec-drain.md b/src/doc/tarpl/vec-drain.md → src/doc/nomicon/vec-drain.md
diff --git a/src/doc/tarpl/vec-final.md → src/doc/nomicon/vec-final.md b/src/doc/tarpl/vec-final.md → src/doc/nomicon/vec-final.md
diff --git a/src/doc/tarpl/vec-insert-remove.md → src/doc/nomicon/vec-insert-remove.md b/src/doc/tarpl/vec-insert-remove.md → src/doc/nomicon/vec-insert-remove.md
diff --git a/src/doc/tarpl/vec-into-iter.md → src/doc/nomicon/vec-into-iter.md b/src/doc/tarpl/vec-into-iter.md → src/doc/nomicon/vec-into-iter.md
diff --git a/src/doc/tarpl/vec-layout.md → src/doc/nomicon/vec-layout.md b/src/doc/tarpl/vec-layout.md → src/doc/nomicon/vec-layout.md
diff --git a/src/doc/tarpl/vec-push-pop.md → src/doc/nomicon/vec-push-pop.md b/src/doc/tarpl/vec-push-pop.md → src/doc/nomicon/vec-push-pop.md
diff --git a/src/doc/tarpl/vec-raw.md → src/doc/nomicon/vec-raw.md b/src/doc/tarpl/vec-raw.md → src/doc/nomicon/vec-raw.md
diff --git a/src/doc/tarpl/vec-zsts.md → src/doc/nomicon/vec-zsts.md b/src/doc/tarpl/vec-zsts.md → src/doc/nomicon/vec-zsts.md
diff --git a/src/doc/tarpl/vec.md → src/doc/nomicon/vec.md b/src/doc/tarpl/vec.md → src/doc/nomicon/vec.md
diff --git a/src/doc/tarpl/working-with-unsafe.md → src/doc/nomicon/working-with-unsafe.md b/src/doc/tarpl/working-with-unsafe.md → src/doc/nomicon/working-with-unsafe.md
diff --git a/src/doc/tarpl/README.md b/src/doc/tarpl/README.md