Merge remote-tracking branch 'origin/emacs-30'

2 files changed, 7 insertions, 2 deletions

diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi
index e30d1c99820..bc2d6b07ae8 100644
--- a/doc/lispref/frames.texi
+++ b/doc/lispref/frames.texi
@@ -427,7 +427,12 @@ Name of the physical monitor as @var{string}.
 
 @item source
 Source of the multi-monitor information as @var{string};
-e.g., @samp{XRandR 1.5}, @samp{XRandr} or @samp{Xinerama}.
+on X, it could be @samp{XRandR 1.5}, @samp{XRandr}, @samp{Xinerama},
+@samp{Gdk}, or @samp{fallback}.  The last value of @samp{source} means
+that Emacs was built without GTK and without XRandR or Xinerama
+extensions, in which case the information about multiple physical
+monitors will be provided as if they all as a whole formed a single
+monitor.
 @end table
 
 @var{x}, @var{y}, @var{width}, and @var{height} are integers.
diff --git a/doc/misc/org.org b/doc/misc/org.org
index 363a95fa65c..26cb46cf13c 100644
--- a/doc/misc/org.org
+++ b/doc/misc/org.org
@@ -3403,7 +3403,7 @@ options:
 
 | Link Type  | Example                                                            |
 |------------+--------------------------------------------------------------------|
-| http       | =https://staff.science.uva.nl/c.dominik/=                          |
+| http       | =http://orgmode.org/=                                              |
 | https      | =https://orgmode.org/=                                             |
 | doi        | =doi:10.1000/182=                                                  |
 | file       | =file:/home/dominik/images/jupiter.jpg=                            |