diff --git a/CMakeLists.txt b/CMakeLists.txt index e1eeb0cdc464..cd4b57742bc2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -79,7 +79,7 @@ set (ENABLE_LOCAL_BUILD_SHORTCUTS FALSE CACHE BOOL "Disables some build steps wh ############################################################# if (APPLE) # QGIS custom dependencies package from qgis/QGIS-Mac-Packager - # they can be downloaded from https://qgis.org/downloads/macos/qgis-deps + # they can be downloaded from https://download.qgis.org/downloads/macos/deps/ # and extracted to /opt/QGIS/qgis-deps-/stage set (QGIS_MAC_DEPS_DIR "" CACHE PATH "Path to QGIS Mac custom dependencies directory") diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d5dd3bd99397..64e2d6d1364c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -29,8 +29,8 @@ For large-scale changes, you can open a [QEP (QGIS Enhancement Proposal)](https: Please help translate QGIS to your language. At this moment about forty languages are already available in the Desktop user interface and about eighty languages are available in transifex ready to be translated. -The [translation](https://qgis.org/en/site/getinvolved/translate.html) process is managed by the [Translation Team](https://qgis.org/en/site/getinvolved/governance/governance.html#gui-translation) and all the activities are done under the [Transifex](https://www.transifex.com/qgis/) platform. +The [translation](https://docs.qgis.org/latest/en/docs/documentation_guidelines/do_translations.html) process is managed by the [Translation Team](https://qgis.org/community/organisation/#translation) and all the activities are done under the [Transifex](https://www.transifex.com/qgis/) platform. ## Other ways to contribute -If you are not a developer, there are many other possibilities that do not require programming skills to help QGIS to evolve. Check our [project homepage for more information](https://qgis.org/en/site/getinvolved/index.html). +If you are not a developer, there are many other possibilities that do not require programming skills to help QGIS to evolve. Check our [project homepage for more information](https://qgis.org/community/involve/). diff --git a/ChangeLog b/ChangeLog index 13759b082c28..e8d031b0d7b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11782,7 +11782,7 @@ Sandro Santilli 2024-05-28 Cleanup the chat session to match what's on the website - See https://qgis.org/en/site/forusers/support.html + See https://qgis.org/resources/support/ Alessandro Pasotti 2024-05-28 @@ -311466,7 +311466,7 @@ Matthias Kuhn 2015-11-24 Remove CODING from source tree It has all been moved to - http://qgis.org/en/site/getinvolved/development/qgisdevelopersguide.html + https://docs.qgis.org/latest/en/docs/developers_guide/index.html Where it is managed as .rst and translatable. Matthias Kuhn 2015-11-24 diff --git a/INSTALL.md b/INSTALL.md index d5f141b23d7b..71a0a86d49b3 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -186,7 +186,7 @@ sudo apt-get update (extracted from the control.in file in `debian/`) -See [debian-ubuntu](https://qgis.org/en/site/forusers/alldownloads.html#debian-ubuntu) for +See [debian-ubuntu](https://qgis.org/resources/installation-guide/#debianubuntu) for currently supported distributions (plain xenial's GDAL for instance is too old and we build with GDAL2 from ubuntugis). @@ -830,7 +830,7 @@ dependency into the folder `vcpkg/ports`. Whenever the build is reconfigured, it If you want to test QGIS, easiest option is to download and install all-in-one self-containing bundle directly from -https://qgis.org/downloads/macos +https://download.qgis.org/downloads/macos/ On the other hand, if you want to build or develop QGIS on your own, you need a set of dependencies and tools. These instructions will use the same set of dependencies that are used for all-in-one QGIS bundle, @@ -891,7 +891,7 @@ used to build dependency package. Download the latest QGIS-Deps install script, qt package and QGIS-Deps packages from -https://qgis.org/downloads/macos/deps +https://download.qgis.org/downloads/macos/deps You should have one bash script and two tar archive in your download folder. Run the install script to install Qt and QGIS-Deps to `/opt/` area. You need diff --git a/README.md b/README.md index abcc8714116f..ddc5e6019e48 100644 --- a/README.md +++ b/README.md @@ -164,12 +164,12 @@ For installation of QGIS Server, see its [getting started documentation](https:/ ### Documentation -A range of [documentation](https://qgis.org/en/docs/index.html) is available. This includes: +A range of [documentation](https://qgis.org/resources/hub/#documentation) is available. This includes: - [Training Manual](https://docs.qgis.org/latest/en/docs/training_manual/index.html) - [QGIS User Guide](https://docs.qgis.org/latest/en/docs/user_manual/index.html) - [QGIS Server Guide](https://docs.qgis.org/latest/en/docs/server_manual/index.html) -- [Visual Changelog](https://qgis.org/en/site/forusers/visualchangelogs.html) +- [Visual Changelog](https://qgis.org/project/visual-changelogs/) - [Documentation Guidelines](https://docs.qgis.org/latest/en/docs/documentation_guidelines/index.html) - [QGIS Python (PyQGIS) Cookbook](https://docs.qgis.org/latest/en/docs/pyqgis_developer_cookbook/index.html) - [QGIS Python (PyQGIS) API](https://qgis.org/pyqgis/) @@ -187,7 +187,7 @@ There are several channels where you can find help and support for QGIS: [#qgis](https://web.libera.chat/?channels=#qgis) channel on irc.libera.chat. - Using a Matrix client and joining the [#qgis:osgeo.org](https://matrix.to/#/#qgis:osgeo.org) room. - At the [GIS stackexchange](https://gis.stackexchange.com/) or [r/QGIS reddit](https://www.reddit.com/r/QGIS/), which are not maintained by the QGIS team, but where the QGIS and broader GIS community provides lots of advice -- [Other support channels](https://qgis.org/en/site/forusers/support.html) +- [Other support channels](https://qgis.org/resources/support/) ## Get involved with the community diff --git a/debian/upstream/metadata b/debian/upstream/metadata index 5730cb1cea2d..d024598028c3 100644 --- a/debian/upstream/metadata +++ b/debian/upstream/metadata @@ -2,9 +2,9 @@ Bug-Database: https://github.com/qgis/QGIS/issues Bug-Submit: https://github.com/qgis/QGIS/issues Contact: qgis-developer@lists.osgeo.org -Donation: https://qgis.org/en/site/getinvolved/donations.html +Donation: https://qgis.org/funding/donate/ Name: QGIS Registration: https://id.osgeo.org/ldap/create Repository: https://github.com/qgis/QGIS.git Repository-Browse: https://github.com/qgis/QGIS -Screenshots: https://qgis.org/en/site/about/screenshots.html +Screenshots: https://qgis.org/project/overview/screenshots/ diff --git a/doc/DONORS b/doc/DONORS index fa341c074e43..d29ffa7c6037 100644 --- a/doc/DONORS +++ b/doc/DONORS @@ -1,9 +1,9 @@ -# The following have sponsored QGIS by contributing +# The following have sponsored QGIS by contributing # money to fund development and other project # costs. # -------------------------------------------------------- -# Please note that this file is parsed by the about box -# for the sponsors list, so names should be strictly +# Please note that this file is parsed by the about box +# for the sponsors list, so names should be strictly # in the format: # name| # This list should be sorted by first name. The @@ -11,4 +11,4 @@ # ------------------------------------------------------- # # ALWAYS USE UTF-8 WHEN WRITING THIS FILE! -See:|https://qgis.org/en/site/about/sponsorship.html#list-of-donors +See:|https://qgis.org/funding/donate/donors/ diff --git a/doc/SPONSORS b/doc/SPONSORS index 94afc6e5f3b3..ba03258f5a61 100644 --- a/doc/SPONSORS +++ b/doc/SPONSORS @@ -1,9 +1,9 @@ -# The following have sponsored QGIS by contributing +# The following have sponsored QGIS by contributing # money to fund development and other project # costs. # -------------------------------------------------------- -# Please note that this file is parsed by the about box -# for the sponsors list, so names should be strictly +# Please note that this file is parsed by the about box +# for the sponsors list, so names should be strictly # in the format: # name| # This list should be sorted by first name. The @@ -13,6 +13,6 @@ # ALWAYS USE UTF-8 WHEN WRITING THIS FILE! # Please consider sponsoring the development of QGIS. -See: http://qgis.org/en/site/getinvolved/governance/sponsorship/sponsorship.html +See: https://qgis.org/funding/membership/ -See: http://qgis.org/en/site/about/sponsorship.html#list-of-sponsors for an updated list of sponsors. +See: https://qgis.org/funding/membership/members for an updated list of sponsors. diff --git a/doc/index.dox b/doc/index.dox index 499d68ccfef3..3d53739ccfaa 100644 --- a/doc/index.dox +++ b/doc/index.dox @@ -1,6 +1,6 @@ -#ifndef DOXYGEN_SKIP -/* $Id:$ */ -#endif /* DOXYGEN_SKIP */ +#ifndef DOXYGEN_SKIP +/* $Id:$ */ +#endif /* DOXYGEN_SKIP */ /*! \mainpage QGIS @@ -68,13 +68,13 @@ Earlier versions of the documentation are also available on the QGIS website: 1.6 \section qgsquick_docs QgsQuick library documentation - + See \ref qgsquick for information about QGIS Quick (QML) components library \section index_maillist Mailing Lists For support we encourage you to join our mailing lists for +href="https://qgis.org/resources/support/#mailing-lists">mailing lists for users and developers. Some QGIS users and developers can also often be found on channels such as Matrix, Telegram, ... diff --git a/doc/index.html b/doc/index.html index 7dfcac584acd..cf587741469c 100644 --- a/doc/index.html +++ b/doc/index.html @@ -6,12 +6,12 @@
- + QGIS Documentation
Use Help inside functions or:
- You can find a PDF manual of the current version on the QGIS website. + You can find a PDF manual of the current version on the QGIS website.
diff --git a/linux/org.qgis.qgis.appdata.xml.in b/linux/org.qgis.qgis.appdata.xml.in index c800a4529aba..24f095c4b8c2 100644 --- a/linux/org.qgis.qgis.appdata.xml.in +++ b/linux/org.qgis.qgis.appdata.xml.in @@ -14,9 +14,9 @@ CC-BY-3.0 GPL-2.0+ https://github.com/qgis/QGIS/issues - https://qgis.org/en/site/getinvolved/donations.html - https://qgis.org/en/site/getinvolved/faq/index.html - https://qgis.org/en/docs/index.html + https://qgis.org/funding/donate/ + https://qgis.org/resources/support/faq/ + https://qgis.org/resources/hub/#documentation https://qgis.org QGIS diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp index 51ecbabd1137..6b1eee950319 100644 --- a/src/app/qgisapp.cpp +++ b/src/app/qgisapp.cpp @@ -5506,7 +5506,7 @@ void QgisApp::sponsors() { QgsSettings settings; QString qgisSponsorsUrl = settings.value( QStringLiteral( "qgis/qgisSponsorsUrl" ), - tr( "https://qgis.org/en/site/about/sustaining_members.html" ) ).toString(); + tr( "https://qgis.org/funding/membership/members/" ) ).toString(); openURL( qgisSponsorsUrl, false ); } @@ -12976,7 +12976,7 @@ void QgisApp::reportaBug() { QgsSettings settings; QString reportaBugUrl = settings.value( QStringLiteral( "qgis/reportaBugUrl" ), - tr( "https://qgis.org/en/site/getinvolved/development/bugreporting.html" ) ).toString(); + tr( "https://qgis.org/resources/support/bug-reporting/" ) ).toString(); openURL( reportaBugUrl, false ); } @@ -12984,7 +12984,7 @@ void QgisApp::getInvolved() { QgsSettings settings; QString getInvolvedUrl = settings.value( QStringLiteral( "qgis/getInvolved" ), - tr( "https://qgis.org/en/site/getinvolved/" ) ).toString(); + tr( "https://qgis.org/community/involve/" ) ).toString(); openURL( getInvolvedUrl, false ); } @@ -12992,7 +12992,7 @@ void QgisApp::donate() { QgsSettings settings; QString donateUrl = settings.value( QStringLiteral( "qgis/donate" ), - tr( "https://donate.qgis.org/" ) ).toString(); + tr( "https://qgis.org/funding/donate/" ) ).toString(); openURL( donateUrl, false ); } @@ -13000,7 +13000,7 @@ void QgisApp::supportProviders() { QgsSettings settings; QString supportProvidersUrl = settings.value( QStringLiteral( "qgis/supportProvidersUrl" ), - tr( "https://qgis.org/en/site/forusers/commercial_support.html" ) ).toString(); + tr( "https://qgis.org/resources/support/commercial-support/" ) ).toString(); openURL( supportProvidersUrl, false ); } diff --git a/src/app/qgsabout.cpp b/src/app/qgsabout.cpp index ab50dc8717c4..8d424af40e4d 100644 --- a/src/app/qgsabout.cpp +++ b/src/app/qgsabout.cpp @@ -151,8 +151,8 @@ void QgsAbout::init() { const QString donorsHTML = tr( "

For a list of individuals and institutions who have contributed " "money to fund QGIS development and other project costs see " - "" - "https://qgis.org/en/site/about/sustaining_members.html#list-of-donors

" ); + "" + "https://qgis.org/funding/donate/

" ); #if 0 QString website; QTextStream donorsStream( &donorsFile ); diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp index 3342558248da..24158abb69da 100644 --- a/src/core/qgsapplication.cpp +++ b/src/core/qgsapplication.cpp @@ -1689,7 +1689,7 @@ QString QgsApplication::reportStyleSheet( QgsApplication::StyleSheetType styleSh " width: 100%;" "}" "h1{ background-color: #F6F6F6;" - " color: #589632; " // from http://qgis.org/en/site/getinvolved/styleguide.html + " color: #589632; " // from https://qgis.org/styleguide/ " font-size: x-large; " " font-weight: normal;" " background: none;" @@ -1698,7 +1698,7 @@ QString QgsApplication::reportStyleSheet( QgsApplication::StyleSheetType styleSh " line-height: 3em;" "}" "h2{ background-color: #F6F6F6;" - " color: #589632; " // from http://qgis.org/en/site/getinvolved/styleguide.html + " color: #589632; " // from https://qgis.org/styleguide/ " font-size: medium; " " font-weight: normal;" " background: none;" @@ -1707,20 +1707,20 @@ QString QgsApplication::reportStyleSheet( QgsApplication::StyleSheetType styleSh " line-height: 1.1em;" "}" "h3{ background-color: #F6F6F6;" - " color: #93b023;" // from http://qgis.org/en/site/getinvolved/styleguide.html + " color: #93b023;" // from https://qgis.org/styleguide/ " font-weight: bold;" " font-size: large;" " text-align: left;" " border-bottom: 5px solid #DCEB5C;" "}" "h4{ background-color: #F6F6F6;" - " color: #93b023;" // from http://qgis.org/en/site/getinvolved/styleguide.html + " color: #93b023;" // from https://qgis.org/styleguide/ " font-weight: bold;" " font-size: medium;" " text-align: left;" "}" "h5{ background-color: #F6F6F6;" - " color: #93b023;" // from http://qgis.org/en/site/getinvolved/styleguide.html + " color: #93b023;" // from https://qgis.org/styleguide/ " font-weight: bold;" " font-size: small;" " text-align: left;" diff --git a/src/crashhandler/qgscrashdialog.cpp b/src/crashhandler/qgscrashdialog.cpp index 1c2aac079366..f5dea75c9dc8 100644 --- a/src/crashhandler/qgscrashdialog.cpp +++ b/src/crashhandler/qgscrashdialog.cpp @@ -41,7 +41,7 @@ QgsCrashDialog::QgsCrashDialog( QWidget *parent ) "

" ) + tr( "Are you keen to help us fix bugs? QGIS relies on donations to pay developers to do funded bug fixing to improve the stability of the software. " "We also have a team of enthusiastic volunteers who are all working hard to improve the quality of QGIS. To do that, we need your help. " - "Find out how to help our developers." + "Find out how to help our developers." "

" "Send us a helpful bug report by using the 'Copy Report' button below,
then open a ticket on the " "QGIS Issue Tracker." ) );