Merge pull request #2286 from lukaramu/patch-1

Add note to RFC 505 that it has been amended by RFC 1574
rust-lang · Jan 11, 2018 · c892139 · c892139
2 parents f337bea + ced5085
commit c892139
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/text/0505-api-comment-conventions.md b/text/0505-api-comment-conventions.md
@@ -2,6 +2,13 @@
 - RFC PR: [rust-lang/rfcs#505](https://github.com/rust-lang/rfcs/pull/505)
 - Rust Issue: N/A
 
+# Note
+
+This RFC has been amended by [RFC 1574], which contains [a combined version of the conventions][combined].
+
+[RFC 1574]: https://github.com/rust-lang/rfcs/blob/master/text/1574-more-api-documentation-conventions.md
+[combined]: https://github.com/rust-lang/rfcs/blob/master/text/1574-more-api-documentation-conventions.md#appendix-a-full-conventions-text
+
 # Summary
 
 This is a conventions RFC, providing guidance on providing API documentation