server/user-documentation
10
3
Fork 7
Code Issues Pull requests 2 Projects Activity

WIP: stg My edits to the NFS server setup docs #175

Draft
korora wants to merge 7 commits from korora/user-documentation:stg into main
pull from: korora/user-documentation:stg
merge into: server:main
Conversation 6 Commits 7 Files changed 17 +196 -2883
korora commented 2025-10-31 02:34:48 +00:00
Member
Copy link

I have taken care of #170 and #174 in these edits.

I have taken care of #170 and #174 in these edits.
korora commented 2025-10-31 03:04:26 +00:00
Author
Member
Copy link

This looks like it hsa more in it than it should

This looks like it hsa more in it than it should
copperi commented 2025-10-31 20:05:18 +00:00
Contributor
Copy link

Looks ok to me.

Looks ok to me.
korora commented 2025-11-04 05:10:15 +00:00
Author
Member
Copy link

@copperi wrote in #175 (comment):

Looks ok to me.

It should have only been the updates to the NFS guide (the removing trailing whitespace was me testing something else...)

@copperi wrote in https://forge.fedoraproject.org/server/user-documentation/pulls/175#issuecomment-146920: > Looks ok to me. It should have only been the updates to the NFS guide (the removing trailing whitespace was me testing something else...)
pboy approved these changes 2025-11-07 08:10:26 +00:00
pboy left a comment
Copy link

Seems OK to me. Although, I wonder why the many changes I made are included in the PR.

What I don't understand is why you removed the line about installing a generic disk image from the navigation. But that doesn't matter right now. (file ROOT/nav.adoc)

Seems OK to me. Although, I wonder why the many changes I made are included in the PR. What I don't understand is why you removed the line about installing a generic disk image from the navigation. But that doesn't matter right now. (file ROOT/nav.adoc)
pboy commented 2025-11-07 10:29:06 +00:00
Owner
Copy link

Undo everything! I just realized that this is the wrong workflow. The PR says: “korora wants to merge 8 commits from korora/user-documentation:stg to main.” I explain how the workflow should have been in the Contributor's Guide in our team documentation.

What I have done now: Cherry-pick corora's changes in the file filesharing-nfs-installation.adoc to branch nfs-upd in main repository and then merge nfs-upd to stg branch (in main repositopry).

Once the documentation is rebuilt, the changes should be visible there.

**Undo everything!** I just realized that this is the wrong workflow. The PR says: “korora wants to merge 8 commits from korora/user-documentation:stg to main.” I explain how the workflow should have been in the Contributor's Guide in our team documentation. What I have done now: Cherry-pick corora's changes in the file filesharing-nfs-installation.adoc to branch nfs-upd in main repository and then merge nfs-upd to stg branch (in main repositopry). Once the documentation is rebuilt, the changes should be visible there.
korora commented 2025-11-07 15:03:08 +00:00
Author
Member
Copy link

When I created the PR, I only wanted my changes to be part of it, and... Forge had other ideas

When I created the PR, I only wanted my changes to be part of it, and... Forge had other ideas
This pull request has changes conflicting with the target branch.
  • modules/ROOT/pages/administration/dnsmasq.adoc
  • modules/ROOT/pages/index.adoc
  • modules/ROOT/pages/installation/index.adoc
  • modules/ROOT/pages/installation/interactive-local.adoc
  • modules/ROOT/pages/installation/interactive-remote.adoc
  • modules/ROOT/pages/installation/postinstallation-tasks.adoc
  • modules/ROOT/pages/server-communicating.adoc
  • modules/ROOT/pages/services/filesharing-nfs-installation.adoc
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u stg:korora-stg
git switch korora-stg

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main
git merge --no-ff korora-stg
git switch korora-stg
git rebase main
git switch main
git merge --ff-only korora-stg
git switch korora-stg
git rebase main
git switch main
git merge --no-ff korora-stg
git switch main
git merge --squash korora-stg
git switch main
git merge --ff-only korora-stg
git switch main
git merge korora-stg
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
eseyman
pboy
Labels
Clear labels   
in progress

   
in progress
Work started

  
meeting
Scheduled for the next SIG meeting

  
need info
Additional information required

  
ongoing work project
Decided working task of the working group

  
on hold
temporarily interrupted

  
pending activity
Work awaiting being taken on

  
release test
test task for the next release

  
user documentation
ongoing work to update and improve documentation

No labels
in progress
in progress
meeting
need info
ongoing work project
on hold
pending activity
release test
user documentation
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
3 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
server/user-documentation!175
No description provided.