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.

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

#5903 - Test/improve pull backup docs #6087

Merged
merged 1 commit into from
Dec 12, 2021

Conversation

fantasya-pbem
Copy link
Contributor

Backport from master.

This is not improving the warnings etc. yet - just a fix for the broken menu indentation in 1.1-maint, which has been fixed already in master.

I will add more improvements in master branch, and finally backport them later.

@ThomasWaldmann
Copy link
Member

Is this some specific PR you are backporting, can you point to it?

@fantasya-pbem
Copy link
Contributor Author

No, I just merged master into 1.1-maint after I found that someone already fixed the headers in master.
It seems that the socat section has not been backported yet. In master the commit mentions #5150, but this issue does not exist (anymore?).

@ThomasWaldmann
Copy link
Member

This is pretty much a backport of PR #5150 (no problem for me klicking on this, it exists), please mention that in this PR text or commit comment.

@ThomasWaldmann
Copy link
Member

Alternatively, point to that:

document the socat pull mode described in #900 (comment).

Backport from master borgbackup#5150: Document the socat pull mode described in borgbackup#900.
@fantasya-pbem fantasya-pbem changed the title [TASK] #5903 - Test/improve pull backup docs #5903 - Test/improve pull backup docs Dec 11, 2021
@fantasya-pbem
Copy link
Contributor Author

Done, ok?

@ThomasWaldmann ThomasWaldmann merged commit eff08b0 into borgbackup:1.1-maint Dec 12, 2021
@ThomasWaldmann
Copy link
Member

Thanks!

@fantasya-pbem fantasya-pbem deleted the 1.1-maint branch May 27, 2022 05:35
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