diff --git a/text/0218-empty-struct-with-braces.md b/text/0218-empty-struct-with-braces.md
index e74b887e081..09c7d529a9a 100644
--- a/text/0218-empty-struct-with-braces.md
+++ b/text/0218-empty-struct-with-braces.md
@@ -1,6 +1,6 @@
 - Start Date: 2014-08-28
-- RFC PR: [rust-lang/rfcs#218](https://github.com/rust-lang/rfcs/pull/218/files)
-- Rust Issue: [rust-lang/rust#218](https://github.com/rust-lang/rust/issues/24266)
+- RFC PR: [rust-lang/rfcs#218](https://github.com/rust-lang/rfcs/pull/218)
+- Rust Issue: [rust-lang/rust#24266](https://github.com/rust-lang/rust/issues/24266)
 
 # Summary
 
diff --git a/text/0326-restrict-xXX-to-ascii.md b/text/0326-restrict-xXX-to-ascii.md
index c87fb18fc4d..2b29ac0ec8d 100644
--- a/text/0326-restrict-xXX-to-ascii.md
+++ b/text/0326-restrict-xXX-to-ascii.md
@@ -1,5 +1,5 @@
 - Start Date: 2014-09-26
-- RFC PR: 326
+- RFC PR: [rust-lang/rfcs#326](https://github.com/rust-lang/rfcs/pull/326)
 - Rust Issue: [rust-lang/rust#18062](https://github.com/rust-lang/rust/issues/18062)
 
 # Summary
diff --git a/text/0601-replace-be-with-become.md b/text/0601-replace-be-with-become.md
index 767c8e1f44f..232c7b0408b 100644
--- a/text/0601-replace-be-with-become.md
+++ b/text/0601-replace-be-with-become.md
@@ -1,5 +1,5 @@
 - Start Date: 2015-01-20
-- RFC PR: [rust-lang/rfcs#601](https://github.com/rust-lang/rfcs/pull/601/)
+- RFC PR: [rust-lang/rfcs#601](https://github.com/rust-lang/rfcs/pull/601)
 - Rust Issue: [rust-lang/rust#22141](https://github.com/rust-lang/rust/issues/22141)
 
 # Summary
diff --git a/text/1298-incremental-compilation.md b/text/1298-incremental-compilation.md
index 60abc90f240..4ca31c9d070 100644
--- a/text/1298-incremental-compilation.md
+++ b/text/1298-incremental-compilation.md
@@ -1,7 +1,7 @@
 - Feature Name: incremental-compilation
 - Start Date: 2015-08-04
-- RFC PR: (leave this empty)
-- Rust Issue: (leave this empty)
+- RFC PR: [rust-lang/rfcs#1298](https://github.com/rust-lang/rfcs/pull/1298)
+- Rust Issue: [rust-lang/rust-roadmap-2017#4](https://github.com/rust-lang/rust-roadmap-2017/issues/4)
 
 # Summary
 
diff --git a/text/1728-north-star.md b/text/1728-north-star.md
index 5084e0a662d..8796e68cd98 100644
--- a/text/1728-north-star.md
+++ b/text/1728-north-star.md
@@ -1,6 +1,6 @@
 - Feature Name: north_star
 - Start Date: 2016-08-07
-- RFC PR: #1728
+- RFC PR: [rust-lang/rfcs#1728](https://github.com/rust-lang/rfcs/pull/1728)
 - Rust Issue: N/A
 
 # Summary
diff --git a/text/2396-target-feature-1.1.md b/text/2396-target-feature-1.1.md
index b3108357ebc..90590412c12 100644
--- a/text/2396-target-feature-1.1.md
+++ b/text/2396-target-feature-1.1.md
@@ -1,6 +1,6 @@
 - Feature Name: `#[target_feature]` 1.1
 - Start Date: 2018-04-06
-- RFC PR: [rust-lang/rust#2396](https://github.com/rust-lang/rfcs/pull/2396)
+- RFC PR: [rust-lang/rfcs#2396](https://github.com/rust-lang/rfcs/pull/2396)
 - Rust Issue: [rust-lang/rust#69098](https://github.com/rust-lang/rust/issues/69098)
 
 # Summary
diff --git a/text/2436-style-guide.md b/text/2436-style-guide.md
index 9f957ab4143..0be0599b384 100644
--- a/text/2436-style-guide.md
+++ b/text/2436-style-guide.md
@@ -1,6 +1,6 @@
 - Feature Name: N/A
 - Start Date: 2018-05-04
-- RFC PR: #2436
+- RFC PR: [rust-lang/rfcs#2436](https://github.com/rust-lang/rfcs/pull/2436)
 - Rust Issue: N/A
 
 # Summary
diff --git a/text/2476-clippy-uno.md b/text/2476-clippy-uno.md
index fbe71b925f5..eea2b96e711 100644
--- a/text/2476-clippy-uno.md
+++ b/text/2476-clippy-uno.md
@@ -1,7 +1,7 @@
 - Feature Name: `clippy_uno`
 - Start Date: 2018-06-14
-- RFC PR: [rust-lang/rfcs#2539](https://github.com/rust-lang/rfcs/pull/2539)
-- Rust Issue: [rust-lang-nursery/rust-clippy#54881](https://github.com/rust-lang-nursery/rust-clippy/issues/3343)
+- RFC PR: [rust-lang/rfcs#2476](https://github.com/rust-lang/rfcs/pull/2476)
+- Rust Issue: [rust-lang-nursery/rust-clippy#3343](https://github.com/rust-lang-nursery/rust-clippy/issues/3343)
 
 # Summary
 [summary]: #summary
diff --git a/text/3327-lang-team-advisors.md b/text/3327-lang-team-advisors.md
index f5f9792fe85..c4ad419dd31 100644
--- a/text/3327-lang-team-advisors.md
+++ b/text/3327-lang-team-advisors.md
@@ -4,8 +4,8 @@ title: Lang team advisors RFC
 
 - Feature Name: N/A
 - Start Date: 2022-09-21
-- RFC PR: [rust-lang/rfcs#3327](https://github.com/rust-lang/rfcs/pull/0000)
-- Rust Issue: [rust-lang/rust#0000](https://github.com/rust-lang/rust/issues/0000)
+- RFC PR: [rust-lang/rfcs#3327](https://github.com/rust-lang/rfcs/pull/3327)
+- Rust Issue: N/A
 
 # Summary
 [summary]: #summary
diff --git a/text/3366-diagnostic-attribute-namespace.md b/text/3368-diagnostic-attribute-namespace.md
similarity index 98%
rename from text/3366-diagnostic-attribute-namespace.md
rename to text/3368-diagnostic-attribute-namespace.md
index d60d55b124e..1dd660ec3f7 100644
--- a/text/3366-diagnostic-attribute-namespace.md
+++ b/text/3368-diagnostic-attribute-namespace.md
@@ -1,7 +1,7 @@
 - Feature Name: The `#[diagnostic]` attribute namespace
 - Start Date: 2023-01-06
-- RFC PR: [rust-lang/rfcs#0000](https://github.com/rust-lang/rfcs/pull/0000)
-- Rust Issue: [rust-lang/rust#0000](https://github.com/rust-lang/rust/issues/0000)
+- RFC PR: [rust-lang/rfcs#3368](https://github.com/rust-lang/rfcs/pull/3368)
+- Rust Issue: [rust-lang/rust#111996](https://github.com/rust-lang/rust/issues/111996)
 
 
 # Summary