Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Update code-of-conduct.md #2469

Merged
merged 2 commits into from
Sep 30, 2023
Merged

Update code-of-conduct.md #2469

merged 2 commits into from
Sep 30, 2023

Conversation

Naomi-Wash
Copy link
Member

Removed mentions of CNCF and links to the other CNCF CoCs in different languages.

Change summary

Submission Checklist:

  • Descriptive active voice - Do descriptive sentences have a clear subject and action verb?
  • Answer the question at hand - Does the documentation answer a what, why, how, or where type of question?
  • Consistency - Does the content consistently follow the Style Guide?
  • Help the user - Does the documentation show the user something meaningful?

@Naomi-Wash
Update code-of-conduct.md
9aeddf3 
Removed mentions of CNCF

Signed-off-by: Naomi Washington <70667788+Naomi-Wash@users.noreply.github.com>
@Naomi-Wash Naomi-Wash requested a review from a team as a code owner September 20, 2023 21:01
willihay
willihay approved these changes Sep 22, 2023
View reviewed changes
Copy link
Contributor

@willihay willihay left a comment

Choose a reason for hiding this comment

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

Approved with one suggested change.

content/docs/contributing/code-of-conduct.md Outdated
@@ -5,25 +5,10 @@ description: Before you join the O3DE project, make sure you understand the cond
weight: 600
---

## CNCF Community Code of Conduct v1.0
## Community Code of Conduct v1.0

Other languages available:
Copy link
Contributor

Choose a reason for hiding this comment

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

Since you removed the list of languages, I assume you want to review this line, too?

Copy link
Member Author

Choose a reason for hiding this comment

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

Thank you for flagging Willow. Yes, that should be removed as well.

@RoddieKieley
Update code-of-conduct.md
d5857fa 
Removed now extraneous line regarding other languages.

Signed-off-by: Roddie Kieley <rkieley@redhat.com>
@RoddieKieley RoddieKieley merged commit d9d3a03 into main Sep 30, 2023
5 checks passed
@RoddieKieley RoddieKieley deleted the Naomi-Wash-patch-1 branch September 30, 2023 20:04
RoddieKieley pushed a commit to RoddieKieley/o3de.org that referenced this pull request Oct 1, 2023
@Naomi-Wash @RoddieKieley
Update code-of-conduct.md (o3de#2469)
d874d60 
* Update code-of-conduct.md

Removed mentions of CNCF

Signed-off-by: Naomi Washington <70667788+Naomi-Wash@users.noreply.github.com>

* Update code-of-conduct.md

Removed now extraneous line regarding other languages.

Signed-off-by: Roddie Kieley <rkieley@redhat.com>

---------

Signed-off-by: Naomi Washington <70667788+Naomi-Wash@users.noreply.github.com>
Signed-off-by: Roddie Kieley <rkieley@redhat.com>
Co-authored-by: Roddie Kieley <rkieley@redhat.com>
(cherry picked from commit d9d3a03)
RoddieKieley pushed a commit to RoddieKieley/o3de.org that referenced this pull request Oct 4, 2023
@Naomi-Wash @RoddieKieley
Update code-of-conduct.md (o3de#2469)
dbf78da 
* Update code-of-conduct.md

Removed mentions of CNCF

Signed-off-by: Naomi Washington <70667788+Naomi-Wash@users.noreply.github.com>

* Update code-of-conduct.md

Removed now extraneous line regarding other languages.

Signed-off-by: Roddie Kieley <rkieley@redhat.com>

---------

Signed-off-by: Naomi Washington <70667788+Naomi-Wash@users.noreply.github.com>
Signed-off-by: Roddie Kieley <rkieley@redhat.com>
Co-authored-by: Roddie Kieley <rkieley@redhat.com>
(cherry picked from commit d9d3a03)
RoddieKieley pushed a commit to RoddieKieley/o3de.org that referenced this pull request Oct 4, 2023
@Naomi-Wash @RoddieKieley
Update code-of-conduct.md (o3de#2469)
878af12 
* Update code-of-conduct.md

Removed mentions of CNCF

Signed-off-by: Naomi Washington <70667788+Naomi-Wash@users.noreply.github.com>

* Update code-of-conduct.md

Removed now extraneous line regarding other languages.

Signed-off-by: Roddie Kieley <rkieley@redhat.com>

---------

Signed-off-by: Naomi Washington <70667788+Naomi-Wash@users.noreply.github.com>
Signed-off-by: Roddie Kieley <rkieley@redhat.com>
Co-authored-by: Roddie Kieley <rkieley@redhat.com>
(cherry picked from commit d9d3a03)
jhanca-robotecai pushed a commit that referenced this pull request Dec 22, 2023
@Naomi-Wash @RoddieKieley @jhanca-robotecai
Update code-of-conduct.md (#2469)
88d0fd0 
* Update code-of-conduct.md

Removed mentions of CNCF

Signed-off-by: Naomi Washington <70667788+Naomi-Wash@users.noreply.github.com>

* Update code-of-conduct.md

Removed now extraneous line regarding other languages.

Signed-off-by: Roddie Kieley <rkieley@redhat.com>

---------

Signed-off-by: Naomi Washington <70667788+Naomi-Wash@users.noreply.github.com>
Signed-off-by: Roddie Kieley <rkieley@redhat.com>
Co-authored-by: Roddie Kieley <rkieley@redhat.com>
jhanca-robotecai pushed a commit that referenced this pull request Jul 4, 2024
@Naomi-Wash @RoddieKieley @jhanca-robotecai
Update code-of-conduct.md (#2469)
20b90c3 
* Update code-of-conduct.md

Removed mentions of CNCF

Signed-off-by: Naomi Washington <70667788+Naomi-Wash@users.noreply.github.com>

* Update code-of-conduct.md

Removed now extraneous line regarding other languages.

Signed-off-by: Roddie Kieley <rkieley@redhat.com>

---------

Signed-off-by: Naomi Washington <70667788+Naomi-Wash@users.noreply.github.com>
Signed-off-by: Roddie Kieley <rkieley@redhat.com>
Co-authored-by: Roddie Kieley <rkieley@redhat.com>
jhanca-robotecai added a commit that referenced this pull request Aug 22, 2024
@jhanca-robotecai @chanmosq
@amzn-changml @Naomi-Wash @RoddieKieley @AMZN-alexpete @alexmontAmazon @AMZN-Gene @tkothadev @spham-amzn @kursad-k
Cherry pick main back to development (#2535)
7e16a81 
* Quick fix - Made documentation be the landing page

Signed-off-by: chanmosq <75444793+chanmosq@users.noreply.github.com>

* Windows offline installer instructions (#2445)

* Add the offline installer instructions for Windows

Signed-off-by: Mike Chang <changml@amazon.com>

* Update linux and snap package instructions (#2462)

Update system requirements link and clarify snap instructions

Signed-off-by: Mike Chang <changml@amazon.com>

* Update code-of-conduct.md (#2469)

* Update code-of-conduct.md

Removed mentions of CNCF

Signed-off-by: Naomi Washington <70667788+Naomi-Wash@users.noreply.github.com>

* Update code-of-conduct.md

Removed now extraneous line regarding other languages.

Signed-off-by: Roddie Kieley <rkieley@redhat.com>

---------

Signed-off-by: Naomi Washington <70667788+Naomi-Wash@users.noreply.github.com>
Signed-off-by: Roddie Kieley <rkieley@redhat.com>
Co-authored-by: Roddie Kieley <rkieley@redhat.com>

* Merge pull request #2475 from o3de/stabilization/2310

Stabilization/2310

Signed-off-by: Jan Hanca <jan.hanca@robotec.ai>

* Merge pull request #2491 from RoddieKieley/2310-main-release-notes

Added 23.10 release notes.

Signed-off-by: Jan Hanca <jan.hanca@robotec.ai>

* Merge pull request #2492 from aws-lumberyard-dev/alexmont/main

Signed-off-by: Jan Hanca <jan.hanca@robotec.ai>

* Merge pull request #2496 from aws-lumberyard-dev/alexmont/main

prefab override clarifications and updates

Signed-off-by: Jan Hanca <jan.hanca@robotec.ai>

* Merge pull request #2512 from o3de/stabilization/23101

Stabilization/23101 -> main for publishing

Signed-off-by: Jan Hanca <jan.hanca@robotec.ai>

* fix diff between main and development

Signed-off-by: Jan Hanca <jan.hanca@robotec.ai>

* Export Instructions for SDK/Installer (#2514)

* Updating project export instructions to warn O3DE installer/SDK users. Installed versions of O3DE must use profile configuration and non-monolithic builds in order to package their game

Signed-off-by: AMZN-Gene <genewalt@amazon.com>

* Minor. Whitespace fix

Signed-off-by: AMZN-Gene <genewalt@amazon.com>

---------

Signed-off-by: AMZN-Gene <genewalt@amazon.com>
Signed-off-by: Jan Hanca <jan.hanca@robotec.ai>

* initial documentation updates for recent exporter changes for point release (#2519)

* initial documentation updates for recent exporter changes for point release

Signed-off-by: TJ Kotha <tankotha@amazon.com>

* Update content/docs/user-guide/packaging/project-export/project-export-cli.md

Co-authored-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
Signed-off-by: T.J. Kotha <112996779+tkothadev@users.noreply.github.com>

* Update content/docs/user-guide/packaging/project-export/project-export-cli.md

Co-authored-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
Signed-off-by: T.J. Kotha <112996779+tkothadev@users.noreply.github.com>

* Update content/docs/user-guide/packaging/project-export/project-export-cli.md

Co-authored-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
Signed-off-by: T.J. Kotha <112996779+tkothadev@users.noreply.github.com>

* Update content/docs/user-guide/packaging/project-export/project-export-cli.md

Co-authored-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
Signed-off-by: T.J. Kotha <112996779+tkothadev@users.noreply.github.com>

* Update content/docs/user-guide/packaging/project-export/project-export-cli.md

Co-authored-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
Signed-off-by: T.J. Kotha <112996779+tkothadev@users.noreply.github.com>

* Update content/docs/user-guide/packaging/project-export/project-export-cli.md

Co-authored-by: Gene Walters <32776221+AMZN-Gene@users.noreply.github.com>
Signed-off-by: T.J. Kotha <112996779+tkothadev@users.noreply.github.com>

* addressed feedback

Signed-off-by: TJ Kotha <tankotha@amazon.com>

* removed unnecessary warning for profile builds

Signed-off-by: TJ Kotha <tankotha@amazon.com>

* Update content/docs/user-guide/packaging/project-export/project-export-cli.md

Co-authored-by: Gene Walters <32776221+AMZN-Gene@users.noreply.github.com>
Signed-off-by: T.J. Kotha <112996779+tkothadev@users.noreply.github.com>

* Update content/docs/user-guide/packaging/project-export/project-export-cli.md

Co-authored-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
Signed-off-by: T.J. Kotha <112996779+tkothadev@users.noreply.github.com>

* Update content/docs/user-guide/packaging/project-export/project-export-cli.md

Co-authored-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
Signed-off-by: T.J. Kotha <112996779+tkothadev@users.noreply.github.com>

* Update content/docs/user-guide/packaging/project-export/project-export-cli.md

Co-authored-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
Signed-off-by: T.J. Kotha <112996779+tkothadev@users.noreply.github.com>

* Update content/docs/user-guide/packaging/project-export/project-export-cli.md

Co-authored-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
Signed-off-by: T.J. Kotha <112996779+tkothadev@users.noreply.github.com>

* Update content/docs/user-guide/packaging/project-export/project-export-cli.md

Co-authored-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
Signed-off-by: T.J. Kotha <112996779+tkothadev@users.noreply.github.com>

* Update content/docs/user-guide/packaging/project-export/project-export-cli.md

Co-authored-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
Signed-off-by: T.J. Kotha <112996779+tkothadev@users.noreply.github.com>

* Update content/docs/user-guide/packaging/project-export/project-export-cli.md

Co-authored-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
Signed-off-by: T.J. Kotha <112996779+tkothadev@users.noreply.github.com>

* adding wildcard documentation for seed parameters

Signed-off-by: TJ Kotha <tankotha@amazon.com>

* splitting argument table into separate unique entries

Signed-off-by: TJ Kotha <tankotha@amazon.com>

* minor sentence improvement

Signed-off-by: TJ Kotha <tankotha@amazon.com>

* minor sentence improvements

Signed-off-by: TJ Kotha <tankotha@amazon.com>

* split up snippets into smaller sections

Signed-off-by: TJ Kotha <tankotha@amazon.com>

---------

Signed-off-by: TJ Kotha <tankotha@amazon.com>
Signed-off-by: T.J. Kotha <112996779+tkothadev@users.noreply.github.com>
Co-authored-by: TJ Kotha <tankotha@amazon.com>
Co-authored-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
Co-authored-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
Co-authored-by: Gene Walters <32776221+AMZN-Gene@users.noreply.github.com>

* Merge pull request #2513 from RoddieKieley/stabilization/23101

Signed-off-by: Jan Hanca <jan.hanca@robotec.ai>

* Added 23.10.1 release notes.

Signed-off-by: Roddie Kieley <rkieley@redhat.com>

* fix the typo (#2547)

Signed-off-by: kursad-k <67970138+kursad-k@users.noreply.github.com>

* Updated for the 23.10.3 point release.

Signed-off-by: Roddie Kieley <rkieley@redhat.com>

* Merge pull request #2552 from guillaume-haerinck/samples

Signed-off-by: Jan Hanca <jan.hanca@robotec.ai>

* fix merge conflicts

Signed-off-by: Jan Hanca <jan.hanca@robotec.ai>

* adding documentation for the new export button (#2578)

* adding documentation for the new export button

Signed-off-by: TJ Kotha <tankotha@amazon.com>

* addressing feedback round 1

Signed-off-by: TJ Kotha <tankotha@amazon.com>

* updating screenshots

Signed-off-by: TJ Kotha <tankotha@amazon.com>

---------

Signed-off-by: TJ Kotha <tankotha@amazon.com>
Co-authored-by: TJ Kotha <tankotha@amazon.com>
Signed-off-by: Jan Hanca <jan.hanca@robotec.ai>

---------

Signed-off-by: chanmosq <75444793+chanmosq@users.noreply.github.com>
Signed-off-by: Mike Chang <changml@amazon.com>
Signed-off-by: Naomi Washington <70667788+Naomi-Wash@users.noreply.github.com>
Signed-off-by: Roddie Kieley <rkieley@redhat.com>
Signed-off-by: Jan Hanca <jan.hanca@robotec.ai>
Signed-off-by: AMZN-Gene <genewalt@amazon.com>
Signed-off-by: TJ Kotha <tankotha@amazon.com>
Signed-off-by: T.J. Kotha <112996779+tkothadev@users.noreply.github.com>
Signed-off-by: kursad-k <67970138+kursad-k@users.noreply.github.com>
Co-authored-by: chanmosq <75444793+chanmosq@users.noreply.github.com>
Co-authored-by: Mike Chang <changml@amazon.com>
Co-authored-by: Naomi Washington <70667788+Naomi-Wash@users.noreply.github.com>
Co-authored-by: Roddie Kieley <rkieley@redhat.com>
Co-authored-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
Co-authored-by: Alex Montgomery <alexmont@amazon.com>
Co-authored-by: Gene Walters <32776221+AMZN-Gene@users.noreply.github.com>
Co-authored-by: T.J. Kotha <112996779+tkothadev@users.noreply.github.com>
Co-authored-by: TJ Kotha <tankotha@amazon.com>
Co-authored-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
Co-authored-by: kursad-k <67970138+kursad-k@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@willihay willihay willihay approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Naomi-Wash @willihay @RoddieKieley