diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index fc8754da5ca..9497bae3858 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,8 +4,6 @@ We welcome volunteers to contribute to the Wikipedia iOS app codebase. ## Development instructions Before developing, please read the [setup instructions](README.md). -We do all of our active development on the [develop](https://github.com/wikimedia/wikipedia-ios) branch. Your pull requests will automatically be targeted at that branch by Github. To make merging easier, be sure you create your branches based on the develop branch. - Once your contributions are ready for review, add yourself in alphabetical order under contributors in `Code/AboutViewController.plist` and post a pull request on GitHub. One of the maintainers will review the PR. Thanks for contributing! 🎉 ## What can I work on? diff --git a/README.md b/README.md index c7ff6f3a9cf..31cd95c180a 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ The official Wikipedia iOS app. [![Wikipedia](https://circleci.com/gh/wikimedia/wikipedia-ios.svg?style=shield)](https://github.com/wikimedia/wikipedia-ios) -[![MIT license](https://img.shields.io/badge/license-MIT-lightgrey.svg)](https://raw.githubusercontent.com/wikimedia/wikipedia-ios/develop/LICENSE.txt) +[![MIT license](https://img.shields.io/badge/license-MIT-lightgrey.svg)](https://raw.githubusercontent.com/wikimedia/wikipedia-ios/main/LICENSE.txt) * License: MIT License * Source repo: https://github.com/wikimedia/wikipedia-ios diff --git a/Wikipedia/Code/AboutViewController.plist b/Wikipedia/Code/AboutViewController.plist index 4d23a5a5544..a70a7392b48 100644 --- a/Wikipedia/Code/AboutViewController.plist +++ b/Wikipedia/Code/AboutViewController.plist @@ -7,7 +7,7 @@ sharealike https://creativecommons.org/licenses/by-sa/3.0/ mit - https://raw.githubusercontent.com/wikimedia/wikipedia-ios/develop/LICENSE.txt + https://raw.githubusercontent.com/wikimedia/wikipedia-ios/main/LICENSE.txt tsg https://tsgteam.org feedback diff --git a/fastlane/Fastfile b/fastlane/Fastfile index dd766a4e695..c6fe5b470f2 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -49,7 +49,7 @@ platform :ios do ensure_git_status_clean if ENV['FL_ENSURE_CLEAN'] end - desc "Checks out the sha specified in the environment variables or the develop branch" + desc "Checks out the sha specified in the environment variables or the main branch" lane :checkout do sha = ENV['SHA'] if sha != nil diff --git a/fastlane/README.md b/fastlane/README.md index ba821ac26a5..af7252499da 100644 --- a/fastlane/README.md +++ b/fastlane/README.md @@ -20,7 +20,7 @@ or alternatively using `brew install fastlane` ``` fastlane ios checkout ``` -Checks out the sha specified in the environment variables or the develop branch +Checks out the sha specified in the environment variables or the main branch ### ios analyze ``` fastlane ios analyze