Refactoring everything Bioforsk -> NIBIO

a2583418 · Tor-Einar Skog · 78af6301 · a2583418 · a2583418 · a2583418
Commit a2583418 authored 10 years ago by Tor-Einar Skog
--- a/cerealblotchmodels/urls.py
+++ b/cerealblotchmodels/urls.py
 #
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
 # 
 # This file is part of VIPSWeb.
 # VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the Bioforsk Open Source License as published by 
-# Bioforsk, either version 1 of the License, or (at your option) any
+# it under the terms of the NIBIO Open Source License as published by 
+# NIBIO, either version 1 of the License, or (at your option) any
 # later version.
 # 
 # VIPSWeb is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
 #
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb.  If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
 # 
 from django.conf.urls import patterns, url
 from cerealblotchmodels import views

--- a/common/middleware/whodid.py
+++ b/common/middleware/whodid.py
 """
 #
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>
 # 
 # This file is part of VIPSWeb.
 # VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the Bioforsk Open Source License as published by 
-# Bioforsk, either version 1 of the License, or (at your option) any
+# it under the terms of the NIBIO Open Source License as published by 
+# NIBIO, either version 1 of the License, or (at your option) any
 # later version.
 # 
 # VIPSWeb is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
 #
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb.  If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
 # 
 """
 """

--- a/common/util.py
+++ b/common/util.py
 # coding: utf-8
 #
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
 # 
 # This file is part of VIPSWeb.
 # VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the Bioforsk Open Source License as published by 
-# Bioforsk, either version 1 of the License, or (at your option) any
+# it under the terms of the NIBIO Open Source License as published by 
+# NIBIO, either version 1 of the License, or (at your option) any
 # later version.
 # 
 # VIPSWeb is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
 #
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb.  If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
 # 

-# Author: Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+# Author: Tor-Einar Skog <tor-einar.skog@nibio.no>

 from datetime import datetime


--- a/forecasts/admin.py
+++ b/forecasts/admin.py
 #
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
 # 
 # This file is part of VIPSWeb.
 # VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the Bioforsk Open Source License as published by 
-# Bioforsk, either version 1 of the License, or (at your option) any
+# it under the terms of the NIBIO Open Source License as published by 
+# NIBIO, either version 1 of the License, or (at your option) any
 # later version.
 # 
 # VIPSWeb is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
 #
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb.  If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
 # 
 from django.contrib import admin
 from forecasts.models import ResultParameter, MeasurementUnit, ModelGraphParameter, HighChartsType

--- a/forecasts/locale/bg/LC_MESSAGES/django.po
+++ b/forecasts/locale/bg/LC_MESSAGES/django.po
-#    Copyright (C) 2014 Bioforsk
+#    Copyright (C) 2014 NIBIO
 #
 #    This file is part of VIPSWeb
 #

--- a/forecasts/locale/nb/LC_MESSAGES/django.po
+++ b/forecasts/locale/nb/LC_MESSAGES/django.po
-#    Copyright (C) 2014 Bioforsk
+#    Copyright (C) 2014 NIBIO
 #    
 #    This file is part of VIPSWeb
 #
@@ -14,7 +14,7 @@
 #
 #    You should have received a copy of the GNU Affero General Public License
 #    along with VIPSWeb.  If not, see <http://www.gnu.org/licenses/>.
-# Tor-Einar Skog <tor-einar.skog@bioforsk.no>, 2013.
+# Tor-Einar Skog <tor-einar.skog@nibio.no>, 2013.
 #
 #, fuzzy
 msgid ""

--- a/forecasts/models.py
+++ b/forecasts/models.py
 # coding: utf-8
 #
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
 # 
 # This file is part of VIPSWeb.
 # VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the Bioforsk Open Source License as published by 
-# Bioforsk, either version 1 of the License, or (at your option) any
+# it under the terms of the NIBIO Open Source License as published by 
+# NIBIO, either version 1 of the License, or (at your option) any
 # later version.
 # 
 # VIPSWeb is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
 #
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb.  If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
 # 

 from datetime import datetime

--- a/forecasts/templates/forecasts/detail.html
+++ b/forecasts/templates/forecasts/detail.html
@@ -2,21 +2,21 @@
 {% comment %}

 #
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
 # 
 # This file is part of VIPSWeb.
 # VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the Bioforsk Open Source License as published by 
-# Bioforsk, either version 1 of the License, or (at your option) any
+# it under the terms of the NIBIO Open Source License as published by 
+# NIBIO, either version 1 of the License, or (at your option) any
 # later version.
 # 
 # VIPSWeb is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
 #
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb.  If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
 # 
 # @author: Tor-Einar Skog 
 

--- a/forecasts/templates/forecasts/detail_error.html
+++ b/forecasts/templates/forecasts/detail_error.html
@@ -2,21 +2,21 @@
 {% comment %}

 #
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
 # 
 # This file is part of VIPSWeb.
 # VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the Bioforsk Open Source License as published by 
-# Bioforsk, either version 1 of the License, or (at your option) any
+# it under the terms of the NIBIO Open Source License as published by 
+# NIBIO, either version 1 of the License, or (at your option) any
 # later version.
 # 
 # VIPSWeb is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
 #
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb.  If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
 # 
 # @author: Tor-Einar Skog 
 

--- a/forecasts/templates/forecasts/index.html
+++ b/forecasts/templates/forecasts/index.html
@@ -3,21 +3,21 @@
 {% comment %}

 #
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
 # 
 # This file is part of VIPSWeb.
 # VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the Bioforsk Open Source License as published by 
-# Bioforsk, either version 1 of the License, or (at your option) any
+# it under the terms of the NIBIO Open Source License as published by 
+# NIBIO, either version 1 of the License, or (at your option) any
 # later version.
 # 
 # VIPSWeb is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
 #
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb.  If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
 # 
 
 {% endcomment %}

--- a/forecasts/templates/models/detail.html
+++ b/forecasts/templates/models/detail.html
 {% extends "base.html" %}
 {% comment %}
 #
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
 # 
 # This file is part of VIPSWeb.
 # VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the Bioforsk Open Source License as published by 
-# Bioforsk, either version 1 of the License, or (at your option) any
+# it under the terms of the NIBIO Open Source License as published by 
+# NIBIO, either version 1 of the License, or (at your option) any
 # later version.
 # 
 # VIPSWeb is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
 #
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb.  If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
 # 
 {% endcomment %}
 {% load i18n %}

--- a/forecasts/templates/models/index.html
+++ b/forecasts/templates/models/index.html
 {% extends "base.html" %}
 {% comment %}
 #
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
 # 
 # This file is part of VIPSWeb.
 # VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the Bioforsk Open Source License as published by 
-# Bioforsk, either version 1 of the License, or (at your option) any
+# it under the terms of the NIBIO Open Source License as published by 
+# NIBIO, either version 1 of the License, or (at your option) any
 # later version.
 # 
 # VIPSWeb is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
 #
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb.  If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
 # 
 {% endcomment %}
 {% load i18n %}

--- a/forecasts/templates/models/modelLocalNames.js
+++ b/forecasts/templates/models/modelLocalNames.js
 /*
- * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
 * 
 * This file is part of VIPSWeb.
 * VIPSWeb is free software: you can redistribute it and/or modify
- * it under the terms of the Bioforsk Open Source License as published by 
- * Bioforsk, either version 1 of the License, or (at your option) any
+ * it under the terms of the NIBIO Open Source License as published by 
+ * NIBIO, either version 1 of the License, or (at your option) any
 * later version.
 * 
 * VIPSWeb is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * Bioforsk Open Source License for more details.
+ * NIBIO Open Source License for more details.
 * 
- * You should have received a copy of the Bioforsk Open Source License
- * along with VIPSWeb.  If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
 * 
 */

@@ -21,8 +21,8 @@
 * Include this in your HTML page if you want to avoid fetching local names 
 * of the models asynchronously from VIPSLogic
 *
- * @copyright 2014 <a href="http://www.bioforsk.no/">Bioforsk</a>
- * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+ * @copyright 2014 <a href="http://www.nibio.no/">NIBIO</a>
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
 */
 {% load forecast_extras %}
 var modelLocalNames= {};

--- a/forecasts/templatetags/forecast_extras.py
+++ b/forecasts/templatetags/forecast_extras.py
 #
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
 # 
 # This file is part of VIPSWeb.
 # VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the Bioforsk Open Source License as published by 
-# Bioforsk, either version 1 of the License, or (at your option) any
+# it under the terms of the NIBIO Open Source License as published by 
+# NIBIO, either version 1 of the License, or (at your option) any
 # later version.
 # 
 # VIPSWeb is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
 #
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb.  If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
 # 
 from django import template


--- a/forecasts/urls.py
+++ b/forecasts/urls.py
 #
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
 # 
 # This file is part of VIPSWeb.
 # VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the Bioforsk Open Source License as published by 
-# Bioforsk, either version 1 of the License, or (at your option) any
+# it under the terms of the NIBIO Open Source License as published by 
+# NIBIO, either version 1 of the License, or (at your option) any
 # later version.
 # 
 # VIPSWeb is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
 #
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb.  If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
 # 
 from django.conf.urls import patterns, url
 from django.views.decorators.cache import cache_page

--- a/forecasts/views.py
+++ b/forecasts/views.py
 #
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
 # 
 # This file is part of VIPSWeb.
 # VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the Bioforsk Open Source License as published by 
-# Bioforsk, either version 1 of the License, or (at your option) any
+# it under the terms of the NIBIO Open Source License as published by 
+# NIBIO, either version 1 of the License, or (at your option) any
 # later version.
 # 
 # VIPSWeb is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
 #
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb.  If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
 #
-# @author: Tor-Einar Skog <tor-einar.skog@bioforsk.no> 
+# @author: Tor-Einar Skog <tor-einar.skog@nibio.no> 


 from django.http import HttpResponse

--- a/information/admin.py
+++ b/information/admin.py
 #
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
 # 
 # This file is part of VIPSWeb.
 # VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the Bioforsk Open Source License as published by 
-# Bioforsk, either version 1 of the License, or (at your option) any
+# it under the terms of the NIBIO Open Source License as published by 
+# NIBIO, either version 1 of the License, or (at your option) any
 # later version.
 # 
 # VIPSWeb is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
 #
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb.  If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
 # 

 from django.contrib import admin

--- a/information/urls.py
+++ b/information/urls.py
 #
-# Copyright (c) 2015 Bioforsk <http://www.bioforsk.no/>. 
+# Copyright (c) 2015 NIBIO <http://www.nibio.no/>. 
 # 
 # This file is part of VIPSWeb.
 # VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the Bioforsk Open Source License as published by 
-# Bioforsk, either version 1 of the License, or (at your option) any
+# it under the terms of the NIBIO Open Source License as published by 
+# NIBIO, either version 1 of the License, or (at your option) any
 # later version.
 # 
 # VIPSWeb is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
 #
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb.  If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
 # 

 from django.conf.urls import patterns, url

--- a/information/views.py
+++ b/information/views.py
 #
-# Copyright (c) 2015 Bioforsk <http://www.bioforsk.no/>. 
+# Copyright (c) 2015 NIBIO <http://www.nibio.no/>. 
 # 
 # This file is part of VIPSWeb.
 # VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the Bioforsk Open Source License as published by 
-# Bioforsk, either version 1 of the License, or (at your option) any
+# it under the terms of the NIBIO Open Source License as published by 
+# NIBIO, either version 1 of the License, or (at your option) any
 # later version.
 # 
 # VIPSWeb is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
 #
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb.  If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
 # 

 from django.shortcuts import render

--- a/messages/admin.py
+++ b/messages/admin.py
 #
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
 # 
 # This file is part of VIPSWeb.
 # VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the Bioforsk Open Source License as published by 
-# Bioforsk, either version 1 of the License, or (at your option) any
+# it under the terms of the NIBIO Open Source License as published by 
+# NIBIO, either version 1 of the License, or (at your option) any
 # later version.
 # 
 # VIPSWeb is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
 #
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb.  If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
 # 

 """