diff --git a/conf.py b/conf.py index 7f7113d002ec..7b3afdcb685a 100644 --- a/conf.py +++ b/conf.py @@ -388,6 +388,9 @@ # A list of regular expressions that match URIs that should not be checked when doing a linkcheck build. linkcheck_ignore = [r'http://localhost:\d+'] +linkcheck_workers = 30 +linkcheck_timeout = 90 +linkcheck_retries = 2 # copy legacy redirects diff --git a/howtos/generic_ci_artifactory.rst b/howtos/generic_ci_artifactory.rst index 304de6043462..8c746df12e57 100644 --- a/howtos/generic_ci_artifactory.rst +++ b/howtos/generic_ci_artifactory.rst @@ -7,7 +7,7 @@ Uploading the BuildInfo ----------------------- If you are using :ref:`Jenkins with Conan and Artifactory`, along with the -`Jenkins Artifactory Plugin `_, +`Jenkins Artifactory Plugin `_, any Conan package downloaded or uploaded during your build will be automatically recorded in the BuildInfo json file, that will be automatically uploaded to the specified Artifactory instance. @@ -18,7 +18,7 @@ Extracting build-info from the Conan trace log ############################################## 1. Before calling Conan the first time in your build, set the environment variable `CONAN_TRACE_FILE` to a - file path. The generated file will contain the `BuildInfo json `_. + file path. The generated file will contain the `BuildInfo json `_. 2. You also need to create the :ref:`artifacts.properties` file in your Conan home containing the build information. All this properties will be automatically associated to all the published artifacts. diff --git a/integrations/ci/jenkins.rst b/integrations/ci/jenkins.rst index e40c4728f383..ce33e526d1c7 100644 --- a/integrations/ci/jenkins.rst +++ b/integrations/ci/jenkins.rst @@ -121,6 +121,6 @@ and then upload it to Artifactory. We also upload the `build information`_: .. |jenkins_stages_creator| image:: ../../images/conan-jenkins_stages_creator.png .. _`Artifactory`: https://jfrog.com/artifactory/ .. _`Jenkins Artifactory Plugin`: -.. _`here how to install the plugin`: https://www.jfrog.com/confluence/display/RTF/Jenkins+Artifactory+Plug-in -.. _`here you can check the full documentation about the DSL`: https://www.jfrog.com/confluence/display/RTF/Working+With+Pipeline+Jobs+in+Jenkins -.. _`build information`: https://www.jfrog.com/confluence/display/RTF/Build+Integration +.. _`here how to install the plugin`: https://www.jfrog.com/confluence/display/JFROG/Jenkins+Artifactory+Plug-in +.. _`here you can check the full documentation about the DSL`: https://www.jfrog.com/confluence/display/JFROG/Working+With+Pipeline+Jobs+in+Jenkins +.. _`build information`: https://www.jfrog.com/confluence/display/JFROG/Build+Integration diff --git a/uploading_packages/remotes.rst b/uploading_packages/remotes.rst index 4cd28fe2f4c4..13b33ddaf0a2 100644 --- a/uploading_packages/remotes.rst +++ b/uploading_packages/remotes.rst @@ -23,7 +23,7 @@ For private development: - **Artifactory Pro**: Artifactory is the binary repository manager for all major packaging formats. It is the recommended remote type for enterprise and professional package management. Check the `Artifactory documentation`_ for more information. For a comparison between Artifactory editions, - check the `Artifactory Comparison Matrix `_. + check the `Artifactory Comparison Matrix `_. - **Conan server**: Simple, free and open source, MIT licensed server that comes bundled with the Conan client. Check :ref:`running_your_server` for more information. @@ -105,4 +105,4 @@ Conan Community .. _`conan-center`: https://bintray.com/conan/conan-center -.. _Artifactory documentation: https://www.jfrog.com/confluence/display/RTF/Welcome+to+Artifactory +.. _Artifactory documentation: https://www.jfrog.com/confluence/display/JFROG/JFrog+Artifactory