[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/org 21155f007c 3/4: Merge branch 'km/from-emacs-master'
|
From: |
ELPA Syncer |
|
Subject: |
[elpa] externals/org 21155f007c 3/4: Merge branch 'km/from-emacs-master' |
|
Date: |
Sun, 16 Oct 2022 17:57:50 -0400 (EDT) |
branch: externals/org
commit 21155f007c51d5a1f881b479e8e559f9b07b3a04
Merge: d972cfac89 b7aad5b095
Author: Kyle Meyer <kyle@kyleam.com>
Commit: Kyle Meyer <kyle@kyleam.com>
Merge branch 'km/from-emacs-master'
- Take the change from 58a46fab0 (doc/org-manual.org: Mention that
Network Theory Ltd. is closed, 2022-10-16) over Emacs's a95062e036d
(Delete broken link to Network Theory Ltd, 2022-10-15).
- Do not keep the {http => https}://staff.science.uva.nl/c.dominik/
change from Emacs's 318722541 because that value is intended to be
an example for the http row (with an https example in the next
row).
---
doc/org-manual.org | 24 ++++++++++++------------
lisp/ob-matlab.el | 2 +-
lisp/ob-plantuml.el | 2 +-
lisp/org-ctags.el | 2 +-
lisp/org-protocol.el | 2 +-
5 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/doc/org-manual.org b/doc/org-manual.org
index 0225a0001c..a7250d3971 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -3620,7 +3620,7 @@ replacement text. Here is an example:
'(("bugzilla" . "http://10.1.2.9/bugzilla/show_bug.cgi?id=";)
("Nu Html Checker" . "https://validator.w3.org/nu/?doc=%h";)
("duckduckgo" . "https://duckduckgo.com/?q=%s";)
- ("omap" .
"http://nominatim.openstreetmap.org/search?q=%s&polygon=1";)
+ ("omap" .
"https://nominatim.openstreetmap.org/search?q=%s&polygon=1";)
("ads" .
"https://ui.adsabs.harvard.edu/search/q=%20author%3A\"%s\"";)))
#+end_src
@@ -3649,7 +3649,7 @@ can define them in the file with
#+cindex: @samp{LINK}, keyword
#+begin_example
-,#+LINK: bugzilla http://10.1.2.9/bugzilla/show_bug.cgi?id=
+,#+LINK: bugzilla https://10.1.2.9/bugzilla/show_bug.cgi?id=
,#+LINK: duckduckgo https://duckduckgo.com/?q=%s
#+end_example
@@ -13236,8 +13236,8 @@ buffer. For example, with the following settings,
equation labels are displayed on the left margin and equations are
five em from the left margin. In addition, it loads the two MathJax
extensions =cancel.js= and =noErrors.js=[fn:: See
-[[http://docs.mathjax.org/en/latest/input/tex/extensions.html#tex-and-latex-extensions][TeX
-and LaTeX extensions]] in the [[http://docs.mathjax.org][MathJax
+[[https://docs.mathjax.org/en/latest/input/tex/extensions.html#tex-and-latex-extensions][TeX
+and LaTeX extensions]] in the [[https://docs.mathjax.org][MathJax
manual]] to learn about extensions.].
#+vindex: org-html-mathjax-template
@@ -13930,7 +13930,7 @@ not have descriptions, such as these links
=[[file:img.jpg]]= or
=[[./img.jpg]]=, as direct image insertions in the final PDF output. In
the PDF, they are no longer links but actual images embedded on the
page. The LaTeX export back-end uses =\includegraphics= macro to
-insert the image. But for TikZ (http://sourceforge.net/projects/pgf/)
+insert the image. But for TikZ (https://sourceforge.net/projects/pgf/)
images, the back-end uses an ~\input~ macro wrapped within
a ~tikzpicture~ environment.
@@ -14282,7 +14282,7 @@ some text in German...
#+cindex: Markdown export
The Markdown export back-end, "md", converts an Org file to Markdown
-format, as defined at http://daringfireball.net/projects/markdown/.
+format, as defined at https://daringfireball.net/projects/markdown/.
Since it is built on top of the HTML back-end (see [[*HTML Export]]), it
converts every Org construct not defined in Markdown syntax, such as
@@ -14335,7 +14335,7 @@ a limit to a level before the absolute limit (see
[[*Export Settings]]).
The ODT export back-end handles creating of OpenDocument Text (ODT)
format. Documents created by this exporter use the
{{{cite(OpenDocument-v1.2 specification)}}}[fn:: See
-[[http://docs.oasis-open.org/office/v1.2/OpenDocument-v1.2.html][Open
+[[https://docs.oasis-open.org/office/v1.2/OpenDocument-v1.2.html][Open
Document Format for Office Applications (OpenDocument) Version 1.2]].]
and are compatible with LibreOffice 3.4.
@@ -14750,7 +14750,7 @@ document in one of the following ways:
#+end_src
#+texinfo: @noindent
- or, to use LaTeXML[fn:: See [[http://dlmf.nist.gov/LaTeXML/]].]
+ or, to use LaTeXML[fn:: See [[https://dlmf.nist.gov/LaTeXML/]].]
instead,
#+begin_src emacs-lisp
@@ -15071,7 +15071,7 @@ tables, see [[*Tables in ODT export]].
This feature closely mimics the way table templates are defined in the
OpenDocument-v1.2 specification[fn::
-[[http://docs.oasis-open.org/office/v1.2/OpenDocument-v1.2.html][OpenDocument-v1.2
+[[https://docs.oasis-open.org/office/v1.2/OpenDocument-v1.2.html][OpenDocument-v1.2
Specification]]].
#+vindex: org-odt-table-styles
@@ -18954,7 +18954,7 @@ for Python and Emacs Lisp languages.
#+cindex: @samp{noweb-ref}, header argument
Source code blocks can include references to other source code blocks,
using a noweb[fn:: For noweb literate programming details, see
-http://www.cs.tufts.edu/~nr/noweb/.] style syntax:
+https://www.cs.tufts.edu/~nr/noweb/.] style syntax:
: <<CODE-BLOCK-ID>>
@@ -22482,7 +22482,7 @@ MathJax are processed. When dvipng, dvisvgm, or
ImageMagick suite is
used to create images, any LaTeX environment is handled.
[fn:38] These are respectively available at
-[[http://sourceforge.net/projects/dvipng/]], [[http://dvisvgm.bplaced.net/]]
+[[https://sourceforge.net/projects/dvipng/]], [[http://dvisvgm.bplaced.net/]]
and from the ImageMagick suite. Choose the converter by setting the
variable ~org-preview-latex-default-process~ accordingly.
@@ -22519,7 +22519,7 @@ semantic relevance.
[fn:46] Please note that exported formulas are part of an HTML
document, and that signs such as =<=, =>=, or =&= have special
-meanings. See
[[http://docs.mathjax.org/en/latest/input/tex/html.html#tex-and-latex-in-html-documents][MathJax
TeX and LaTeX in HTML documents]].
+meanings. See
[[https://docs.mathjax.org/en/latest/input/tex/html.html#tex-and-latex-in-html-documents][MathJax
TeX and LaTeX in HTML documents]].
[fn:47] This does not allow setting different bibliography compilers
for different files. However, "smart" LaTeX compilation systems, such
diff --git a/lisp/ob-matlab.el b/lisp/ob-matlab.el
index 0ccab21686..8e4d02b2a8 100644
--- a/lisp/ob-matlab.el
+++ b/lisp/ob-matlab.el
@@ -32,7 +32,7 @@
;; matlab.el required for interactive emacs sessions and matlab-mode
;; major mode for source code editing buffer
-;; http://matlab-emacs.sourceforge.net/
+;; https://matlab-emacs.sourceforge.net/
;;; Code:
diff --git a/lisp/ob-plantuml.el b/lisp/ob-plantuml.el
index 82e9ec1156..e95db50cd5 100644
--- a/lisp/ob-plantuml.el
+++ b/lisp/ob-plantuml.el
@@ -30,7 +30,7 @@
;;; Requirements:
-;; plantuml | http://plantuml.sourceforge.net/
+;; plantuml | https://plantuml.com/
;; plantuml.jar | `org-plantuml-jar-path' should point to the jar file (when
exec mode is `jar')
;;; Code:
diff --git a/lisp/org-ctags.el b/lisp/org-ctags.el
index 62e75a1de2..c5b22b56d7 100644
--- a/lisp/org-ctags.el
+++ b/lisp/org-ctags.el
@@ -47,7 +47,7 @@
;;
;; Install org mode
;; Ensure org-ctags.el is somewhere in your emacs load path.
-;; Download and install Exuberant ctags -- "http://ctags.sourceforge.net/";
+;; Download and install Exuberant ctags -- "https://ctags.sourceforge.net/";
;; Edit your .emacs file (see next section) and load emacs.
;; To put in your init file (.emacs):
diff --git a/lisp/org-protocol.el b/lisp/org-protocol.el
index c9cd123ea0..de8a951ecc 100644
--- a/lisp/org-protocol.el
+++ b/lisp/org-protocol.el
@@ -66,7 +66,7 @@
;;
;;
;; As of March 2009 Firefox users follow the steps documented on
-;; http://kb.mozillazine.org/Register_protocol, Opera setup is described here:
+;; https://kb.mozillazine.org/Register_protocol, Opera setup is described here:
;; http://www.opera.com/support/kb/view/535/
;;
;;