diff --git a/manual/develop.rst b/manual/develop.rst
index 057e3b8a9a..78d37a6fef 100644
--- a/manual/develop.rst
+++ b/manual/develop.rst
@@ -19,7 +19,7 @@ Design philosophy
 |app| has its roots in the Unix world, which means that its design is highly modular.
 The modules interact with each other via well defined interfaces. This makes adding new features and fixing
 bugs in |app| very easy, resulting in a frenetic pace of development. Because of its roots, |app| has a
-comprehensive command line interface for all its functions, documented in :ref:`cli`.
+comprehensive command line interface for all its functions, documented in :doc:`generated/|lang|/cli-index`.
 
 The modular design of |app| is expressed via ``Plugins``. There is a :ref:`tutorial <customize>` on writing |app| plugins.
 For example, adding support for a new device to |app| typically involves writing less than a 100 lines of code in the form of
diff --git a/src/calibre/ebooks/oeb/polish/main.py b/src/calibre/ebooks/oeb/polish/main.py
index f359c2afa8..662432409b 100644
--- a/src/calibre/ebooks/oeb/polish/main.py
+++ b/src/calibre/ebooks/oeb/polish/main.py
@@ -53,7 +53,7 @@ changes needed for the desired effect.</p>
 <p>You should use this tool as the last step in your ebook creation process.</p>
 {0}
 <p>Note that polishing only works on files in the %s formats.</p>\
-''')%_(' or ').join('<b>%s</b>'%x for x in SUPPORTED),
+''')%_(' or ').join(sorted('<b>%s</b>'%x for x in SUPPORTED)),
 
 'embed': _('''\
 <p>Embed all fonts that are referenced in the document and are not already embedded.