From 0e6d97aab2dac7cb35afa70436a82d30280921a3 Mon Sep 17 00:00:00 2001
From: Steve Klabnik <steve@steveklabnik.com>
Date: Wed, 12 Nov 2014 11:33:28 -0500
Subject: [PATCH] New guide: error handling

---
 configure                       | 1 +
 mk/docs.mk                      | 2 +-
 src/doc/guide-error-handling.md | 2 ++
 src/doc/index.md                | 1 +
 src/doc/po4a.conf               | 1 +
 5 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 src/doc/guide-error-handling.md

diff --git a/configure b/configure
index 77900253014..35bba159208 100755
--- a/configure
+++ b/configure
@@ -1031,6 +1031,7 @@ do
     make_dir $h/test/doc-guide-tasks
     make_dir $h/test/doc-guide-plugin
     make_dir $h/test/doc-guide-crates
+    make_dir $h/test/doc-guide-error-handling
     make_dir $h/test/doc-rust
 done
 
diff --git a/mk/docs.mk b/mk/docs.mk
index bc1e9ccf2ea..48eb9e81c20 100644
--- a/mk/docs.mk
+++ b/mk/docs.mk
@@ -27,7 +27,7 @@
 ######################################################################
 DOCS := index intro tutorial guide guide-ffi guide-macros guide-lifetimes \
 	guide-tasks guide-container guide-pointers guide-testing \
-	guide-plugin guide-crates complement-bugreport \
+	guide-plugin guide-crates complement-bugreport guide-error-handling \
 	complement-lang-faq complement-design-faq complement-project-faq \
     rustdoc guide-unsafe guide-strings reference
 
diff --git a/src/doc/guide-error-handling.md b/src/doc/guide-error-handling.md
new file mode 100644
index 00000000000..c175298bd3a
--- /dev/null
+++ b/src/doc/guide-error-handling.md
@@ -0,0 +1,2 @@
+% Error Handling in Rust
+
diff --git a/src/doc/index.md b/src/doc/index.md
index 8d54550a9f9..7d4d48e80a3 100644
--- a/src/doc/index.md
+++ b/src/doc/index.md
@@ -59,6 +59,7 @@ a guide that can help you out:
 * [References and Lifetimes](guide-lifetimes.html)
 * [Crates and modules](guide-crates.html)
 * [Tasks and Communication](guide-tasks.html)
+* [Error Handling](guide-error-handling.html)
 * [Foreign Function Interface](guide-ffi.html)
 * [Writing Unsafe and Low-Level Code](guide-unsafe.html)
 * [Macros](guide-macros.html)
diff --git a/src/doc/po4a.conf b/src/doc/po4a.conf
index c0406d104fc..4fbb3c21016 100644
--- a/src/doc/po4a.conf
+++ b/src/doc/po4a.conf
@@ -20,6 +20,7 @@
 [type: text] src/doc/guide-testing.md $lang:doc/l10n/$lang/guide-testing.md
 [type: text] src/doc/guide-unsafe.md $lang:doc/l10n/$lang/guide-unsafe.md
 [type: text] src/doc/guide-crates.md $lang:doc/l10n/$lang/guide-crates.md
+[type: text] src/doc/guide-error-handling.md $lang:doc/l10n/$lang/guide-error-handling.md
 [type: text] src/doc/guide.md $lang:doc/l10n/$lang/guide.md
 [type: text] src/doc/index.md $lang:doc/l10n/$lang/index.md
 [type: text] src/doc/intro.md $lang:doc/l10n/$lang/intro.md