update qgis.org links

wuqi · Feb 7, 2014 · 5397dfe · 5397dfe
1 parent 1bf33b5
commit 5397dfe
Show file tree

Hide file tree

Showing 22 changed files with 69 additions and 47 deletions.
diff --git a/CODING b/CODING
@@ -689,10 +689,10 @@ and what is in the master branch.
 
 QGIS developers are busy folk. We do scan the incoming patches on bug reports
 but sometimes we miss things.  Don't be offended or alarmed. Try to identify a
-developer to help you - using the Project Organigram (http://www.qgis.org/wiki/Project_Organigram) and contact them
+developer to help you - using the Technical Resources (http://qgis.org/en/site/getinvolved/governance/organisation/governance.html#community-resources) and contact them
 asking them if they can look at your patch. If you don't get any response, you
 can escalate your query to one of the Project Steering Committee members
-(contact details also available on the Project Organigram).
+(contact details also available in the Technical Resources).
 
 
     2.7.5. Due Diligence

diff --git a/INSTALL b/INSTALL
@@ -1,10 +1,10 @@
 QGIS
 Building QGIS from source - step by step
-Saturday January 25, 2014
+Friday February 07, 2014
 
 
-Last Updated: Saturday January 25, 2014
-Last Change : Thursday November 21, 2013
+Last Updated: Friday February 07, 2014
+Last Change : Friday February 07, 2014
 
 
   1. Introduction
@@ -52,7 +52,7 @@ QGIS. The software and hardware descriptions named in this
 document are in most cases registered trademarks and are therefore subject 
 to the legal requirements. QGIS is subject to the GNU General Public 
 License. Find more information on the QGIS Homepage:
-http://www.qgis.org
+http://qgis.org
 
 The details, that are given in this document have been written and verified 
 to the best of knowledge and responsibility of the editors. Nevertheless, 
@@ -62,13 +62,13 @@ any responsibility or liability for failures and their consequences. You are
 always welcome for indicating possible mistakes.
 
 You can download this document as part of the QGIS 'User and 
-Installation Guide' in HTML and PDF format via http://www.qgis.org. A current 
+Installation Guide' in HTML and PDF format via http://qgis.org. A current 
 version is also available at:
 http://htmlpreview.github.io/?https://raw.github.com/qgis/QGIS/master/doc/INSTALL.html
 
 Translations of this document can also be downloaded at the documentation area 
-of the QGIS project at http://www.qgis.org. More information is 
-available via http://wiki.qgis.org/qgiswiki/DocumentationWritersCorner. 
+of the QGIS project at http://qgis.org. More information is 
+available via http://qgis.org/en/site/getinvolved/governance/organisation/governance.html#community-resources. 
 
 Please visit http://qgis.org for information on joining our mailing lists 
 and getting involved in the project further.

diff --git a/doc/CODING.html b/doc/CODING.html
@@ -931,10 +931,10 @@ <H3>2.7.4. Getting your patch noticed</H3>
 <P>
 QGIS developers are busy folk. We do scan the incoming patches on bug reports
 but sometimes we miss things.  Don't be offended or alarmed. Try to identify a
-developer to help you - using the <A HREF="http://www.qgis.org/wiki/Project_Organigram">Project Organigram</A> and contact them
+developer to help you - using the <A HREF="http://qgis.org/en/site/getinvolved/governance/organisation/governance.html#community-resources">Technical Resources</A> and contact them
 asking them if they can look at your patch. If you don't get any response, you
 can escalate your query to one of the Project Steering Committee members
-(contact details also available on the Project Organigram).
+(contact details also available in the Technical Resources).
 </P>
 
 <A NAME="toc45"></A>

diff --git a/doc/CODING.t2t b/doc/CODING.t2t
@@ -657,10 +657,10 @@ and what is in the master branch.
 
 QGIS developers are busy folk. We do scan the incoming patches on bug reports
 but sometimes we miss things.  Don't be offended or alarmed. Try to identify a
-developer to help you - using the [Project Organigram http://www.qgis.org/wiki/Project_Organigram] and contact them
+developer to help you - using the [Technical Resources http://qgis.org/en/site/getinvolved/governance/organisation/governance.html#community-resources] and contact them
 asking them if they can look at your patch. If you don't get any response, you
 can escalate your query to one of the Project Steering Committee members
-(contact details also available on the Project Organigram).
+(contact details also available in the Technical Resources).
 
 === Due Diligence ===
 

diff --git a/doc/DONORS b/doc/DONORS
@@ -11,4 +11,4 @@
 # -------------------------------------------------------
 #
 # ALWAYS USE UTF-8 WHEN WRITING THIS FILE!
-See:|http://qgis.org/en/sponsorship/donors.html
+See:|http://qgis.org/en/site/about/sponsorship.html#list-of-donors
diff --git a/doc/INSTALL.html b/doc/INSTALL.html
@@ -77,13 +77,13 @@
 <DIV CLASS="header" ID="header">
 <H1>QGIS</H1>
 <H2>Building QGIS from source - step by step</H2>
-<H3>Saturday January 25, 2014</H3>
+<H3>Friday February 07, 2014</H3>
 </DIV>
 
 <DIV CLASS="body" ID="body">
 <P>
-Last Updated: Saturday January 25, 2014
-Last Change : Thursday November 21, 2013
+Last Updated: Friday February 07, 2014
+Last Change : Friday February 07, 2014
 </P>
 <DIV CLASS="toc">
 
@@ -144,7 +144,7 @@ <H1>1. Introduction</H1>
 document are in most cases registered trademarks and are therefore subject 
 to the legal requirements. QGIS is subject to the GNU General Public 
 License. Find more information on the QGIS Homepage:
-<A HREF="http://www.qgis.org">http://www.qgis.org</A>
+<A HREF="http://qgis.org">http://qgis.org</A>
 </P>
 <P>
 The details, that are given in this document have been written and verified 
@@ -156,14 +156,14 @@ <H1>1. Introduction</H1>
 </P>
 <P>
 You can download this document as part of the QGIS 'User and 
-Installation Guide' in HTML and PDF format via <A HREF="http://www.qgis.org">http://www.qgis.org</A>. A current 
+Installation Guide' in HTML and PDF format via <A HREF="http://qgis.org">http://qgis.org</A>. A current 
 version is also available at:
 <A HREF="http://htmlpreview.github.io/?https://raw.github.com/qgis/QGIS/master/doc/INSTALL.html">http://htmlpreview.github.io/?https://raw.github.com/qgis/QGIS/master/doc/INSTALL.html</A>
 </P>
 <P>
 Translations of this document can also be downloaded at the documentation area 
-of the QGIS project at <A HREF="http://www.qgis.org">http://www.qgis.org</A>. More information is 
-available via <A HREF="http://wiki.qgis.org/qgiswiki/DocumentationWritersCorner">http://wiki.qgis.org/qgiswiki/DocumentationWritersCorner</A>. 
+of the QGIS project at <A HREF="http://qgis.org">http://qgis.org</A>. More information is 
+available via <A HREF="http://qgis.org/en/site/getinvolved/governance/organisation/governance.html#community-resources.">http://qgis.org/en/site/getinvolved/governance/organisation/governance.html#community-resources.</A> 
 </P>
 <P>
 Please visit <A HREF="http://qgis.org">http://qgis.org</A> for information on joining our mailing lists 

diff --git a/doc/INSTALL.t2t b/doc/INSTALL.t2t
@@ -76,7 +76,7 @@ QGIS. The software and hardware descriptions named in this
 document are in most cases registered trademarks and are therefore subject 
 to the legal requirements. QGIS is subject to the GNU General Public 
 License. Find more information on the QGIS Homepage:
-http://www.qgis.org
+http://qgis.org
 
 The details, that are given in this document have been written and verified 
 to the best of knowledge and responsibility of the editors. Nevertheless, 
@@ -86,13 +86,13 @@ any responsibility or liability for failures and their consequences. You are
 always welcome for indicating possible mistakes.
 
 You can download this document as part of the QGIS 'User and 
-Installation Guide' in HTML and PDF format via http://www.qgis.org. A current 
+Installation Guide' in HTML and PDF format via http://qgis.org. A current 
 version is also available at:
 http://htmlpreview.github.io/?https://raw.github.com/qgis/QGIS/master/doc/INSTALL.html
 
 Translations of this document can also be downloaded at the documentation area 
-of the QGIS project at http://www.qgis.org. More information is 
-available via http://wiki.qgis.org/qgiswiki/DocumentationWritersCorner. 
+of the QGIS project at http://qgis.org. More information is 
+available via http://qgis.org/en/site/getinvolved/governance/organisation/governance.html#community-resources. 
 
 Please visit http://qgis.org for information on joining our mailing lists 
 and getting involved in the project further.

diff --git a/doc/SPONSORS b/doc/SPONSORS
@@ -13,6 +13,6 @@
 # ALWAYS USE UTF-8 WHEN WRITING THIS FILE!
 #
 Please consider sponsoring the development of QGIS.
-See: http://qgis.org/en/sponsorship.html
+See: http://qgis.org/en/site/getinvolved/governance/sponsorship/sponsorship.html
 
-See: http://qgis.org/en/sponsorship/sponsors.html for an updated list of sponsors.
+See: http://qgis.org/en/site/about/sponsorship.html#list-of-sponsors for an updated list of sponsors.
diff --git a/doc/index.dox b/doc/index.dox
@@ -34,7 +34,7 @@ website:
 \section index_maillist Mailing Lists
 <ul>
 <li>For support we encourage you to join our <a
-href="http://qgis.org/en/community/mailing-lists.html">mailing lists</a> for
+href="http://qgis.org/en/site/forusers/support.html#mailing-lists">mailing lists</a> for
 developers.</li> </ul>
 
 \section index_bugs Bug Reporting

diff --git a/doc/index.html b/doc/index.html
@@ -11,7 +11,7 @@
   <td valign="center">
     <span class="header">QGIS Documentation</span><br>
     <span class="subheader">Use Help inside functions or:</span><br>
-    <span class="warning">You can find a <a href="http://www.qgis.org/en/documentation/manuals.html">PDF manual of the current version</a> on the QGIS website.</span>
+    <span class="warning">You can find a <a href="http://qgis.org/en/docs/index.html">PDF manual of the current version</a> on the QGIS website.</span>
   </td>
 </tr>
 </table>

diff --git a/images/icons/sponsor_medals/README b/images/icons/sponsor_medals/README
@@ -1,2 +1,2 @@
 For use in QGIS websites you also find the medals in 
-http://www.qgis.org/images/sponsors/
+https://github.com/qgis/QGIS/tree/master/images/sponsors/
diff --git a/ms-windows/QGIS-Installer.nsi b/ms-windows/QGIS-Installer.nsi
@@ -45,8 +45,8 @@ RequestExecutionLevel admin
 ;Publisher variables
 
 !define PUBLISHER "QGIS Development Team"
-!define WEB_SITE "http://www.qgis.org"
-!define WIKI_PAGE "http://wiki.qgis.org/qgiswiki"
+!define WEB_SITE "http://qgis.org"
+!define WIKI_PAGE "http://qgis.org/en/docs/"
 
 ;----------------------------------------------------------------------------------------------------------------------------
 

diff --git a/python/console/console_sci.py b/python/console/console_sci.py
@@ -591,9 +591,9 @@ def runCommand(self, cmd):
         self.updateHistory(cmd)
         if cmd in ('_pyqgis', '_api'):
             if cmd == '_pyqgis':
-                webbrowser.open( "http://www.qgis.org/pyqgis-cookbook/" )
+                webbrowser.open( "http://qgis.org/pyqgis-cookbook/" )
             elif cmd == '_api':
-                webbrowser.open( "http://www.qgis.org/api/" )
+                webbrowser.open( "http://qgis.org/api/" )
             more = False
         else:
             self.buffer.append(cmd)

diff --git a/python/plugins/db_manager/README b/python/plugins/db_manager/README
@@ -9,7 +9,7 @@ In this moment DB Manager supports the following DBMS backends:
 
 
 For more info about the project, see at the wiki page:
-    http://www.qgis.org/wiki/DB_Manager_plugin_GSoC_2011
+    http://qgis.org/wiki/DB_Manager_plugin_GSoC_2011
 
 or visit my GitHub repository:
     https://github.com/brushtyler/db_manager

diff --git a/scripts/redirects.pl b/scripts/redirects.pl
@@ -0,0 +1,22 @@
+#!/usr/bin/perl -i.bak -p
+
+s%www.qgis.org%qgis.org%g;
+
+s%/en/commercial-support.html%/de/site/forusers/commercial_support.html%g;
+s%/en/community/mailing-lists.html%/en/site/forusers/support.html#mailing-lists%g;
+s%/en/community/qgis-case-studies.html%/en/site/about/case_studies/index.html%g;
+s%/en/documentation/manuals.html%/en/docs/index.html%g;
+s%/en/sponsorship.html%/en/site/getinvolved/governance/sponsorship/sponsorship.html%g;
+s%/en/sponsorship/donors.html%/en/site/about/sponsorship.html#list-of-donors%g;
+s%/en/sponsorship/sponsors.html%/en/site/about/sponsorship.html#list-of-sponsors%g;
+s%/en/sponsorship/donors.html%en/site/about/sponsorship.html#list-of-donors%g;
+
+s%/de/gemeinschaft/fallstudien.html%/de/site/about/case_studies/index.html%g;
+s%/de/gemeinschaft/mailinglisten.html%/de/site/forusers/support.html#mailing-lists%g;
+s%/de/kommerzieller-support.html%/de/site/forusers/commercial_support.html%g;
+s%/de/sponsoring.html%/de/site/getinvolved/governance/sponsorship/sponsorship.html%g;
+
+s%/fr/sponsorship.html%/fr/site/getinvolved/governance/sponsorship/sponsorship.html%g;
+
+s%/wiki/GUI_Translation%/en/site/getinvolved/translate.html#howto-translate-gui%g;
+s%/qgiswiki/DocumentationWritersCorner%/en/site/getinvolved/governance/organisation/governance.html#community-resources%g;
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -7206,7 +7206,7 @@ void QgisApp::apiDocumentation()
 
 void QgisApp::supportProviders()
 {
-  openURL( tr( "http://www.qgis.org/en/commercial-support.html" ), false );
+  openURL( tr( "http://qgis.org/de/site/forusers/commercial_support.html" ), false );
 }
 
 void QgisApp::helpQgisHomePage()

diff --git a/src/app/qgsabout.cpp b/src/app/qgsabout.cpp
@@ -130,8 +130,8 @@ void QgsAbout::init()
     QString donorsHTML = ""
                          + tr( "<p>For a list of individuals and institutions who have contributed "
                                "money to fund QGIS development and other project costs see "
-                               "<a href=\"http://qgis.org/en/sponsorship/donors.html\">"
-                               "http://qgis.org/en/sponsorship/donors.html</a></p>" );
+                               "<a href=\"http://qgis.org/en/site/about/sponsorship.html#list-of-donors\">"
+                               "http://qgis.org/en/site/about/sponsorship.html#list-of-donors</a></p>" );
 #if 0
     QString website;
     QTextStream donorsStream( &donorsFile );

diff --git a/src/app/qgstipfactory.cpp b/src/app/qgstipfactory.cpp
@@ -41,7 +41,7 @@ QgsTipFactory::QgsTipFactory() : QObject()
   myTip.setTitle( tr( "QGIS Publications" ) );
   myTip.setContent( tr( "If you write a scientific paper or any other article"
                         " that refers to QGIS we would love to include your work"
-                        " in the <a href=\"http://www.qgis.org/en/community/qgis-case-studies.html\">case studies section</a> of"
+                        " in the <a href=\"http://qgis.org/en/site/about/case_studies/index.html\">case studies section</a> of"
                         " the QGIS home page."
                       ) );
   addGenericTip( myTip );
@@ -51,15 +51,15 @@ QgsTipFactory::QgsTipFactory() : QObject()
                         " and would appreciate your help! The translation process is"
                         " fairly straight forward - instructions are available in the"
                         " QGIS wiki"
-                        " <a href=\"http://www.qgis.org/wiki/GUI_Translation\">translator's page.</a>"
+                        " <a href=\"http://qgis.org/en/site/getinvolved/translate.html#howto-translate-gui\">translator's page.</a>"
                       ) );
   addGuiTip( myTip );
   myTip.setTitle( tr( "QGIS Mailing lists" ) );
   myTip.setContent( tr( "If you need help using QGIS"
                         " we have a 'users'  mailing list where users help each other with issues"
                         " related to using our sofware. We also have a 'developers' mailing list."
                         " for those wanting help and to discuss things relating to the QGIS code base."
-                        " Details on how to subscribe are in the <a href=\"http://www.qgis.org/en/community/mailing-lists.html\">community section</a> of"
+                        " Details on how to subscribe are in the <a href=\"http://qgis.org/en/site/forusers/support.html#mailing-lists\">community section</a> of"
                         " the QGIS home page."
                       ) );
   addGuiTip( myTip );
@@ -177,7 +177,7 @@ QgsTipFactory::QgsTipFactory() : QObject()
                         " development of QGIS. We use money from sponsors to pay for"
                         " travel and costs related to our regular hackfest meetings, and to generally"
                         " support the goals of our project. Please see the <a"
-                        " href=\"http://qgis.org/en/sponsorship.html\">QGIS Sponsorship Web"
+                        " href=\"http://qgis.org/en/site/getinvolved/governance/sponsorship/sponsorship.html\">QGIS Sponsorship Web"
                         " Page</a> for more details."
                       ) );
   addGenericTip( myTip );

diff --git a/src/mapserver/qgswfsserver.cpp b/src/mapserver/qgswfsserver.cpp
@@ -64,7 +64,7 @@
 static const QString WFS_NAMESPACE = "http://www.opengis.net/wfs";
 static const QString GML_NAMESPACE = "http://www.opengis.net/gml";
 static const QString OGC_NAMESPACE = "http://www.opengis.net/ogc";
-static const QString QGS_NAMESPACE = "http://www.qgis.org/gml";
+static const QString QGS_NAMESPACE = "http://qgis.org/gml";
 
 QgsWFSServer::QgsWFSServer( QMap<QString, QString> parameters )
     : mParameterMap( parameters )

diff --git a/src/mapserver/qgswmsserver.cpp b/src/mapserver/qgswmsserver.cpp
@@ -902,9 +902,9 @@ int QgsWMSServer::getFeatureInfo( QDomDocument& result, QString version )
     getFeatureInfoElement.setAttribute( "xmlns:gml", "http://www.opengis.net/gml" );
     getFeatureInfoElement.setAttribute( "xmlns:ows", "http://www.opengis.net/ows" );
     getFeatureInfoElement.setAttribute( "xmlns:xlink", "http://www.w3.org/1999/xlink" );
-    getFeatureInfoElement.setAttribute( "xmlns:qgs", "http://www.qgis.org/gml" );
+    getFeatureInfoElement.setAttribute( "xmlns:qgs", "http://qgis.org/gml" );
     getFeatureInfoElement.setAttribute( "xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance" );
-    getFeatureInfoElement.setAttribute( "xsi:schemaLocation", "http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://www.qgis.org/gml" );
+    getFeatureInfoElement.setAttribute( "xsi:schemaLocation", "http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://qgis.org/gml" );
   }
   else
   {

diff --git a/src/plugins/plugin_template/README b/src/plugins/plugin_template/README
@@ -10,6 +10,6 @@ these files are used as the basis for creating
 new plugins. Altering these files may break
 the automated plugin template generation process.
 
-Please visit: http://www.qgis.org/pyqgis-cookbook/
+Please visit: http://qgis.org/pyqgis-cookbook/
 
 For more information on creating plugins.