Skip to content

Commit 71b05db

Browse files
droidmonkeydroidmonkey
committed
Merge branch 'release/2.6.1' into develop
2 parents ff9dd43 + 22e0d8b commit 71b05db

28 files changed

Lines changed: 466 additions & 82 deletions

‎docs/CMakeLists.txt‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,20 @@ set(DOC_DIR ${CMAKE_CURRENT_SOURCE_DIR})
2424
set(OUT_DIR ${CMAKE_CURRENT_BINARY_DIR})
2525

2626
# Build html documentation on all platforms
27+
file(GLOB html_depends ${DOC_DIR}/topics/* ${DOC_DIR}/styles/* ${DOC_DIR}/images/*)
2728
add_custom_command(OUTPUT KeePassXC_GettingStarted.html
2829
COMMAND ${ASCIIDOCTOR_EXE} -D ${OUT_DIR} -o KeePassXC_GettingStarted.html ${DOC_DIR}/GettingStarted.adoc
29-
DEPENDS ${DOC_DIR}/topics/* ${DOC_DIR}/styles/* ${DOC_DIR}/images/* ${DOC_DIR}/GettingStarted.adoc
30+
DEPENDS ${html_depends} ${DOC_DIR}/GettingStarted.adoc
3031
VERBATIM)
3132
add_custom_command(OUTPUT KeePassXC_UserGuide.html
3233
COMMAND ${ASCIIDOCTOR_EXE} -D ${OUT_DIR} -o KeePassXC_UserGuide.html ${DOC_DIR}/UserGuide.adoc
33-
DEPENDS ${DOC_DIR}/topics/* ${DOC_DIR}/styles/* ${DOC_DIR}/images/* ${DOC_DIR}/UserGuide.adoc
34+
DEPENDS ${html_depends} ${DOC_DIR}/UserGuide.adoc
3435
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
3536
VERBATIM)
37+
file(GLOB styles_depends ${DOC_DIR}/styles/*)
3638
add_custom_command(OUTPUT KeePassXC_KeyboardShortcuts.html
3739
COMMAND ${ASCIIDOCTOR_EXE} -D ${OUT_DIR} -o KeePassXC_KeyboardShortcuts.html ${DOC_DIR}/topics/KeyboardShortcuts.adoc
38-
DEPENDS ${DOC_DIR}/topics/KeyboardShortcuts.adoc ${DOC_DIR}/styles/*
40+
DEPENDS ${DOC_DIR}/topics/KeyboardShortcuts.adoc ${styles_depends}
3941
VERBATIM)
4042

4143
add_custom_target(docs ALL DEPENDS KeePassXC_GettingStarted.html KeePassXC_UserGuide.html KeePassXC_KeyboardShortcuts.html)
@@ -50,11 +52,11 @@ install(FILES
5052
if(APPLE OR UNIX)
5153
add_custom_command(OUTPUT keepassxc.1
5254
COMMAND ${ASCIIDOCTOR_EXE} -D ${OUT_DIR} -b manpage ${DOC_DIR}/man/keepassxc.1.adoc
53-
DEPENDS ${DOC_DIR}/man/*
55+
DEPENDS ${DOC_DIR}/man/keepassxc.1.adoc
5456
VERBATIM)
5557
add_custom_command(OUTPUT keepassxc-cli.1
5658
COMMAND ${ASCIIDOCTOR_EXE} -D ${OUT_DIR} -b manpage ${DOC_DIR}/man/keepassxc-cli.1.adoc
57-
DEPENDS ${DOC_DIR}/man/*
59+
DEPENDS ${DOC_DIR}/man/keepassxc-cli.1.adoc
5860
VERBATIM)
5961
add_custom_target(manpages ALL DEPENDS keepassxc.1 keepassxc-cli.1)
6062

‎docs/man/keepassxc-cli.1.adoc‎

Lines changed: 41 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,28 @@
1+
// Copyright (C) 2017 Manolis Agkopian <m.agkopian@gmail.com>
2+
// Copyright (C) 2020 KeePassXC Team <team@keepassxc.org>
3+
//
4+
// This program is free software: you can redistribute it and/or modify
5+
// it under the terms of the GNU General Public License as published by
6+
// the Free Software Foundation, either version 2 or (at your option)
7+
// version 3 of the License.
8+
//
9+
// This program is distributed in the hope that it will be useful,
10+
// but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
// GNU General Public License for more details.
13+
//
14+
// You should have received a copy of the GNU General Public License
15+
// along with this program. If not, see <http://www.gnu.org/licenses/>.
16+
117
= keepassxc-cli(1)
2-
:docdate: 2020-07-05
18+
:docdate: 2020-07-10
319
:doctype: manpage
20+
:revnumber: 2.6.0
21+
:mansource: KeePassXC {revnumber}
422
:manmanual: General Commands Manual
523

624
== NAME
7-
keepassxc-cli - command line interface for the KeePassXC password manager.
25+
keepassxc-cli - command line interface for the KeePassXC password manager
826

927
== SYNOPSIS
1028
*keepassxc-cli* _command_ [_options_]
@@ -16,21 +34,21 @@ It provides the ability to query and modify the entries of a KeePass database, d
1634
== COMMANDS
1735
*add* [_options_] <__database__> <__entry__>::
1836
Adds a new entry to a database.
19-
A password can be generated (_-g_ option), or a prompt can be displayed to input the password (_-p_ option).
20-
The same password generation options as documented for the generate command can be used when the _-g_ option is set.
37+
A password can be generated (*-g* option), or a prompt can be displayed to input the password (*-p* option).
38+
The same password generation options as documented for the generate command can be used when the *-g* option is set.
2139

2240
*analyze* [_options_] <__database__>::
2341
Analyzes passwords in a database for weaknesses.
2442

2543
*clip* [_options_] <__database__> <__entry__> [_timeout_]::
26-
Copies an attribute or the current TOTP (if the _-t_ option is specified) of a database entry to the clipboard.
27-
If no attribute name is specified using the _-a_ option, the password is copied.
44+
Copies an attribute or the current TOTP (if the *-t* option is specified) of a database entry to the clipboard.
45+
If no attribute name is specified using the *-a* option, the password is copied.
2846
If multiple entries with the same name exist in different groups, only the attribute for the first one is copied.
2947
For copying the attribute of an entry in a specific group, the group path to the entry should be specified as well, instead of just the name.
3048
Optionally, a timeout in seconds can be specified to automatically clear the clipboard.
3149

3250
*close*::
33-
In interactive mode, closes the currently opened database (see _open_).
51+
In interactive mode, closes the currently opened database (see *open*).
3452

3553
*db-create* [_options_] <__database__>::
3654
Creates a new database with a password and/or a key file.
@@ -45,16 +63,16 @@ It provides the ability to query and modify the entries of a KeePass database, d
4563

4664
*edit* [_options_] <__database__> <__entry__>::
4765
Edits a database entry.
48-
A password can be generated (_-g_ option), or a prompt can be displayed to input the password (_-p_ option).
49-
The same password generation options as documented for the generate command can be used when the _-g_ option is set.
66+
A password can be generated (*-g* option), or a prompt can be displayed to input the password (*-p* option).
67+
The same password generation options as documented for the generate command can be used when the *-g* option is set.
5068

5169
*estimate* [_options_] [_password_]::
5270
Estimates the entropy of a password.
5371
The password to estimate can be provided as a positional argument, or using the standard input.
5472

5573
*exit*::
5674
Exits interactive mode.
57-
Synonymous with _quit_.
75+
Synonymous with *quit*.
5876

5977
*export* [_options_] <__database__>::
6078
Exports the content of a database to standard output in the specified format (defaults to XML).
@@ -78,7 +96,7 @@ It provides the ability to query and modify the entries of a KeePass database, d
7896
*merge* [_options_] <__database1__> <__database2__>::
7997
Merges two databases together.
8098
The first database file is going to be replaced by the result of the merge, for that reason it is advisable to keep a backup of the two database files before attempting a merge.
81-
In the case that both databases make use of the same credentials, the _--same-credentials_ or _-s_ option can be used.
99+
In the case that both databases make use of the same credentials, the *--same-credentials* or *-s* option can be used.
82100

83101
*mkdir* [_options_] <__database__> <__group__>::
84102
Adds a new group to a database.
@@ -88,11 +106,11 @@ It provides the ability to query and modify the entries of a KeePass database, d
88106

89107
*open* [_options_] <__database__>::
90108
Opens the given database in a shell-style interactive mode.
91-
This is useful for performing multiple operations on a single database (e.g. _ls_ followed by _show_).
109+
This is useful for performing multiple operations on a single database (e.g. *ls* followed by *show*).
92110

93111
*quit*::
94112
Exits interactive mode.
95-
Synonymous with _exit_.
113+
Synonymous with *exit*.
96114

97115
*rm* [_options_] <__database__> <__entry__>::
98116
Removes an entry from a database.
@@ -107,7 +125,7 @@ It provides the ability to query and modify the entries of a KeePass database, d
107125
*show* [_options_] <__database__> <__entry__>::
108126
Shows the title, username, password, URL and notes of a database entry.
109127
Can also show the current TOTP.
110-
Regarding the occurrence of multiple entries with the same name in different groups, everything stated in the _clip_ command section also applies here.
128+
Regarding the occurrence of multiple entries with the same name in different groups, everything stated in the *clip* command section also applies here.
111129

112130
== OPTIONS
113131
=== General options
@@ -151,7 +169,7 @@ It provides the ability to query and modify the entries of a KeePass database, d
151169
Uses the same credentials for unlocking both databases.
152170

153171
=== Add and edit options
154-
The same password generation options as documented for the generate command can be used with those 2 commands when the -g option is set.
172+
The same password generation options as documented for the generate command can be used with those 2 commands when the *-g* option is set.
155173

156174
*-u*, *--username* <__username__>::
157175
Specifies the username of the entry.
@@ -183,7 +201,7 @@ The same password generation options as documented for the generate command can
183201
*-a*, *--attribute*::
184202
Copies the specified attribute to the clipboard.
185203
If no attribute is specified, the password attribute is the default.
186-
For example, "_-a_ username" would copy the username to the clipboard.
204+
For example, "*-a* *username*" would copy the username to the clipboard.
187205
[Default: password]
188206

189207
*-t*, *--totp*::
@@ -204,7 +222,7 @@ The same password generation options as documented for the generate command can
204222
*-a*, *--attributes* <__attribute__>...::
205223
Shows the named attributes.
206224
This option can be specified more than once, with each attribute shown one-per-line in the given order.
207-
If no attributes are specified and _-t_ is not specified, a summary of the default attributes is given.
225+
If no attributes are specified and *-t* is not specified, a summary of the default attributes is given.
208226
Protected attributes will be displayed in clear text if specified explicitly by this option.
209227

210228
*-s*, *--show-protected*::
@@ -274,9 +292,11 @@ The same password generation options as documented for the generate command can
274292
Include characters from every selected group.
275293
[Default: Disabled]
276294

277-
== REPORTING BUGS
278-
Bugs and feature requests can be reported on GitHub at https://github.com/keepassxreboot/keepassxc/issues.
295+
include::section-notes.adoc[]
279296

280297
== AUTHOR
281-
This manual page was originally written by Manolis Agkopian <m.agkopian@gmail.com>,
282-
and is maintained by the KeePassXC Team <team@keepassxc.org>.
298+
This manual page was originally written by Manolis Agkopian <m.agkopian@gmail.com>.
299+
300+
include::section-reporting-bugs.adoc[]
301+
302+
include::section-copyright.adoc[]

‎docs/man/keepassxc.1.adoc‎

Lines changed: 31 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,28 @@
1+
// Copyright (C) 2019 Janek Bevendorff <janek@jbev.net>
2+
// Copyright (C) 2020 KeePassXC Team <team@keepassxc.org>
3+
//
4+
// This program is free software: you can redistribute it and/or modify
5+
// it under the terms of the GNU General Public License as published by
6+
// the Free Software Foundation, either version 2 or (at your option)
7+
// version 3 of the License.
8+
//
9+
// This program is distributed in the hope that it will be useful,
10+
// but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
// GNU General Public License for more details.
13+
//
14+
// You should have received a copy of the GNU General Public License
15+
// along with this program. If not, see <http://www.gnu.org/licenses/>.
16+
117
= keepassxc(1)
2-
:docdate: 2020-07-05
18+
:docdate: 2020-07-10
319
:doctype: manpage
20+
:revnumber: 2.6.0
21+
:mansource: KeePassXC {revnumber}
422
:manmanual: General Commands Manual
523

624
== NAME
7-
keepassxc - password manager
25+
keepassxc - a modern open-source password manager
826

927
== SYNOPSIS
1028
*keepassxc* [_options_] [_filename(s)_]
@@ -23,19 +41,25 @@ Your wallet works offline and requires no Internet connection.
2341
Displays version information.
2442

2543
*--config* <__config__>::
26-
Path to a custom config file
44+
Path to a custom config file.
2745

2846
*--keyfile* <__keyfile__>::
29-
Key file of the database
47+
Key file of the database.
3048

3149
*--pw-stdin*::
32-
Read password of the database from stdin
50+
Read password of the database from stdin.
3351

3452
*--pw*, *--parent-window* <__handle__>::
35-
Parent window handle
53+
Parent window handle.
3654

3755
*--debug-info*::
3856
Displays debugging information.
3957

58+
include::section-notes.adoc[]
59+
4060
== AUTHOR
41-
This manual page is maintained by the KeePassXC Team <team@keepassxc.org>.
61+
This manual page was originally written by Janek Bevendorff <janek@jbev.net>.
62+
63+
include::section-reporting-bugs.adoc[]
64+
65+
include::section-copyright.adoc[]

‎docs/man/section-copyright.adoc‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
// Copyright (C) 2020 KeePassXC Team <team@keepassxc.org>
2+
//
3+
// This program is free software: you can redistribute it and/or modify
4+
// it under the terms of the GNU General Public License as published by
5+
// the Free Software Foundation, either version 2 or (at your option)
6+
// version 3 of the License.
7+
//
8+
// This program is distributed in the hope that it will be useful,
9+
// but WITHOUT ANY WARRANTY; without even the implied warranty of
10+
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+
// GNU General Public License for more details.
12+
//
13+
// You should have received a copy of the GNU General Public License
14+
// along with this program. If not, see <http://www.gnu.org/licenses/>.
15+
16+
== COPYRIGHT
17+
Copyright \(C) 2016-2020 KeePassXC Team <team@keepassxc.org>
18+
19+
*KeePassXC* code is licensed under GPL-2 or GPL-3.

‎docs/man/section-notes.adoc‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
// Copyright (C) 2020 KeePassXC Team <team@keepassxc.org>
2+
//
3+
// This program is free software: you can redistribute it and/or modify
4+
// it under the terms of the GNU General Public License as published by
5+
// the Free Software Foundation, either version 2 or (at your option)
6+
// version 3 of the License.
7+
//
8+
// This program is distributed in the hope that it will be useful,
9+
// but WITHOUT ANY WARRANTY; without even the implied warranty of
10+
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+
// GNU General Public License for more details.
12+
//
13+
// You should have received a copy of the GNU General Public License
14+
// along with this program. If not, see <http://www.gnu.org/licenses/>.
15+
16+
== NOTES
17+
*Project homepage*::
18+
https://keepassxc.org
19+
20+
*QuickStart Guide*::
21+
https://keepassxc.org/docs/KeePassXC_GettingStarted.html
22+
23+
*User Guide*::
24+
https://keepassxc.org/docs/KeePassXC_UserGuide.html
25+
26+
*Git repository*::
27+
https://github.com/keepassxreboot/keepassxc.git

‎docs/man/section-reporting-bugs.adoc‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// Copyright (C) 2020 KeePassXC Team <team@keepassxc.org>
2+
//
3+
// This program is free software: you can redistribute it and/or modify
4+
// it under the terms of the GNU General Public License as published by
5+
// the Free Software Foundation, either version 2 or (at your option)
6+
// version 3 of the License.
7+
//
8+
// This program is distributed in the hope that it will be useful,
9+
// but WITHOUT ANY WARRANTY; without even the implied warranty of
10+
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+
// GNU General Public License for more details.
12+
//
13+
// You should have received a copy of the GNU General Public License
14+
// along with this program. If not, see <http://www.gnu.org/licenses/>.
15+
16+
== REPORTING BUGS
17+
Bugs and feature requests can be reported on GitHub at https://github.com/keepassxreboot/keepassxc/issues.

‎share/linux/org.keepassxc.KeePassXC.appdata.xml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,23 +28,23 @@
2828

2929
<screenshots>
3030
<screenshot type="default">
31-
<image>https://keepassxc.org/images/screenshots/linux/screen_001.png</image>
31+
<image>https://keepassxc.org/images/screenshots/thumbs/welcome_screen.png</image>
3232
<caption>Create, Import or Open Databases</caption>
3333
</screenshot>
3434
<screenshot>
35-
<image>https://keepassxc.org/images/screenshots/linux/screen_002.png</image>
35+
<image>https://keepassxc.org/images/screenshots/thumbs/database_view.png</image>
3636
<caption>Organize with Groups and Entries</caption>
3737
</screenshot>
3838
<screenshot>
39-
<image>https://keepassxc.org/images/screenshots/linux/screen_003.png</image>
39+
<image>https://keepassxc.org/images/screenshots/thumbs/edit_entry.png</image>
4040
<caption>Database Entry</caption>
4141
</screenshot>
4242
<screenshot>
43-
<image>https://keepassxc.org/images/screenshots/linux/screen_004.png</image>
43+
<image>https://keepassxc.org/images/screenshots/thumbs/edit_entry_icons.png</image>
4444
<caption>Icon Selection for Entry</caption>
4545
</screenshot>
4646
<screenshot>
47-
<image>https://keepassxc.org/images/screenshots/linux/screen_006.png</image>
47+
<image>https://keepassxc.org/images/screenshots/thumbs/password_generator_advanced.png</image>
4848
<caption>Password Generator</caption>
4949
</screenshot>
5050
</screenshots>
@@ -614,4 +614,5 @@
614614
</description>
615615
</release>
616616
</releases>
617+
<content_rating type="oars-1.0" />
617618
</component>

‎share/linux/org.keepassxc.KeePassXC.desktop‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,39 @@
11
[Desktop Entry]
22
Name=KeePassXC
33
GenericName=Password Manager
4+
GenericName[ar]=مدير كلمات المرور
5+
GenericName[bg]=Мениджър на пароли
6+
GenericName[ca]=Gestor de contrasenyes
7+
GenericName[cs]=Aplikace pro správu hesel
48
GenericName[da]=Adgangskodehåndtering
59
GenericName[de]=Passwortverwaltung
610
GenericName[es]=Gestor de contraseñas
11+
GenericName[et]=Paroolihaldur
12+
GenericName[fi]=Salasanamanageri
713
GenericName[fr]=Gestionnaire de mot de passe
14+
GenericName[hu]=Jelszókezelő
15+
GenericName[id]=Pengelola Sandi
16+
GenericName[it]=Gestione password
17+
GenericName[ja]=パスワードマネージャー
18+
GenericName[ko]=암호 관리자
19+
GenericName[lt]=Slaptažodžių tvarkytuvė
20+
GenericName[nb]=Passordhåndterer
21+
GenericName[nl]=Wachtwoordbeheer
22+
GenericName[pl]=Menedżer haseł
23+
GenericName[pt_BR]=Gerenciador de Senhas
24+
GenericName[pt]=Gestor de palavras-passe
25+
GenericName[ro]=Manager de parole
826
GenericName[ru]=менеджер паролей
27+
GenericName[sk]=Správca hesiel
28+
GenericName[sv]=Lösenordshanterare
29+
GenericName[th]=แอพจัดการรหัสผ่าน
30+
GenericName[tr]=Parola yöneticisi
31+
GenericName[uk]=Розпорядник паролів
32+
GenericName[zh_CN]=密码管理器
33+
GenericName[zh_TW]=密碼管理員
934
Comment=Community-driven port of the Windows application “KeePass Password Safe”
1035
Comment[da]=Fællesskabsdrevet port af Windows-programmet “KeePass Password Safe”
36+
Comment[et]=Kogukonna arendatav port Windowsi programmist KeePass Password Safe
1137
Exec=keepassxc %f
1238
TryExec=keepassxc
1339
Icon=keepassxc

0 commit comments

Comments
 (0)