Merge branch 'maint'

lisp/org-entities.el

@@ -203,8 +203,8 @@ packages to be loaded, add these packages to `org-latex-packages-alist'."
      ("upsih" "\\Upsilon" t "ϒ" "upsilon" "upsilon" "ϒ")
      ("upsilon" "\\upsilon" t "υ" "upsilon" "upsilon" "υ")
      ("Phi" "\\Phi" t "Φ" "Phi" "Phi" "Φ")
-     ("phi" "\\phi" t "φ" "phi" "phi" "φ")
-     ("varphi" "\\varphi" t "ϕ" "varphi" "varphi" "ɸ")
+     ("phi" "\\phi" t "φ" "phi" "phi" "ɸ")
+     ("varphi" "\\varphi" t "ϕ" "varphi" "varphi" "φ")
      ("Chi" "X" nil "Χ" "Chi" "Chi" "Χ")
      ("chi" "\\chi" t "χ" "chi" "chi" "χ")
      ("acutex" "\\acute x" t "´x" "'x" "'x" "𝑥́")