Skip to content

Commit

Permalink
Support doc update
Browse files Browse the repository at this point in the history
  • Loading branch information
trapexit committed Aug 8, 2022
1 parent d1762b2 commit 9082285
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 9 deletions.
10 changes: 6 additions & 4 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ assignees: ''

**Describe the bug**

A clear and concise description of the unexpected behavior. Please be sure to use latest release of mergerfs to ensure the issue still exists.
A clear and concise description of the unexpected behavior.

**Please be sure to use latest release of mergerfs to ensure the issue still exists. Not your distro's latest but the latest official release.**

The master branch is **not** to be considered production ready. Feel free to file bug reports but do so indicating clearly that you are testing unreleased code.

Expand All @@ -18,9 +20,9 @@ The master branch is **not** to be considered production ready. Feel free to fil

Steps to reproduce the behavior. List **all** steps to reproduce. **All** settings.

Please simplify the reproduction as much as possible.
Please simplify the reproduction as much as possible.
- Unless it is dependenat on multiple branches, use a single branch
- Use standard tooling if possible (touch,truncate,rm,rmdir,ln,etc.)
- Reproduce with standard tooling if possible (touch,truncate,rm,rmdir,ln,etc.) Having to install 3rd party software will make debugging more difficult.


**Expected behavior**
Expand All @@ -36,7 +38,7 @@ A clear and concise description of the expected behavior.
- List of drives, filesystems, & sizes:
- `df -h`
- `lsblk -f`
- A strace of the application having a problem:
- A strace of the application having a problem:
- `strace -fvTtt -s 256 -o /tmp/app.strace.txt <cmd>`
- `strace -fvTtt -s 256 -o /tmp/app.strace.txt -p <appPID>`
- strace of mergerfs while app tried to do it's thing:
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/question.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
---
name: Question
about: When you're looking for information
about: When you're looking for information or general support
title: ''
labels: investigating, question
assignees: ''

---

You can also ask questions on Discord for realtime help: https://discord.gg/MpAr69V
For general questions and support please use [GitHub Discussions](https://github.com/trapexit/mergerfs/discussions) or [Discord](https://discord.gg/MpAr69V).
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -1291,6 +1291,8 @@ Filesystems are complex and difficult to debug. mergerfs, while being just a pro

**Please make sure you are using the [latest release](https://github.com/trapexit/mergerfs/releases) or have tried it in comparison. Old versions, which are often included in distros like Debian and Ubuntu, are not ever going to be updated and your bug may have been addressed already.**

**For commercial support or feature requests please contact me directly.**


#### Information to include in bug reports

Expand Down Expand Up @@ -1320,7 +1322,7 @@ Filesystems are complex and difficult to debug. mergerfs, while being just a pro

#### Support development

This software is free to use and released under a very liberal license (ISC). That said if you like this software and have the means please consider supporting its development.
This software is released under the very liberal ISC license and is therefore free to use for personal or commercial uses. That said if you like this software and have the means please consider supporting its development.

https://github.com/trapexit/support

Expand Down
7 changes: 5 additions & 2 deletions man/mergerfs.1
Original file line number Diff line number Diff line change
Expand Up @@ -2751,6 +2751,9 @@ release (https://github.com/trapexit/mergerfs/releases) or have tried it
in comparison. Old versions, which are often included in distros like
Debian and Ubuntu, are not ever going to be updated and your bug may
have been addressed already.\f[R]
.PP
\f[B]For commercial support or feature requests please contact me
directly.\f[R]
.SS Information to include in bug reports
.IP \[bu] 2
Version of mergerfs: \f[C]mergerfs \-V\f[R]
Expand Down Expand Up @@ -2802,8 +2805,8 @@ twitter: https://twitter.com/_trapexit
reddit: https://www.reddit.com/user/trapexit
.SS Support development
.PP
This software is free to use and released under a very liberal license
(ISC).
This software is released under the very liberal ISC license and is
therefore free to use for personal or commercial uses.
That said if you like this software and have the means please consider
supporting its development.
.PP
Expand Down

0 comments on commit 9082285

Please sign in to comment.