diff --git a/README b/README index c88d0c69..df93c4a1 100644 --- a/README +++ b/README @@ -3,7 +3,7 @@ Welcome to the ELOG package For general documentation, see the file "index.html" in the "doc" subdirectory, for installation instructions, see "adminguide.html" in the same directory, -or consult the web page http://midas.psi.ch/elog +or consult the web page http://elog.psi.ch/elog Please send all bug reports by electronic mail to: diff --git a/checklist.txt b/checklist.txt index 2c45d82a..5a20ce8c 100755 --- a/checklist.txt +++ b/checklist.txt @@ -25,7 +25,7 @@ On llc.psi.ch: - log in as ritt - git pull in elog and mxml -On midas.psi.ch: +On elog.psi.ch: - log in as root - cd ~ritt/elog @@ -44,7 +44,7 @@ On VPC6562-1: - c:\elog> svn ci -m "Version x.x.x-y" - open VS 2010 command window, build xxx-y -On midas.psi.ch: +On elog.psi.ch: - svn update - su diff --git a/doc/config.html b/doc/config.html index a021404a..0bb31638 100755 --- a/doc/config.html +++ b/doc/config.html @@ -2493,7 +2493,7 @@ Options Location = Main Building{a}, New Building{b}, Old Building{c} This specifies the default encoding for new entries. For installations where entries are normally submitted as plain text, the default can be set to 1. Set to 0 for ELCode encoding, to + "http://elog.psi.ch/elog/elcode_en.html">ELCode encoding, to 2 for HTML encoding. The default is 2, which activates the built in FCKeditor automatically for new installations. If this editor is not wanted or people are concerned about cross site scripting, diff --git a/doc/index.html b/doc/index.html index 07987a6d..acaec3df 100755 --- a/doc/index.html +++ b/doc/index.html @@ -15,10 +15,10 @@ [User's Guide]    [Administrator's Guide]    [FAQ]   - [Forum]   + [Forum]   [Wishlist]    [Contributions]   - [DEMO]   + [DEMO]   [Download] 

@@ -105,7 +105,7 @@ An additional feature is the automatic generation of a notification email messages based on a certain type or category of a logbook entry.

- Also try out the online demo + Also try out the online demo !

@@ -198,8 +198,8 @@

Here are some talks and presentations given at various occasions:

@@ -207,7 +207,7 @@
  Links  

If your are reading this documentation from your local ELOG server, - check for updates on the ELOG Home Page + check for updates on the ELOG Home Page .

diff --git a/elog.spec b/elog.spec index 93bfbbaa..276d89b1 100755 --- a/elog.spec +++ b/elog.spec @@ -6,9 +6,9 @@ Version: 3.1.3 Release: 1 License: GPL Group: Applications/Networking -Source: http://midas.psi.ch/elog/download/elog-%{version}.tar.gz +Source: http://elog.psi.ch/elog/download/elog-%{version}.tar.gz Vendor: Stefan Ritt -URL: http://midas.psi.ch/elog +URL: http://elog.psi.ch/elog BuildRoot: /tmp/%{name}-root Prefix: /usr/local BuildRequires: openssl-devel >= 0.9.8e diff --git a/elog_pad_file.xml b/elog_pad_file.xml index e0f0a7c3..94400065 100644 --- a/elog_pad_file.xml +++ b/elog_pad_file.xml @@ -77,14 +77,14 @@ - http://midas.psi.ch/elog + http://elog.psi.ch/elog - http://midas.psi.ch/elog/elog.gif - http://midas.psi.ch/elogs/forum/elog.png - http://midas.psi.ch/elog/elog_pad_file.xml + http://elog.psi.ch/elog/elog.gif + http://elog.psi.ch/elogs/forum/elog.png + http://elog.psi.ch/elog/elog_pad_file.xml - http://midas.psi.ch/elog/download/ + http://elog.psi.ch/elog/download/ diff --git a/src/elogd.c b/src/elogd.c index 35b3a299..1b88f16d 100755 --- a/src/elogd.c +++ b/src/elogd.c @@ -7766,14 +7766,14 @@ void show_upgrade_page(LOGBOOK * lbs) rsprintf("It is of course possible to change the attributes or add new ones. The new\n"); rsprintf("options in the configuration file are described under https://midas.psi.ch/elog/config.html\n"); + rsprintf("https://elog.psi.ch/elog/config.html\">https://elog.psi.ch/elog/config.html\n"); rsprintf(".\n"); rsprintf("\n\n"); rsprintf("
\n"); rsprintf("
\n"); - rsprintf("S. Ritt, 18 October 2001"); + rsprintf("S. Ritt, 18 October 2001"); rsprintf("
"); show_bottom_text(lbs); rsprintf("\r\n"); @@ -8287,7 +8287,7 @@ void show_bottom_text(LOGBOOK * lbs) } else /* add little logo */ rsprintf - ("
ELOG V%s-%s
", + ("
ELOG V%s-%s
", loc("Goto ELOG home page"), VERSION, git_revision()); } @@ -8341,7 +8341,7 @@ void show_bottom_text_login(LOGBOOK * lbs) } else /* add little logo */ rsprintf - ("
ELOG V%s-%s
", + ("
ELOG V%s-%s
", loc("Goto ELOG home page"), VERSION, git_revision()); } @@ -12776,7 +12776,7 @@ void show_admin_page(LOGBOOK * lbs, char *top_group) rsprintf("\n"); /* put link for config page */ - rsprintf("
Syntax Help"); + rsprintf("
Syntax Help"); rsprintf("\n"); @@ -28029,7 +28029,7 @@ void interprete(char *lbook, char *path) strlcat(file_name, ".html", sizeof(file_name)); f = fopen(file_name, "r"); if (f == NULL) - redirect(lbs, "https://midas.psi.ch/elog/eloghelp_english.html"); + redirect(lbs, "https://elog.psi.ch/elog/eloghelp_english.html"); else { fclose(f); send_file_direct(file_name); @@ -28052,7 +28052,7 @@ void interprete(char *lbook, char *path) strlcat(file_name, ".html", sizeof(file_name)); f = fopen(file_name, "r"); if (f == NULL) - redirect(lbs, "https://midas.psi.ch/elog/elcode_english.html"); + redirect(lbs, "https://elog.psi.ch/elog/elcode_english.html"); else { fclose(f); send_file_direct(file_name);