Two more doc link renames that I missed before
Merge commit 'd54ffdf93aec188627ed589457242b9326386ca9'