Change 33199
Merge Down //p4-sdp/dev -> //p4-sdp/dev_rebrand.
17 files: mostly regenerated doc PDFs (branch/integrate, no conflicts),
plus p4pstate.sh and add_files_by_typemap.py (clean auto-merge/branch).
instance_vars.template had 2 real conflicting chunks, hand-resolved:
- Dropped a duplicate early MAILTO/MAILFROM block that dev relocated
further down in the file (kept only the relocated copy).
- Combined dev's new "Common values are perforce or p4admin" comment
with dev_rebrand's already-rebranded "Perforce P4 Server machine"
wording (dev's side hadn't rebranded that line yet).
- Also fixed one more "Helix administrators" instance that came in via
the relocated (non-conflicting) MAILTO block, to keep the file fully
rebranded per this stream's purpose.
Agent: Claude Code (Sonnet 5, claude-sonnet-5)
17 files: mostly regenerated doc PDFs (branch/integrate, no conflicts),
plus p4pstate.sh and add_files_by_typemap.py (clean auto-merge/branch).
instance_vars.template had 2 real conflicting chunks, hand-resolved:
- Dropped a duplicate early MAILTO/MAILFROM block that dev relocated
further down in the file (kept only the relocated copy).
- Combined dev's new "Common values are perforce or p4admin" comment
with dev_rebrand's already-rebranded "Perforce P4 Server machine"
wording (dev's side hadn't rebranded that line yet).
- Also fixed one more "Helix administrators" instance that came in via
the relocated (non-conflicting) MAILTO block, to keep the file fully
rebranded per this stream's purpose.
Agent: Claude Code (Sonnet 5, claude-sonnet-5)
Tip: Use n and p to cycle through the changes.