Stabilization/23101 main merge to resolve differing histories of override-a-prefab.md conflict #2513

RoddieKieley · 2023-12-06T20:58:36Z

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?

* Fix BJDS content Signed-off-by: chanmosq <75444793+chanmosq@users.noreply.github.com> * moved text Signed-off-by: chanmosq <75444793+chanmosq@users.noreply.github.com> --------- Signed-off-by: chanmosq <75444793+chanmosq@users.noreply.github.com>

Signed-off-by: Artur Kamieniecki <artur.kamieniecki@robotec.ai>

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

… pages of the old website to instead redirect to the new one. Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

Fixes to documentation website

Fix version handling for docs Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

Fix base url for 23.05 docs version Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Add the offline installer instructions for Windows Signed-off-by: Mike Chang <changml@amazon.com>

Revert "Modify docs to include ROS 2 Iron (o3de#2421)" This reverts commit 80dce3d. Signed-off-by: Artur Kamieniecki <artur.kamieniecki@robotec.ai>

Update system requirements link and clarify snap instructions Signed-off-by: Mike Chang <changml@amazon.com>

* 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>

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

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

Signed-off-by: Alex Montgomery <alexmont@amazon.com>

update prefab override documentation

- After review adding further commits from development that match changes in the stabilization/2310 branch of the software. Signed-off-by: Roddie Kieley <rkieley@redhat.com>

* 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)

Signed-off-by: Adam Dabrowski <adam.dabrowski@robotec.ai>

Signed-off-by: Michał Pełka <michal.pelka@robotec.ai>

* Initial quality system docs Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com> * minor fixes Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com> * remove unnecessary "to use" statements Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com> * move quality docs to optimization section Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com> --------- Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>

Signed-off-by: Adam Dąbrowski <adam.dabrowski@robotec.ai>

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

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

Initial quality system docs (o3de#2481)

updated robotics docs

Stabilization/2310 Updates post branch creation

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

23.10 regenerated api reference

…date Updated version information from 23.05 to 23.10.

…ctor Updated the Docs Version Selector for incoming 23.10

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

Stabilization/2310 - conflict resolution

Stabilization/2310

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

Added 23.10 release notes.

checked dynamically Signed-off-by: Alex Montgomery <alexmont@amazon.com>

Signed-off-by: Alex Montgomery <alexmont@amazon.com>

prefab override clarifications and updates

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

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

* 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>

chanmosq and others added 30 commits May 25, 2023 13:51

Modify docs to include ROS 2 Iron (o3de#2421)

80dce3d

Signed-off-by: Artur Kamieniecki <artur.kamieniecki@robotec.ai>

Update config.toml

685210b

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

Update config.toml

278db92

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

Quick fix - Made documentation be the landing page

aaa7c60

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

Adjust header to better match the new website. Fix URLs that point to…

823c688

… pages of the old website to instead redirect to the new one. Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

Merge pull request o3de#2436 from AMZN-daimini/daimini/docsWebsiteFixes

679240d

Fixes to documentation website

Fix version dropdown and warnings (o3de#2437)

f46c578

Fix version handling for docs Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

Fix base url for 23.05 version (o3de#2438)

e8bc231

Fix base url for 23.05 docs version Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

Windows offline installer instructions (o3de#2445)

f5dad19

* Add the offline installer instructions for Windows Signed-off-by: Mike Chang <changml@amazon.com>

Revert "Modify docs to include ROS 2 Iron" (o3de#2433)

4594edf

Revert "Modify docs to include ROS 2 Iron (o3de#2421)" This reverts commit 80dce3d. Signed-off-by: Artur Kamieniecki <artur.kamieniecki@robotec.ai>

Update linux and snap package instructions (o3de#2462)

133b8f2

Update system requirements link and clarify snap instructions Signed-off-by: Mike Chang <changml@amazon.com>

Regenerated o3de framework apis from o3de stabilization/2310 branch.

166a3b2

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

Regenerated o3de gem apis from o3de stabilization/2310 branch.

bee00cc

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

Regenerated o3de gem apis from o3de and o3de-extras stabilization/231…

a554995

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

update prefab override documentation

ba34349

Signed-off-by: Alex Montgomery <alexmont@amazon.com>

Merge pull request o3de#2479 from alexmontAmazon/alexmont/overrideDocs

8bd2b2e

update prefab override documentation

Merge branch 'development' into stabilization/2310

0fef75d

- After review adding further commits from development that match changes in the stabilization/2310 branch of the software. Signed-off-by: Roddie Kieley <rkieley@redhat.com>

updated robotics docs

a68ecfa

Signed-off-by: Adam Dabrowski <adam.dabrowski@robotec.ai>

update robot importer description

d6f749d

Signed-off-by: Michał Pełka <michal.pelka@robotec.ai>

Merge branch 'stabilization/2310' into update_robotics_docs

eb45c93

Signed-off-by: Adam Dąbrowski <adam.dabrowski@robotec.ai>

Regenerated o3de framework apis from o3de stabilization/2310 branch.

2f0b3c7

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

Regenerated o3de gem apis from o3de and o3de-extras stabilization/231…

5046247

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

Merge pull request #1 from o3de/stabilization/2310

a68dad4

Initial quality system docs (o3de#2481)

Merge pull request o3de#2483 from o3de/update_robotics_docs

f2354d2

updated robotics docs

Merge branch 'o3de:stabilization/2310' into stabilization/2310

b3377c8

Merge pull request o3de#2480 from RoddieKieley/stabilization/2310

4ec1fa4

Stabilization/2310 Updates post branch creation

RoddieKieley and others added 17 commits October 9, 2023 17:21

Updated the Docs Version Selector for incoming 23.10.

6bd0b8a

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

Updated version information from 23.05 to 23.10.

069e2cb

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

Merge pull request o3de#2478 from RoddieKieley/2310-api-ref

37d005c

23.10 regenerated api reference

Merge pull request o3de#2477 from RoddieKieley/2310-version-number-up…

a48c16e

…date Updated version information from 23.05 to 23.10.

Merge pull request o3de#2476 from RoddieKieley/2310-docs-version-sele…

fd954c2

…ctor Updated the Docs Version Selector for incoming 23.10

Resolved merge conflict for config.toml and installing-linux.md

ef82c55

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

Merge pull request o3de#2485 from RoddieKieley/stabilization/2310

5f051e4

Stabilization/2310 - conflict resolution

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

b816fd7

Stabilization/2310

Added 23.10 release notes. Moved 23.05 to archive. Added 22.10 link t…

274d326

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

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

05fa6a3

Added 23.10 release notes.

fixed docs to reflect that ed_enableOutlinerOverrideManagement is not

f2cf112

checked dynamically Signed-off-by: Alex Montgomery <alexmont@amazon.com>

fixed "updated" date

06336b4

Signed-off-by: Alex Montgomery <alexmont@amazon.com>

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

da33e38

doc changes, per UX

c4374e6

Signed-off-by: Alex Montgomery <alexmont@amazon.com>

changes per code review

59ac108

Signed-off-by: Alex Montgomery <alexmont@amazon.com>

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

b7fe90c

prefab override clarifications and updates

Merged main to resolve differing histories of override-a-prefab.md.

b270e48

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

RoddieKieley requested review from a team as code owners December 6, 2023 20:58

AMZN-alexpete self-requested a review December 15, 2023 00:36

AMZN-alexpete approved these changes Dec 15, 2023

View reviewed changes

Ulrick28 approved these changes Dec 15, 2023

View reviewed changes

RoddieKieley merged commit 24908fe into o3de:stabilization/23101 Dec 15, 2023
1 check passed

jhanca-robotecai added a commit that referenced this pull request Jul 4, 2024

Merge pull request #2513 from RoddieKieley/stabilization/23101

d35160d

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

jhanca-robotecai added a commit that referenced this pull request Jul 4, 2024

Merge pull request #2513 from RoddieKieley/stabilization/23101

aab286d

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

jhanca-robotecai added a commit that referenced this pull request Aug 16, 2024

Merge pull request #2513 from RoddieKieley/stabilization/23101

ec2f829

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Stabilization/23101 main merge to resolve differing histories of override-a-prefab.md conflict #2513

Stabilization/23101 main merge to resolve differing histories of override-a-prefab.md conflict #2513

RoddieKieley commented Dec 6, 2023

Stabilization/23101 main merge to resolve differing histories of override-a-prefab.md conflict #2513

Stabilization/23101 main merge to resolve differing histories of override-a-prefab.md conflict #2513

Conversation

RoddieKieley commented Dec 6, 2023

Change summary

Submission Checklist: