From ef61350a4bf7b435c00e70bb52ef1c590085d315 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Fri, 5 Dec 2014 03:30:42 +0000 Subject: [PATCH] Workflow documentation is now in infra-manual Replace URLs for workflow documentation to appropriate parts of the OpenStack Project Infrastructure Manual. Change-Id: Ia637569cf7782b7bbf74dc596e946408a12edf50 --- ICLA/code/model/CCLATeamManager.php | 2 +- README.md | 4 ++-- registration/code/EditProfileForm.php | 2 +- themes/openstack/templates/Layout/Includes/Footer.ss | 4 ++-- themes/openstack/templates/Layout/Includes/StartPageFooter.ss | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ICLA/code/model/CCLATeamManager.php b/ICLA/code/model/CCLATeamManager.php index 5153025..495bb7b 100644 --- a/ICLA/code/model/CCLATeamManager.php +++ b/ICLA/code/model/CCLATeamManager.php @@ -98,7 +98,7 @@ final class CCLATeamManager { else { $member = $member_repository->findByEmail(trim($data['email'])); if($member && !$member->hasSignedCLA()) - throw new MemberNotSignedCCLAException('This user has not yet signed the ICLA. Please ensure they have followed the appropriate steps outlined here: https://wiki.openstack.org/wiki/How_To_Contribute#Contributor_License_Agreement'); + throw new MemberNotSignedCCLAException('This user has not yet signed the ICLA. Please ensure they have followed the appropriate steps outlined here: http://docs.openstack.org/infra/manual/developers.html#account-setup'); } if($member && ($team->isMember($member) || $team->isInvite($member))) diff --git a/README.md b/README.md index c1129aa..0ee09e5 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ WHAT IS IT? This project includes the code that powers the openstack.org website, which is itself powered by a PHP web application called Silverstripe, and we've made several customizations to meet the specific needs of OpenStack. More about the Silverstripe CMS is available here: http://silverstripe.org/ This repository is designed to help other project members develop, test, and contribute to the openstack.org website project, or to build other websites. Note that this project is based on ther code that powers the public openstack.org _website_ , not the openstack cloud software itself. To participate in building the actual OpenStack cloud platform software, go to: -http://wiki.openstack.org/HowToContribute +http://docs.openstack.org/infra/manual/developers.html WHY RELEASE THE SOURCE? @@ -61,7 +61,7 @@ We need detailed installation instructions to run the site locally on LAMP or MA SUBMITTING PATCHES: -We ask that all contributors sign the OpenStack CLA, consistent with how we manage other OpenStack projects: https://wiki.openstack.org/wiki/How_To_Contribute#Contributor_License_Agreement . Please note that this process is based on the Apache Software Foundation model, and the CLA does NOT require copyright assignment. +We ask that all contributors sign the OpenStack CLA, consistent with how we manage other OpenStack projects: http://docs.openstack.org/infra/manual/developers.html#account-setup . Please note that this process is based on the Apache Software Foundation model, and the CLA does NOT require copyright assignment. In the future we will integrate with the OpenStack gerrit system for managing reviwes. Once that is rolled out, the CLA signature check will be automated to prevent unauthorized pull requests. In the interim, we will verify contributors manually based on the email address associated with their Gerrit account. If your email address in gerrit is different than the one you use for github, please note that in the pull request. diff --git a/registration/code/EditProfileForm.php b/registration/code/EditProfileForm.php index fdcf166..a23c6c3 100644 --- a/registration/code/EditProfileForm.php +++ b/registration/code/EditProfileForm.php @@ -163,7 +163,7 @@ class EditProfileForm extends SafeXSSForm { new LiteralField('header', '

Private Information

'), new HeaderField("Email Addresses"), - new LiteralField('instructions', '

If you\'re an active developer on the OpenStack project, please list any email addresses you use to commit code. (This will really help us avoid duplicates!) If you contributed code ONLY using gerrit, all email addresses you used will be listed on the web identities page. If you have contributed also before gerrit was put in place, please make an effort to remember other email addresses you may have used. Interested in how to become a contributor?

'), + new LiteralField('instructions', '

If you\'re an active developer on the OpenStack project, please list any email addresses you use to commit code. (This will really help us avoid duplicates!) If you contributed code ONLY using gerrit, all email addresses you used will be listed on the web identities page. If you have contributed also before gerrit was put in place, please make an effort to remember other email addresses you may have used. Interested in how to become a contributor?

'), $PrimaryEmailField, new LiteralField('instructions', '

This email address is also the account name you use to login.

'), $SecondEmailField, diff --git a/themes/openstack/templates/Layout/Includes/Footer.ss b/themes/openstack/templates/Layout/Includes/Footer.ss index 67c93c2..f5edba1 100644 --- a/themes/openstack/templates/Layout/Includes/Footer.ss +++ b/themes/openstack/templates/Layout/Includes/Footer.ss @@ -17,7 +17,7 @@
  • Events
  • Jobs
  • Companies
    • -
  • Contribute
    • +
  • Contribute
    • @@ -35,7 +35,7 @@
  • Logos & Guidelines
  • Trademark Policy
  • Privacy Policy
    • -
  • OpenStack CLA
    • +
  • OpenStack CLA
    • diff --git a/themes/openstack/templates/Layout/Includes/StartPageFooter.ss b/themes/openstack/templates/Layout/Includes/StartPageFooter.ss index 4d7162f..aa1aad7 100644 --- a/themes/openstack/templates/Layout/Includes/StartPageFooter.ss +++ b/themes/openstack/templates/Layout/Includes/StartPageFooter.ss @@ -14,6 +14,6 @@

    Get involved with OpenStack

    The wiki has a useful guide to contributing.

    -

    How To Contribute

    +

    How To Contribute

    \ No newline at end of file