From a9bf4b86a923fc41d9226d00b598f578a0c0f360 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 24 Nov 2009 21:38:15 -0700 Subject: [PATCH] IGN:More calibre-ebook.com migration --- COPYRIGHT | 2 +- README | 4 ++-- resources/content_server/index.html | 4 ++-- resources/recipes/nasa.recipe | 7 +++---- setup/installer/osx/app/main.py | 2 +- setup/installer/osx/freeze.py | 2 +- setup/installer/windows/wix-template.xml | 4 ++-- setup/pypi.py | 2 +- setup/upload.py | 2 -- src/calibre/ebooks/conversion/cli.py | 2 +- src/calibre/ebooks/lrf/html/demo/demo.html | 2 +- src/calibre/gui2/convert/font_key.ui | 2 +- src/calibre/gui2/convert/xpath_wizard.ui | 2 +- src/calibre/gui2/dialogs/search.ui | 2 +- src/calibre/gui2/main.py | 15 ++++++++------- src/calibre/gui2/wizard/finish.ui | 4 ++-- src/calibre/library/cli.py | 2 +- src/calibre/library/server.py | 6 +++--- src/calibre/manual/conf.py | 2 +- src/calibre/manual/customize.rst | 2 +- src/calibre/manual/develop.rst | 2 +- src/calibre/manual/faq.rst | 9 ++++----- src/calibre/manual/news.rst | 4 +++- src/calibre/manual/templates/layout.html | 2 +- src/calibre/utils/help2man.py | 2 +- 25 files changed, 44 insertions(+), 45 deletions(-) diff --git a/COPYRIGHT b/COPYRIGHT index 1d8f7a5793..cc3214c9de 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -352,7 +352,7 @@ License: other Liberation Fonts ----------------- calibre includes a copy of the liberation fonts, available from -https://calibre.kovidgoyal.net/downloads/liberation-fonts +https://calibre-ebook.com/downloads/liberation-fonts BSD License (for all the BSD licensed code indicated above) ----------------------------------------------------------- diff --git a/README b/README index 945592e7ba..2c916fc7d7 100644 --- a/README +++ b/README @@ -4,10 +4,10 @@ devices. It can go out to the internet and fetch metadata for your books. \ It can download newspapers and convert them into e-books for convenient \ reading. It is cross platform, running on Linux, Windows and OS X. -For screenshots: https://calibre.kovidgoyal.net/wiki/Screenshots +For screenshots: https://calibre-ebook.com/demo For installation/usage instructions please see -http://calibre.kovidgoyal.net +http://calibre-ebook.com For source code access: bzr branch lp:calibre diff --git a/resources/content_server/index.html b/resources/content_server/index.html index f0ce14b3ca..3dcc093c13 100644 --- a/resources/content_server/index.html +++ b/resources/content_server/index.html @@ -7,11 +7,11 @@ - +