aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2018-02-10 11:19:43 +0200
committerEli Zaretskii2018-02-10 11:19:43 +0200
commit6a1c03d65bcdd5a9cb2a130948285bbfde341154 (patch)
tree0f2f3ba41c8636ab8ffb8419c047373236d36190
parent32fb8c4c33305fa3107f23d8ce8cfba8e04a7433 (diff)
downloademacs-6a1c03d65bcdd5a9cb2a130948285bbfde341154.tar.gz
emacs-6a1c03d65bcdd5a9cb2a130948285bbfde341154.zip
More minor changes in the Emacs manual
* doc/emacs/xresources.texi (GTK resources): * doc/emacs/trouble.texi (Contributing): * doc/emacs/frames.texi (Fonts): Use HTTPS URLs instead of HTTP. * doc/emacs/docstyle.texi: Add a few @hyphenation directives, based on reports in emacs-manual-bugs@gnu.org about incorrect hyphenation.
-rw-r--r--doc/emacs/docstyle.texi6
-rw-r--r--doc/emacs/frames.texi2
-rw-r--r--doc/emacs/trouble.texi2
-rw-r--r--doc/emacs/xresources.texi4
4 files changed, 10 insertions, 4 deletions
diff --git a/doc/emacs/docstyle.texi b/doc/emacs/docstyle.texi
index dfd14306b39..f682e3d82be 100644
--- a/doc/emacs/docstyle.texi
+++ b/doc/emacs/docstyle.texi
@@ -8,3 +8,9 @@
8@end ignore 8@end ignore
9@set txicodequoteundirected 9@set txicodequoteundirected
10@set txicodequotebacktick 10@set txicodequotebacktick
11@c It turns out TeX sometimes fails to hyphenate, so we help it here
12@hyphenation{au-to-mat-i-cal-ly}
13@hyphenation{spec-i-fied}
14@hyphenation{work-a-round}
15@hyphenation{work-a-rounds}
16@hyphenation{un-marked}
diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi
index afdfa6c39c1..15b576d3323 100644
--- a/doc/emacs/frames.texi
+++ b/doc/emacs/frames.texi
@@ -642,7 +642,7 @@ Monospace-12:weight=bold:slant=italic
642 642
643For a more detailed description of Fontconfig patterns, see the 643For a more detailed description of Fontconfig patterns, see the
644Fontconfig manual, which is distributed with Fontconfig and available 644Fontconfig manual, which is distributed with Fontconfig and available
645online at @url{http://fontconfig.org/fontconfig-user.html}. 645online at @url{https://fontconfig.org/fontconfig-user.html}.
646 646
647@cindex GTK font pattern 647@cindex GTK font pattern
648 The second way to specify a font is to use a @dfn{GTK font pattern}. 648 The second way to specify a font is to use a @dfn{GTK font pattern}.
diff --git a/doc/emacs/trouble.texi b/doc/emacs/trouble.texi
index 2edeb05f9e0..330497c4ea9 100644
--- a/doc/emacs/trouble.texi
+++ b/doc/emacs/trouble.texi
@@ -1322,7 +1322,7 @@ the Emacs Lisp Reference Manual
1322@url{https://www.gnu.org/software/emacs} 1322@url{https://www.gnu.org/software/emacs}
1323 1323
1324@item 1324@item
1325@url{http://www.emacswiki.org/} 1325@url{https://www.emacswiki.org/}
1326@end itemize 1326@end itemize
1327 1327
1328@menu 1328@menu
diff --git a/doc/emacs/xresources.texi b/doc/emacs/xresources.texi
index d58c6b905eb..ee59551a6a6 100644
--- a/doc/emacs/xresources.texi
+++ b/doc/emacs/xresources.texi
@@ -512,7 +512,7 @@ those are governed by normal X resources (@pxref{Resources}).
512 512
513 The following sections describe how to customize GTK+ resources for 513 The following sections describe how to customize GTK+ resources for
514Emacs. For details about GTK+ resources, see the GTK+ API document at 514Emacs. For details about GTK+ resources, see the GTK+ API document at
515@uref{http://developer.gnome.org/gtk2/stable/gtk2-Resource-Files.html}. 515@uref{https://developer.gnome.org/gtk2/stable/gtk2-Resource-Files.html}.
516 516
517 In GTK+ version 3, GTK+ resources have been replaced by a completely 517 In GTK+ version 3, GTK+ resources have been replaced by a completely
518different system. The appearance of GTK+ widgets is now determined by 518different system. The appearance of GTK+ widgets is now determined by
@@ -522,7 +522,7 @@ style settings (where @var{theme} is the name of the current GTK+
522theme). Therefore, the description of GTK+ resources in this section 522theme). Therefore, the description of GTK+ resources in this section
523does not apply to GTK+ 3. For details about the GTK+ 3 styling 523does not apply to GTK+ 3. For details about the GTK+ 3 styling
524system, see 524system, see
525@uref{http://developer.gnome.org/gtk3/3.0/GtkCssProvider.html}. 525@uref{https://developer.gnome.org/gtk3/3.0/GtkCssProvider.html}.
526 526
527@menu 527@menu
528* GTK Resource Basics:: Basic usage of GTK+ resources. 528* GTK Resource Basics:: Basic usage of GTK+ resources.