revert: restore pre-upstream-merge baseline (tree of 3b673150b)
All checks were successful
CI Code / Check spelling (pull_request) Successful in 18s
CI Code / Check coding style (pull_request) Successful in 30s
CI Code / Linux (ubuntu) (pull_request) Successful in 4m51s
CI Code / Linux (debian) (pull_request) Successful in 6m59s
CI Code / Linux (arch) (pull_request) Successful in 10m12s
CI Code / Code Coverage (pull_request) Successful in 6m44s
All checks were successful
CI Code / Check spelling (pull_request) Successful in 18s
CI Code / Check coding style (pull_request) Successful in 30s
CI Code / Linux (ubuntu) (pull_request) Successful in 4m51s
CI Code / Linux (debian) (pull_request) Successful in 6m59s
CI Code / Linux (arch) (pull_request) Successful in 10m12s
CI Code / Code Coverage (pull_request) Successful in 6m44s
Roll the tree back to the pre-merge tip3b673150b, undoing the upstream sync merge72f4f186d(303 files) and the 13 post-merge commits layered on top of it. Purpose: restore the last pre-sync baseline so the reported OMEMO/OTR encryption regressions can be reproduced against a known-good state and the upstream sync ruled in or out as the cause. Nothing is dropped from history; the merge and every post-merge commit remain reachable and can be cherry-picked back selectively. Baseline:3b673150bchore(chatlog): disable background message file logging (stage 1) Undoes merge:72f4f186dmerge: sync upstream profanity-im/profanity
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
.TH man 1 "2026-03-26" "0.17.0" "Profanity XMPP client"
|
||||
.TH man 1 "2023-08-03" "0.14.0" "Profanity XMPP client"
|
||||
.SH NAME
|
||||
Profanity \- a simple console based XMPP chat client.
|
||||
.SH DESCRIPTION
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
.TH man 1 "2026-03-23" "0.17.0" "Profanity XMPP client"
|
||||
.TH man 1 "2025-03-27" "0.15.0" "Profanity XMPP client"
|
||||
.SH NAME
|
||||
Profanity \- a simple console based XMPP chat client.
|
||||
.SH SYNOPSIS
|
||||
@@ -181,15 +181,7 @@ Stands for Mutli-User Chats (XEP-0045) and are also called, groups, group chats,
|
||||
The roster is your contact list. By default displayed at the right side on the console window. See RFC6121.
|
||||
.TP
|
||||
.BR XEP
|
||||
XMPP is an extendable protocol. There are core features and optional features described in XMPP Extension Protocols, short XEPs.
|
||||
.PP
|
||||
There are various kind of messages.
|
||||
.TP
|
||||
1:1 messages are regular messages from one party to another party, from one JID to the other JID. Often you have the other party added to your roster.
|
||||
.TP
|
||||
MUC messages are messages from one party to a group chat.
|
||||
.TP
|
||||
MUC PM (MUC private message) are messages from one party to another party which are in the same group chat. You might not have the JID of this person in your roster or don't know their JID at all. Communication is done over the MUC via the nick. Only the two parties can see the message. In the Android client Conversations this is displayed as "whispering". If a user leaves a MUC another user can join the MUC with the same nick unless the nick is registered. Which often isn't the case.
|
||||
XMPP is aa extendable protocol. There are core features and optional features described in XMPP Extension Protocols, short XEPs.
|
||||
.SH SEE ALSO
|
||||
.B Profanity
|
||||
itself has a lot of built\-in help. Check the
|
||||
@@ -261,7 +253,7 @@ or to the mailing list at:
|
||||
.br
|
||||
.SH LICENSE
|
||||
Copyright (C) 2012 \- 2019 James Booth <boothj5web@gmail.com>.
|
||||
Copyright (C) 2019 \- 2026 Michael Vetter <jubalh@iodoru.org>.
|
||||
Copyright (C) 2019 \- 2025 Michael Vetter <jubalh@iodoru.org>.
|
||||
License GPLv3+: GNU GPL version 3 or later <https://www.gnu.org/licenses/gpl.html>
|
||||
This is free software; you are free to change and redistribute it.
|
||||
There is NO WARRANTY, to the extent permitted by law.
|
||||
|
||||
Reference in New Issue
Block a user