New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reference redirectors and jenkins.io as much as possible #2756

Merged
merged 3 commits into from Feb 25, 2017

Conversation

3 participants
@daniel-beck
Member

daniel-beck commented Feb 17, 2017

In the process, I made the redirector URLs more specific to more easily adapt to documentation format changes (e.g. splitting up documentation into multiple pages).

Example: http://wiki.jenkins-ci.org/display/JENKINS/Administering+Jenkins/redirect/migrate-jenkins-home

  • Plugin wiki pages were replaced by plugins.jenkins.io which at least as a redirector service can run indefinitely.
  • References to JENKINS issues in Javadoc were replaced by the jenkins-ci.org/issue/1234 redirector
  • References to other wiki pages were replaced by general /redirect (https://github.com/jenkins-infra/jenkins.io/tree/master/content/redirect) URLs.

As a side effect of the use of redirect URLs, references to the Japanese wiki will in the future (until Accept-Language support on the site is implemented in some way) point to the English wiki/documentation.

Minor adaptations besides pure wiki/issue tracker URL rewrites:

  • I replaced some occurrences of "wiki" or "wiki page" with "documentation". There's tons left though, and I didn't even touch languages I don't speak.
  • I replaced an occurrence of "cloudbees.com" in user help with "jenkins.io".
  • I removed the ciManagement entry from pom.xml. It was seriously outdated anyway.
  • I changed the changelog URLs shown when a new version is available and defined in pom.xml with the jenkins.io variants.
@daniel-beck

This comment has been minimized.

Show comment
Hide comment
@daniel-beck

daniel-beck Feb 17, 2017

Member

@olivergondza @jglick Any objections on the basis of backporting/merging?

Member

daniel-beck commented Feb 17, 2017

@olivergondza @jglick Any objections on the basis of backporting/merging?

@daniel-beck daniel-beck referenced this pull request in jenkins-infra/jenkins.io Feb 18, 2017

Merged

Add localized redirect capability #670

@@ -3,7 +3,7 @@ CLI.Usage=Jenkins CLI\n\
Options:\n\
-s URL : the server URL (defaults to the JENKINS_URL env var)\n\
-i KEY : SSH private key file used for authentication\n\
- -p HOST:PORT : HTTP proxy host and port for HTTPS proxy tunneling. See http://jenkins-ci.org/https-proxy-tunnel\n\

This comment has been minimized.

@daniel-beck

daniel-beck Feb 18, 2017

Member

@kohsuke Apparently (WEBSITE-319) this URL never existed. Any idea where this was supposed to go? Or did this documentation never exist? You added this in 760f903.

@daniel-beck

daniel-beck Feb 18, 2017

Member

@kohsuke Apparently (WEBSITE-319) this URL never existed. Any idea where this was supposed to go? Or did this documentation never exist? You added this in 760f903.

@daniel-beck daniel-beck referenced this pull request in jenkins-infra/jenkins.io Feb 18, 2017

Merged

Add redirects for Jenkins #671

@daniel-beck daniel-beck removed the on-hold label Feb 20, 2017

@daniel-beck

This comment has been minimized.

Show comment
Hide comment
@olivergondza

This comment has been minimized.

Show comment
Hide comment
@olivergondza

olivergondza Feb 23, 2017

Member

This looks good to me after a brief scan.

Member

olivergondza commented Feb 23, 2017

This looks good to me after a brief scan.

@daniel-beck daniel-beck referenced this pull request in jenkins-infra/jenkins.io Feb 23, 2017

Merged

More specific redirect URLs #695

@daniel-beck

This comment has been minimized.

Show comment
Hide comment
@daniel-beck

daniel-beck Feb 23, 2017

Member

Changed a few URLs around that I added in jenkins-infra/jenkins.io#695

Member

daniel-beck commented Feb 23, 2017

Changed a few URLs around that I added in jenkins-infra/jenkins.io#695

@oleg-nenashev

I am not exactly sure about usefulness of JIRA redirector since it uses jenkins-ci.org, but it could be fixed during the next iteration. 👍 for the merge

@@ -59,6 +59,4 @@ Jenkins is **licensed** under the **[MIT License]**. The terms of the license ar
[GitHub]: https://github.com/jenkinsci/jenkins
[website]: https://jenkins.io/
[@jenkinsci]: https://twitter.com/jenkinsci
-[Contributing]: https://wiki.jenkins-ci.org/display/JENKINS/contributing

This comment has been minimized.

@oleg-nenashev

oleg-nenashev Feb 25, 2017

Member

Maybe a link to the file within repo>

@oleg-nenashev

oleg-nenashev Feb 25, 2017

Member

Maybe a link to the file within repo>

This comment has been minimized.

@oleg-nenashev

oleg-nenashev Feb 25, 2017

Member

Agreed

@@ -503,7 +503,7 @@ public OutputStream getStdin() {
/**
* An instance of {@link Proc}, which has an internal workaround for JENKINS-23271.
* It presumes that the instance of the object is guaranteed to be used after the {@link Proc#join()} call.
- * See <a href="https://issues.jenkins-ci.org/browse/JENKINS-23271">JENKINS-23271></a>
+ * See <a href="https://jenkins-ci.org/issue/23271">JENKINS-23271></a>

This comment has been minimized.

@oleg-nenashev

oleg-nenashev Feb 25, 2017

Member

I am fine with that, but maybe makes no sense without jenkins.io

@oleg-nenashev

oleg-nenashev Feb 25, 2017

Member

I am fine with that, but maybe makes no sense without jenkins.io

@@ -1,4 +1,4 @@
<div>
Specify host name patterns that shouldn't go through the proxy, one host per line.
- "*" is the wild card host name (such as "*.cloudbees.com" or "www*.jenkins-ci.org")
+ "*" is the wild card host name (such as "*.jenkins.io" or "www*.jenkins-ci.org")

This comment has been minimized.

@oleg-nenashev

oleg-nenashev Feb 25, 2017

Member

Uh oh, thanks for cleaning it up.
Maybe the second example with www*.jenkins-ci.org should be somehow replaced as well

@oleg-nenashev

oleg-nenashev Feb 25, 2017

Member

Uh oh, thanks for cleaning it up.
Maybe the second example with www*.jenkins-ci.org should be somehow replaced as well

@daniel-beck

This comment has been minimized.

Show comment
Hide comment
@daniel-beck

daniel-beck Feb 25, 2017

Member

@oleg-nenashev

JIRA redirector

Yeah, both options we have aren't great right now. FWIW I asked @rtyler which he preferred, and he said in the case of Javadoc JIRA issue references, he doesn't care. User-visible references should be removed though.

Member

daniel-beck commented Feb 25, 2017

@oleg-nenashev

JIRA redirector

Yeah, both options we have aren't great right now. FWIW I asked @rtyler which he preferred, and he said in the case of Javadoc JIRA issue references, he doesn't care. User-visible references should be removed though.

@daniel-beck

This comment has been minimized.

Show comment
Hide comment
@daniel-beck

daniel-beck Feb 25, 2017

Member

jenkins-infra/jenkins.io#695 has been merged, so this can now be merged as well.

Member

daniel-beck commented Feb 25, 2017

jenkins-infra/jenkins.io#695 has been merged, so this can now be merged as well.

@daniel-beck daniel-beck merged commit 2a03dda into jenkinsci:master Feb 25, 2017

2 checks passed

Jenkins This pull request looks good
Details
continuous-integration/jenkins/pr-head This commit looks good
Details

@oleg-nenashev oleg-nenashev referenced this pull request Mar 12, 2017

Merged

Update Russian Translations #2798

7 of 7 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment