diff --git a/Changelog.md b/Changelog.md index e5469b187..c73a927f6 100644 --- a/Changelog.md +++ b/Changelog.md @@ -457,7 +457,7 @@ everything is set up. * Fix missing X-Frame headers [#3739](https://github.com/diaspora/diaspora/pull/3739) * Fix image path for padlocks [#3682](https://github.com/diaspora/diaspora/pull/3682) -* Fix posting to Facebook and Tumblr. Have a look at the updated [services guide](https://github.com/diaspora/diaspora/wiki/Howto-setup-services) for new Facebook instructions. +* Fix posting to Facebook and Tumblr. Have a look at the updated [services guide](http://wiki.diasporafoundation.org/Integrating_Other_Social_Networks) for new Facebook instructions. * Fix overflow button in mobile reset password. [#3697](https://github.com/diaspora/diaspora/pull/3697) * Fix issue with interacted_at in post fetcher. [#3607](https://github.com/diaspora/diaspora/pull/3607) * Fix error with show post Community Spotlight. [#3658](https://github.com/diaspora/diaspora/pull/3658) @@ -519,7 +519,7 @@ Fix exception when the root of a reshare of a reshare got deleted [#3546](https: ## New configuration system! -Copy over config/diaspora.yml.example to config/diaspora.yml and migrate your settings! An updated Heroku guide including basic hints on howto migrate is [here](https://github.com/diaspora/diaspora/wiki/Installing-on-heroku). +Copy over config/diaspora.yml.example to config/diaspora.yml and migrate your settings! An updated Heroku guide including basic hints on howto migrate is [here](http://wiki.diasporafoundation.org/Installing_on_Heroku). The new configuration system allows all possible settings to be overriden by environment variables. This makes it possible to deploy heroku without checking any credentials into git. Read the top of `config/diaspora.yml.example` for an explanation on how to convert the setting names to environment variables. diff --git a/app/views/shared/_right_sections.html.haml b/app/views/shared/_right_sections.html.haml index 9f3d510d3..4e62a939c 100644 --- a/app/views/shared/_right_sections.html.haml +++ b/app/views/shared/_right_sections.html.haml @@ -20,7 +20,7 @@ .content != t('aspects.index.new_here.follow', :link => link_to("#"+t('shared.publisher.new_user_prefill.newhere'), tag_path(:name => t('shared.publisher.new_user_prefill.newhere')))) %br - = link_to(t('aspects.index.new_here.learn_more'), "https://github.com/diaspora/diaspora/wiki/Welcoming-Committee") + = link_to(t('aspects.index.new_here.learn_more'), "http://wiki.diasporafoundation.org/Welcoming_Committee") .section .title @@ -40,7 +40,7 @@ %br %br %p - != t('aspects.index.help.tutorials_wiki_and_forum', :tutorial => link_to("Diasporial" , "http://diasporial.com/tutorials", :target => '_blank'), :wiki => link_to('Wiki','http://github.com/diaspora/diaspora/wiki', :target => '_blank'), :forum => link_to("Forum", "http://www.diasporaforum.org/", :target => '_blank')) + != t('aspects.index.help.tutorials_wiki_and_forum', :tutorial => link_to("Diasporial" , "http://diasporial.com/tutorials", :target => '_blank'), :wiki => link_to('Wiki','http://wiki.diasporafoundation.org', :target => '_blank'), :forum => link_to("Forum", "http://www.diasporaforum.org/", :target => '_blank')) %p != t('aspects.index.help.email_feedback', :link => link_to(t('aspects.index.help.email_link'), "mailto:feedback@joindiaspora.com")) diff --git a/config/locales/README.md b/config/locales/README.md index 4d8577180..a452c8979 100644 --- a/config/locales/README.md +++ b/config/locales/README.md @@ -1 +1 @@ -# Please read the [translation guide](https://github.com/diaspora/diaspora/wiki/How-to-contribute-translations) before contributing! +# Please read the [translation guide](http://wiki.diasporafoundation.org/Contribute_translations) before contributing! diff --git a/config/locales/inflections/README.md b/config/locales/inflections/README.md index f0b64f024..1bf552a3e 100644 --- a/config/locales/inflections/README.md +++ b/config/locales/inflections/README.md @@ -1,2 +1,2 @@ This directory contains the definitions for the [i18n-inflector gem](https://github.com/siefca/i18n-inflector). -Also, look up for our wiki on [How to contribute translations](https://github.com/diaspora/diaspora/wiki/How-to-contribute-translations) for more information. +Also, look up for our wiki on [How to contribute translations](http://wiki.diasporafoundation.org/Contribute_translations) for more information. diff --git a/config/routes.rb b/config/routes.rb index 35174d99d..93ca0ae85 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -210,7 +210,7 @@ Diaspora::Application.routes.draw do get 'mobile/toggle', :to => 'home#toggle_mobile', :as => 'toggle_mobile' #Protocol Url - get 'protocol' => redirect("https://github.com/diaspora/diaspora/wiki/Diaspora%27s-federation-protocol") + get 'protocol' => redirect("http://wiki.diasporafoundation.org/Federation_Protocol_Overview") # Startpage root :to => 'home#show' diff --git a/public/default.html b/public/default.html index e0c6151a7..5ff3091b7 100644 --- a/public/default.html +++ b/public/default.html @@ -135,7 +135,7 @@