diff --git a/README_Install_Mac.md b/README_Install_Mac.md index 26ae55ff9..d3ce3a625 100644 --- a/README_Install_Mac.md +++ b/README_Install_Mac.md @@ -15,9 +15,9 @@ Get Zammad ---------- ````shell - test -d ~/zammad/ || mkdir ~/zammad + test -d ~/zammad/ || mkdir ~/zammad cd ~/zammad/ - curl -L -O http://zammad.org/zammad-latest.tar.bz2 | tar -xj + curl -L -O http://ftp.zammad.com/zammad-latest.tar.bz2 | tar -xj ```` Install Zammad diff --git a/README_Install_Ubuntu.md b/README_Install_Ubuntu.md index 9834c0837..93dc34a87 100644 --- a/README_Install_Ubuntu.md +++ b/README_Install_Ubuntu.md @@ -53,4 +53,3 @@ ### Restart nginx as root * exit * systemctl restart nginx - diff --git a/app/assets/javascripts/app/views/facebook/app_config.jst.eco b/app/assets/javascripts/app/views/facebook/app_config.jst.eco index d9098f3e0..625d9bd8c 100644 --- a/app/assets/javascripts/app/views/facebook/app_config.jst.eco +++ b/app/assets/javascripts/app/views/facebook/app_config.jst.eco @@ -1,6 +1,6 @@

- <%- @T('The tutorial on how to manage a %s is hosted on our [online documentation](http://zammad.org/documentation/channel/facebook).', 'Facebook App') %> + <%- @T('The tutorial on how to manage a %s is hosted on our [online documentation](https://zammad.org/documentation/channel/facebook).', 'Facebook App') %>

<%- @T('Enter your %s App Keys', 'Facebook') %>

@@ -26,4 +26,4 @@ -
\ No newline at end of file + diff --git a/app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco b/app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco index 1b3e4cea5..f910cf9b1 100644 --- a/app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco @@ -7,7 +7,7 @@

Ticket Article

-
Welcome to Zammad! We want to entertain you and your whole family!
- Ticket# 10001 - erstellte 11.07.2014 + Ticket# 10001 - erstellte 11.07.2014
@@ -65,12 +65,12 @@ Welcome!
Thank you for installing Zammad.

-You will find updates and patches at http://zammad.org/. Online
-documentation is available at http://guides.zammad.org/. You can also
-use our forums at http://forums.zammad.org/
+You will find updates and patches at https://zammad.org/. Online
+documentation is available at https://zammad.org/documentation/. Get involved
+(discussions, contributing, ...) at https://zammad.org/participate.

Regards,
-The Zammad.org Project +The zammad.org Project
<%- @T('See more') %>
@@ -105,7 +105,7 @@ The Zammad -
+
@@ -649,7 +649,7 @@ - +
@@ -677,7 +677,7 @@ - + @@ -717,7 +717,7 @@ - + @@ -896,7 +896,7 @@ - +
@@ -912,7 +912,7 @@ - +
@@ -932,7 +932,7 @@ - +
@@ -944,7 +944,7 @@ - +
@@ -954,4 +954,4 @@ - \ No newline at end of file + diff --git a/app/assets/javascripts/app/views/layout_ref/ticket_zoom.jst.eco b/app/assets/javascripts/app/views/layout_ref/ticket_zoom.jst.eco index 7d0bc2ac9..cc7c063e8 100644 --- a/app/assets/javascripts/app/views/layout_ref/ticket_zoom.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/ticket_zoom.jst.eco @@ -27,7 +27,7 @@ -
Welcome to Zammad! We want to entertain you and your whole family!
- Ticket# 10001 - erstellte 11.07.2014 + Ticket# 10001 - erstellte 11.07.2014
@@ -86,12 +86,12 @@
Thank you for installing Zammad.

- You will find updates and patches at http://zammad.org/. Online
- documentation is available at http://guides.zammad.org/. You can also
- use our forums at http://forums.zammad.org/
+ You will find updates and patches at https://zammad.org/. Online
+ documentation is available at https://zammad.org/documentation/. Get involved
+ (discussions, contributing, ...) at https://zammad.org/participate.

Regards,
- The Zammad.org Project + The zammad.org Project
<%- @T('See more') %>
@@ -130,7 +130,7 @@
-
+