Skip to content

Fixed references to RC2, OS X, and Update 2 - #612

Merged
stevehoag merged 2 commits into
dotnet:masterfrom
stevehoag:cleanup
Jun 24, 2016
Merged

Fixed references to RC2, OS X, and Update 2#612
stevehoag merged 2 commits into
dotnet:masterfrom
stevehoag:cleanup

Conversation

@stevehoag

Copy link
Copy Markdown
Contributor

No description provided.

@mairaw

mairaw commented Jun 24, 2016

Copy link
Copy Markdown
Contributor

Is this the one we should review @stevehoag? I'm confused.

@stevehoag

Copy link
Copy Markdown
Contributor Author

yes, but I have merge conflicts that I can't seem to fix

@mairaw

mairaw commented Jun 24, 2016

Copy link
Copy Markdown
Contributor

@BillWagner can probably help you with that

@BillWagner

Copy link
Copy Markdown
Member

@stevehoag Give me 2 minutes, and I'll help with the merge changes. I looked at your PR and fixing the conflicts will take us < 5 minutes over skype

@mairaw

mairaw commented Jun 24, 2016

Copy link
Copy Markdown
Contributor

do I need to comment here again or will you look at my comments from PR #614?

@stevehoag

Copy link
Copy Markdown
Contributor Author

@mairaw I'll reference your comments in #614.

@BillWagner yes, I'd appreciate the help.

@mairaw

mairaw commented Jun 24, 2016

Copy link
Copy Markdown
Contributor

@stevehoag awesome! 👍

Comment thread docs/core/rid-catalog.md Outdated
* `linuxmint.17.3-x64`

## OS X RIDs
## macOS RIDs

@richlander richlander Jun 24, 2016

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one is probably wrong. These are indeed OS X RIDs.

The rule is:

  • Use macOS for the general usage of the operating system.
  • Use OS X if you are talking about El Capitan or earlier.

We don't support macOS Sierra yet, so this is El Capitan.

Until we support macOS, we should not change any of the references in this file. It's too confusing.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

@stevehoag

Copy link
Copy Markdown
Contributor Author

Can I merge this now (before more files get moved)?

@BillWagner

Copy link
Copy Markdown
Member

:shipit:

@stevehoag
stevehoag merged commit 093b852 into dotnet:master Jun 24, 2016
@stevehoag
stevehoag deleted the cleanup branch June 27, 2016 02:05
@svick svick mentioned this pull request Aug 9, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants