diff --git a/doc/esp8266wifi/readme.rst b/doc/esp8266wifi/readme.rst
index bf9156ce1e..58334a1bf3 100644
--- a/doc/esp8266wifi/readme.rst
+++ b/doc/esp8266wifi/readme.rst
@@ -302,7 +302,7 @@ The same sketch without ``Serial.setDebugOutput(true)`` will print out only the
 Enable Debugging in IDE
 ~~~~~~~~~~~~~~~~~~~~~~~
 
-Arduino IDE provides convenient method to `enable debugging <https://github.com/esp8266/Arduino/blob/master/doc/Troubleshooting/debugging.rst>`__ for specific libraries.
+Arduino IDE provides convenient method to `enable debugging <../Troubleshooting/debugging.rst>`__ for specific libraries.
 
 What's Inside?
 --------------
diff --git a/doc/faq/a02-my-esp-crashes.rst b/doc/faq/a02-my-esp-crashes.rst
index a25ac26e6b..c4e7753d6e 100644
--- a/doc/faq/a02-my-esp-crashes.rst
+++ b/doc/faq/a02-my-esp-crashes.rst
@@ -83,7 +83,7 @@ is wrong, it restarts itself to tell you about it.
 There are two typical scenarios that trigger ESP restarts:
 
 -  **Exception** - when code is performing `illegal
-   operation <https://github.com/esp8266/Arduino/blob/master/doc/exception_causes.rst>`__,
+   operation <../exception_causes.rst>`__,
    like trying to write to non-existent memory location.
 -  **Watchdog** - if code is `locked
    up <https://en.wikipedia.org/wiki/Watchdog_timer>`__ staying too long
@@ -104,7 +104,7 @@ Typical restart because of exception looks like follows:
    Exception cause decoding
 
 Start with looking up exception code in the `Exception Causes
-(EXCCAUSE) <https://github.com/esp8266/Arduino/blob/master/doc/exception_causes.rst>`__
+(EXCCAUSE) <../exception_causes.rst>`__
 table to understand what kind of issue it is. If you have no clues what
 it's about and where it happens, then use `Arduino ESP8266/ESP32
 Exception Stack Trace
diff --git a/doc/faq/a04-board-generic-is-unknown.rst b/doc/faq/a04-board-generic-is-unknown.rst
index ed5b00b35c..3c26d37bbd 100644
--- a/doc/faq/a04-board-generic-is-unknown.rst
+++ b/doc/faq/a04-board-generic-is-unknown.rst
@@ -54,15 +54,15 @@ follows:
     Error compiling for board Generic ESP8266 Module.
 
 Below is an example messages for
-`WeMos <https://github.com/esp8266/Arduino/blob/master/doc/boards.rst#wemos-d1>`__:
+`WeMos <../boards.rst#wemos-d1-r2-mini>`__:
 
 ::
 
     Board d1_mini (platform esp8266, package esp8266) is unknown
     Error compiling for board WeMos D1 R2 & mini.
 
-... and another one for `Adafruit
-HUZZAH <https://github.com/esp8266/Arduino/blob/master/doc/boards.rst#adafruit-huzzah-esp8266-esp-12>`__:
+... and another one for `Adafruit Feather
+HUZZAH <../boards.rst#adafruit-feather-huzzah-esp8266>`__:
 
 ::
 
diff --git a/doc/reference.rst b/doc/reference.rst
index 642a729200..053d75d776 100644
--- a/doc/reference.rst
+++ b/doc/reference.rst
@@ -149,7 +149,7 @@ current speed. For example
 | ``Serial`` and ``Serial1`` objects are both instances of the
   ``HardwareSerial`` class.
 | I've done this also for official ESP8266 `Software
-  Serial <https://github.com/esp8266/Arduino/blob/master/doc/libraries.rst#softwareserial>`__
+  Serial <libraries.rst#softwareserial>`__
   library, see this `pull
   request <https://github.com/plerup/espsoftwareserial/pull/22>`__.
 | Note that this implementation is **only for ESP8266 based boards**,