Skip to content

new content for e-mail, www, FTP section, & NTP sections - #303

Merged
JMadgwick merged 7 commits into
OpenIndiana:masterfrom
astonhill:master
Aug 29, 2026
Merged

new content for e-mail, www, FTP section, & NTP sections#303
JMadgwick merged 7 commits into
OpenIndiana:masterfrom
astonhill:master

Conversation

@astonhill

Copy link
Copy Markdown
Contributor

new content for e-mail, www, FTP section, & NTP sections. rebased on latest doc repo.

@astonhill

Copy link
Copy Markdown
Contributor Author

thanks for pointing out the rebasing issue, i have fetched upstream and made my github repo in sync with it. the new content should be in sync with the current branch & master of this.

i'm new to this :)

@JMadgwick
JMadgwick merged commit 555c518 into OpenIndiana:master Aug 29, 2026
4 checks passed
@JMadgwick

Copy link
Copy Markdown
Contributor

The diff was still incorrect but it's merged in ok.
For reference, you need to reset the master branch in your fork to be identical to this repo, not ahead or behind any commits. You should then make a new branch in your fork for each future PR to this repo. That will prevent any diff problems.

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.

2 participants