diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index a1d2bb4a1963..4cd8c312e4f7 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -4,23 +4,23 @@ For **help**, **support**, **questions** and **ideas** please use **[our forum]( --- -If you're [raising a bug](https://docs.ghost.org/v1/docs/contributing#bugs) 🐛 please be sure to [include as much info as possible](https://docs.ghost.org/v1/docs/contributing#bug-template) so that we can fix it! +If you're [raising a bug](https://docs.ghost.org/docs/contributing#bugs) 🐛 please be sure to [include as much info as possible](https://docs.ghost.org/docs/contributing#bug-template) so that we can fix it! --- -If you've **got some code** ✨ you want to [pull request](https://docs.ghost.org/v1/docs/contributing#pull-requests) please use this [commit message format](https://docs.ghost.org/v1/docs/git-workflow#section-notes-on-writing-good-commit-messages) and check it passes the tests by running `grunt validate`. Thanks for helping us make Ghost better. +If you've **got some code** ✨ you want to [pull request](https://docs.ghost.org/docs/contributing#pull-requests) please use this [commit message format](https://docs.ghost.org/docs/git-workflow#section-notes-on-writing-good-commit-messages) and check it passes the tests by running `grunt validate`. Thanks for helping us make Ghost better. --- -**Our [Full Contributor Guide](https://docs.ghost.org/v1/docs/contributing)** covers everything you'll need to get started as a contributor 😁 +**Our [Full Contributor Guide](https://docs.ghost.org/docs/contributing)** covers everything you'll need to get started as a contributor 😁 *Quick Links:* - [forum](https://forum.ghost.org) - [user documentation](https://help.ghost.org) -- [themes documentation](https://themes.ghost.org/v1.23.0/) -- [api documentation](https://api.ghost.org/v1.22.0/) -- [self-hoster guide](https://docs.ghost.org/v1/) +- [themes documentation](https://themes.ghost.org) +- [api documentation](https://api.ghost.org) +- [self-hoster guide](https://docs.ghost.org/) - [community guidelines](https://ghost.org/conduct/) - [dev blog](https://blog.ghost.org) diff --git a/.github/ISSUE_TEMPLATE/--anything-else.md b/.github/ISSUE_TEMPLATE/--anything-else.md index 4c7156b63641..d3136e21eb89 100644 --- a/.github/ISSUE_TEMPLATE/--anything-else.md +++ b/.github/ISSUE_TEMPLATE/--anything-else.md @@ -15,10 +15,10 @@ Anything else should be posted to https://forum.ghost.org 👫. Alternatively, check out these resources below. Thanks! 😁. -- [Forum](https://forum.ghost.org) +- [Forum](https://forum.ghost.org/c/help) - [Theme Support](https://forum.ghost.org/c/themes) -- [Theme Docs](http://themes.ghost.org/v1.23.0/) -- [API Docs](https://api.ghost.org/v1.22.0/) +- [Theme Docs](http://themes.ghost.org/) +- [API Docs](https://api.ghost.org/) - [Feature Requests / Ideas](https://forum.ghost.org/c/Ideas) -- [Contributing Guide](https://docs.ghost.org/v1/docs/contributing) -- [Self-hoster Docs](https://docs.ghost.org/v1/) +- [Contributing Guide](https://docs.ghost.org/docs/contributing) +- [Self-hoster Docs](http://docs.ghost.org/) diff --git a/PRIVACY.md b/PRIVACY.md index a1f0dd9a9f0c..6bc39e46a832 100644 --- a/PRIVACY.md +++ b/PRIVACY.md @@ -13,7 +13,7 @@ Some official services for Ghost are enabled by default. These services connect When a new session is started, Ghost pings a Ghost.org service to check if the current version of Ghost is the latest version of Ghost. If an update is available, a notification on the About Page appears to let you know. -Ghost will collect basic anonymised usage statistics from your blog before sending the request to the service. You can disable collecting statistics using the [privacy configuration](https://docs.ghost.org/v1/docs/config#section-update-check). You will still receive notifications from the service. +Ghost will collect basic anonymised usage statistics from your blog before sending the request to the service. You can disable collecting statistics using the [privacy configuration](https://docs.ghost.org/docs/config#section-update-check). You will still receive notifications from the service. All of the information and code related to this service is available in the [update-check.js](https://github.com/TryGhost/Ghost/blob/master/core/server/update-check.js) file. diff --git a/README.md b/README.md index ae4fa2ca009c..1880dc2c509e 100644 --- a/README.md +++ b/README.md @@ -13,8 +13,8 @@ Features | Showcase | Forum | - Documentation | - Contributing | + Documentation | + Contributing | Donate | Twitter

@@ -69,7 +69,7 @@ $ npm install ghost-cli -g   -Then, if installing locally add the `local` flag to get up and running in under a minute - [Local install docs](https://docs.ghost.org/v1/docs/install-local) +Then, if installing locally add the `local` flag to get up and running in under a minute - [Local install docs](https://docs.ghost.org/docs/install-local) ``` $ ghost install local @@ -77,7 +77,7 @@ $ ghost install local   -or on a server run the full install, including automatic SSL setup using LetsEncrypt - [Production install docs](https://docs.ghost.org/v1/docs/install) +or on a server run the full install, including automatic SSL setup using LetsEncrypt - [Production install docs](https://docs.ghost.org/docs/install) ``` $ ghost install @@ -85,7 +85,7 @@ $ ghost install   -Check out our [official documentation](https://docs.ghost.org/v1/docs) for more information about our [recommended hosting stack](https://docs.ghost.org/v1/docs/hosting) & properly [upgrading Ghost](https://docs.ghost.org/v1/docs/upgrade), plus everything you need to develop your own Ghost [themes](https://themes.ghost.org/v1.25.0/docs) or work with [our API](https://api.ghost.org/v1.22.0/docs). +Check out our [official documentation](https://docs.ghost.org/docs) for more information about our [recommended hosting stack](https://docs.ghost.org/docs/hosting) & properly [upgrading Ghost](https://docs.ghost.org/docs/upgrade), plus everything you need to develop your own Ghost [themes](https://themes.ghost.org/docs) or work with [our API](https://api.ghost.org/docs).   @@ -101,7 +101,7 @@ To stay up to date with all the latest news and product updates, make sure you [ # Contributors & Advanced Developers -For anyone wishing to contribute to Ghost or to hack/customise core files we recommend following our full development setup guides: [General Contributor Guide](https://docs.ghost.org/v1/docs/contributing) | [Developer Setup Instructions](https://docs.ghost.org/v1/docs/working-with-ghost) | [Admin Client development guide](https://docs.ghost.org/v1/docs/working-with-the-admin-client) +For anyone wishing to contribute to Ghost or to hack/customise core files we recommend following our full development setup guides: [General Contributor Guide](https://docs.ghost.org/docs/contributing) | [Developer Setup Instructions](https://docs.ghost.org/docs/working-with-ghost) | [Admin Client development guide](https://docs.ghost.org/docs/working-with-the-admin-client)   diff --git a/content/themes/casper b/content/themes/casper index 5d318225f572..f31957bd0def 160000 --- a/content/themes/casper +++ b/content/themes/casper @@ -1 +1 @@ -Subproject commit 5d318225f57279569bc7f125d7157056ec586b0c +Subproject commit f31957bd0def436d13eb88055a02d3332a91dc54 diff --git a/core/client b/core/client index 512d6d82622d..2f812c4f5191 160000 --- a/core/client +++ b/core/client @@ -1 +1 @@ -Subproject commit 512d6d82622d972775f166a48ad583daac2177ff +Subproject commit 2f812c4f51919dd59b81a29b3cd9c06cfb5340ae diff --git a/core/server/api/mail.js b/core/server/api/mail.js index fdbb26ff115c..e8545d1da799 100644 --- a/core/server/api/mail.js +++ b/core/server/api/mail.js @@ -28,7 +28,7 @@ function sendMail(object) { type: 'warn', message: [ common.i18n.t('warnings.index.unableToSendEmail'), - common.i18n.t('common.seeLinkForInstructions', {link: 'https://docs.ghost.org/v1/docs/mail-config'}) + common.i18n.t('common.seeLinkForInstructions', {link: 'https://docs.ghost.org/docs/mail-config'}) ].join(' ') }] }, diff --git a/core/server/services/mail/GhostMailer.js b/core/server/services/mail/GhostMailer.js index 30cd63fc985f..0343fc99939d 100644 --- a/core/server/services/mail/GhostMailer.js +++ b/core/server/services/mail/GhostMailer.js @@ -48,7 +48,7 @@ GhostMailer.prototype.getDomain = function () { GhostMailer.prototype.send = function (message) { var self = this, to, - help = common.i18n.t('errors.api.authentication.checkEmailConfigInstructions', {url: 'https://docs.ghost.org/v1/docs/mail-config'}), + help = common.i18n.t('errors.api.authentication.checkEmailConfigInstructions', {url: 'http://docs.ghost.org/docs/mail-config'}), errorMessage = common.i18n.t('errors.mail.failedSendingEmail.error'); // important to clone message as we modify it diff --git a/core/server/update-check.js b/core/server/update-check.js index 4cd7b3896024..86403a5a1ded 100644 --- a/core/server/update-check.js +++ b/core/server/update-check.js @@ -50,7 +50,7 @@ function updateCheckError(err) { }, internal); err.context = common.i18n.t('errors.updateCheck.checkingForUpdatesFailed.error'); - err.help = common.i18n.t('errors.updateCheck.checkingForUpdatesFailed.help', {url: 'https://docs.ghost.org/v1'}); + err.help = common.i18n.t('errors.updateCheck.checkingForUpdatesFailed.help', {url: 'https://docs.ghost.org'}); common.logging.error(err); } diff --git a/core/server/web/middleware/custom-redirects.js b/core/server/web/middleware/custom-redirects.js index becc6fa4fc48..211f948797be 100644 --- a/core/server/web/middleware/custom-redirects.js +++ b/core/server/web/middleware/custom-redirects.js @@ -67,7 +67,7 @@ _private.registerRoutes = function registerRoutes() { /** * - you can extend Ghost with a custom redirects file - * - see https://github.com/TryGhost/Ghost/issues/7707 and https://docs.ghost.org/v1/docs/redirects + * - see https://github.com/TryGhost/Ghost/issues/7707 and https://docs.ghost.org/docs/redirects * - file loads synchronously, because we need to register the routes before anything else */ exports.use = function use(siteApp) {