From d9959ace123b7beb19252819e9b8d92286d40384 Mon Sep 17 00:00:00 2001 From: marty hiatt Date: Thu, 2 Nov 2023 11:00:51 +0100 Subject: update info re patches --- mastodon.info | 19 ++++++++++++------- mastodon.texi | 6 ++++-- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/mastodon.info b/mastodon.info index 47c9b9a..16b19d0 100644 --- a/mastodon.info +++ b/mastodon.info @@ -601,6 +601,10 @@ File: mastodon.info, Node: Contributing, Next: Supporting mastodonel, Prev: N PRs, issues, feature requests, and general feedback are very welcome! + If you prefer emailing patches to the process described below, feel +free to send them on. Ideally they’d be patches that can be applied +with ‘git am’, if you want to actually contribute a commit. + * Menu: * Bug reports:: @@ -622,7 +626,7 @@ File: mastodon.info, Node: Bug reports, Next: Fixes and features, Up: Contrib (https://codeberg.org/martianh/mastodon.el/issues/300)) to see if it also happens independently of your own config (it probably does). - 4. Enable debug on error (‘toggle-debug-on-error’), make the bug + 4. Else enable debug on error (‘toggle-debug-on-error’), make the bug happen again, and copy the backtrace that appears. 5. Open an issue here and explain what is going on. Provide your emacs version and what kind of server your account is on. @@ -637,7 +641,8 @@ File: mastodon.info, Node: Fixes and features, Next: Coding style, Prev: Bug detailing what you’d like to do. 2. Fork the repository and create a branch off of ‘develop’. 3. Run the tests and ensure that your code doesn’t break any of them. - 4. Create a pull request referencing the issue created in step 1. + 4. Create a pull request (to develop) referencing the issue created in + step 1.  File: mastodon.info, Node: Coding style, Prev: Fixes and features, Up: Contributing @@ -715,11 +720,11 @@ Node: Bookmarks and mastodonel20093 Node: Dependencies20565 Node: Network compatibility21175 Node: Contributing22057 -Node: Bug reports22346 -Node: Fixes and features23252 -Node: Coding style23735 -Node: Supporting mastodonel24359 -Node: Contributors24926 +Node: Bug reports22553 +Node: Fixes and features23464 +Node: Coding style23965 +Node: Supporting mastodonel24589 +Node: Contributors25156  End Tag Table diff --git a/mastodon.texi b/mastodon.texi index 872fb81..b33162d 100644 --- a/mastodon.texi +++ b/mastodon.texi @@ -717,6 +717,8 @@ free to open an issue. PRs, issues, feature requests, and general feedback are very welcome! +If you prefer emailing patches to the process described below, feel free to send them on. Ideally they'd be patches that can be applied with @samp{git am}, if you want to actually contribute a commit. + @menu * Bug reports:: * Fixes and features:: @@ -737,7 +739,7 @@ in emacs with no init file (i.e. @samp{emacs -q} (instructions and code for doin this are @uref{https://codeberg.org/martianh/mastodon.el/issues/300, here}) to see if it also happens independently of your own config (it probably does). @item -Enable debug on error (@samp{toggle-debug-on-error}), make the bug happen again, +Else enable debug on error (@samp{toggle-debug-on-error}), make the bug happen again, and copy the backtrace that appears. @item Open an issue here and explain what is going on. Provide your emacs version and what kind of server your account is on. @@ -754,7 +756,7 @@ Fork the repository and create a branch off of @samp{develop}. @item Run the tests and ensure that your code doesn't break any of them. @item -Create a pull request referencing the issue created in step 1. +Create a pull request (to develop) referencing the issue created in step 1. @end enumerate @node Coding style -- cgit v1.2.3