diff --git a/changelog.md b/changelog.md index ca30f51ace..48a7be7359 100644 --- a/changelog.md +++ b/changelog.md @@ -329,7 +329,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - 🇰🇷 Korean translations! - A new "adjusted" auto-budget type that will correct itself after - spending. [Read more](https://docs.firefly-iii.org/firefly-iii/financial-concepts/organizing/#adjusted-and-correct-for-overspending) + spending. [Read more](https://docs.firefly-iii.org/xfirefly-iii/financial-concepts/organizing/#adjusted-and-correct-for-overspending) - [Issue 6631](https://github.com/firefly-iii/firefly-iii/issues/6631) Can now link withdrawals and deposits to piggy banks, thanks @ChrisWin22! @@ -1119,7 +1119,7 @@ https://api-docs.firefly-iii.org/. - ⚠️ This is the last release that supports PHP 8.0 - 👍 Want to try the new v3 layout? At your own risk, browse to `/v3/`. -Please refer to the [documentation](https://docs.firefly-iii.org/firefly-iii/) and support channels if you run into +Please refer to the [documentation](https://docs.firefly-iii.org/xfirefly-iii/) and support channels if you run into problems: - [Gitter.im](https://gitter.im/firefly-iii/firefly-iii) @@ -1197,6 +1197,6 @@ problems: # Full change log -Can be found here: https://docs.firefly-iii.org/firefly-iii/about-firefly-iii/changelog/ +Can be found here: https://docs.firefly-iii.org/references/firefly-iii/changelog/ diff --git a/index.php b/index.php index 81e30f194c..3de8c46999 100644 --- a/index.php +++ b/index.php @@ -48,7 +48,7 @@ echo ' Leaving your web server configured like this is a huge security risk.

-Please read more on the Github help pages. +Please read more on the Github help pages.

diff --git a/public/.well-known/security.txt b/public/.well-known/security.txt index b0a9e45f39..cd36850af4 100644 --- a/public/.well-known/security.txt +++ b/public/.well-known/security.txt @@ -14,7 +14,7 @@ Hash: SHA256 Contact: mailto:james@firefly-iii.org Expires: 2024-12-31T23:00:00.000Z Preferred-Languages: en, nl -Policy: https://docs.firefly-iii.org/firefly-iii/support/ +Policy: https://docs.firefly-iii.org/explanation/support/ # # Thank you for your time! @@ -24,18 +24,18 @@ Policy: https://docs.firefly-iii.org/firefly-iii/support/ # -----BEGIN PGP SIGNATURE----- -iQJKBAABCAA0FiEEAvQEbEsjbgYJVxYStJoyS36tbYAFAmUGj9gWHGphbWVzQGZp -cmVmbHktaWlpLm9yZwAKCRC0mjJLfq1tgA0WD/9cHNSphMqPx05Tkak5kNKsmyYW -YXZ4kcw5haLwcxk4ipudCzYLWejcXI7z/WVdYQrZVMw6Kaz6Z/ZgJQk6mQXTeb3L -WcmxmiKGQk5twnmIy7vpoBgt2QH70lhP/x+FH0w1j22RM5b66gj/BZBYowtmUI1L -HIwsTvtjBGZA8aJSPmtRGULJ45/GDZYi/Hjx49hPPLjIE8VP53Wa7L284i4R+gG9 -IEle9kqb2OUUp0+CmIXSKAvtFpDHt9Yc0AE6PU0WpSg3LI6NqyUiM2CdKvyKvtIV -Y15LoJTkTuORzudP1HCImfcQUdJgrMe1DGz2siHqxTJVDUwzEVc6mOkGnefhIpFy -jN0ik6pCSkLNsSYImQZq9H6d9yiPPYSR3JFjTDtEVnANjlT08ywPdsyWgvNaHHh1 -eMRy9+X24g9cQ7MqU77Y8p2/v3IudWbEsi+M1FUm4W0TE/MsNv9xydRvB6M41eVc -raYnk8cVmEzpjsyxi9lAqpk4+qYD04JecYCPxkX6XxkFxzswS20LR4VVOamfKgv1 -yIzg1sCMArHeq0OC1k6lskB8DTXvw5+838iw4h8I0T6MAqXj4RKv8C45w7+uSlG9 -oXhpUweiiRzyZPWbWXU7jC9BvDyqfuxq9jn4LFDzAOV0raLz6QThiUcR3f7h2Rvo -KiDjx3KprWU+swTosw== -=1jlJ +iQJKBAABCAA0FiEEAvQEbEsjbgYJVxYStJoyS36tbYAFAmV37E8WHGphbWVzQGZp +cmVmbHktaWlpLm9yZwAKCRC0mjJLfq1tgFtzD/4lrhVkCi4mRAroSMbz7ZHbLwLi +RAgiaFmnDI48LqkX/jJJTWSy8czl9gkKO9uVJzXwmjVzFg5vJTkRfjvNlTyOpL/l +gB+REFYGadp8ulMCZcBlFgLbyAWtvHKV3UW//G8fzrASAEe+2eiuPQooLmwaKows +X+ty2zZEH282uAiR36otlGR2UpUcYAy0XcAuE7hIxfHA8bsh5uqzAkm74OsynC8E +6vBEi1QzarE+cfoZqBtriWELyownM9Z5a/cIzm47RfBkFUKXaQBL3pYN1kX2TAi5 +1//0WLrDiotkIwPmdYiYFmVmaJDjcapcAkDoD/wAv8BxxjPZ900RCTF4jzMTxIu0 +t6umbm3SaA/vaINv8ilmMMj6ep49GE8EssHvRBUaGnv7JjHe+XCZrOsk3a5+Z4zQ +Sd9nuryLCX/G3Bz63rU/V1evuCT7ouNEWKUlwtYCqU+6BfumTdbJCPEH/4szxoi2 +cPvIw5Y5sA9ue5Wm4RIX7G0DyIRJJf3CB0PJWuujzF548hn60MPBLDw7xSraTQNX +v1GRwTHIOo6e1U47naz9U3Dv3pK2J5aibL4K6pjyZG1bTqfE/0uY0hEXVFuNqAxT +B6LSAcrP4j+bU4oZlWRx99yHv1ComWZzi/JvRKp9Y0aTcWbAeT+oz3PFw8K5lff/ +eweJG/H9BuHgDXdYQg== +=Z9Gk -----END PGP SIGNATURE----- diff --git a/public/.well-known/security.txt.sig b/public/.well-known/security.txt.sig index 6f4360e7f6..8bfbe16831 100644 --- a/public/.well-known/security.txt.sig +++ b/public/.well-known/security.txt.sig @@ -1,17 +1,17 @@ -----BEGIN PGP SIGNATURE----- -iQJKBAABCAA0FiEEAvQEbEsjbgYJVxYStJoyS36tbYAFAmUGj9gWHGphbWVzQGZp -cmVmbHktaWlpLm9yZwAKCRC0mjJLfq1tgA0WD/9cHNSphMqPx05Tkak5kNKsmyYW -YXZ4kcw5haLwcxk4ipudCzYLWejcXI7z/WVdYQrZVMw6Kaz6Z/ZgJQk6mQXTeb3L -WcmxmiKGQk5twnmIy7vpoBgt2QH70lhP/x+FH0w1j22RM5b66gj/BZBYowtmUI1L -HIwsTvtjBGZA8aJSPmtRGULJ45/GDZYi/Hjx49hPPLjIE8VP53Wa7L284i4R+gG9 -IEle9kqb2OUUp0+CmIXSKAvtFpDHt9Yc0AE6PU0WpSg3LI6NqyUiM2CdKvyKvtIV -Y15LoJTkTuORzudP1HCImfcQUdJgrMe1DGz2siHqxTJVDUwzEVc6mOkGnefhIpFy -jN0ik6pCSkLNsSYImQZq9H6d9yiPPYSR3JFjTDtEVnANjlT08ywPdsyWgvNaHHh1 -eMRy9+X24g9cQ7MqU77Y8p2/v3IudWbEsi+M1FUm4W0TE/MsNv9xydRvB6M41eVc -raYnk8cVmEzpjsyxi9lAqpk4+qYD04JecYCPxkX6XxkFxzswS20LR4VVOamfKgv1 -yIzg1sCMArHeq0OC1k6lskB8DTXvw5+838iw4h8I0T6MAqXj4RKv8C45w7+uSlG9 -oXhpUweiiRzyZPWbWXU7jC9BvDyqfuxq9jn4LFDzAOV0raLz6QThiUcR3f7h2Rvo -KiDjx3KprWU+swTosw== -=1jlJ +iQJKBAABCAA0FiEEAvQEbEsjbgYJVxYStJoyS36tbYAFAmV37E8WHGphbWVzQGZp +cmVmbHktaWlpLm9yZwAKCRC0mjJLfq1tgFtzD/4lrhVkCi4mRAroSMbz7ZHbLwLi +RAgiaFmnDI48LqkX/jJJTWSy8czl9gkKO9uVJzXwmjVzFg5vJTkRfjvNlTyOpL/l +gB+REFYGadp8ulMCZcBlFgLbyAWtvHKV3UW//G8fzrASAEe+2eiuPQooLmwaKows +X+ty2zZEH282uAiR36otlGR2UpUcYAy0XcAuE7hIxfHA8bsh5uqzAkm74OsynC8E +6vBEi1QzarE+cfoZqBtriWELyownM9Z5a/cIzm47RfBkFUKXaQBL3pYN1kX2TAi5 +1//0WLrDiotkIwPmdYiYFmVmaJDjcapcAkDoD/wAv8BxxjPZ900RCTF4jzMTxIu0 +t6umbm3SaA/vaINv8ilmMMj6ep49GE8EssHvRBUaGnv7JjHe+XCZrOsk3a5+Z4zQ +Sd9nuryLCX/G3Bz63rU/V1evuCT7ouNEWKUlwtYCqU+6BfumTdbJCPEH/4szxoi2 +cPvIw5Y5sA9ue5Wm4RIX7G0DyIRJJf3CB0PJWuujzF548hn60MPBLDw7xSraTQNX +v1GRwTHIOo6e1U47naz9U3Dv3pK2J5aibL4K6pjyZG1bTqfE/0uY0hEXVFuNqAxT +B6LSAcrP4j+bU4oZlWRx99yHv1ComWZzi/JvRKp9Y0aTcWbAeT+oz3PFw8K5lff/ +eweJG/H9BuHgDXdYQg== +=Z9Gk -----END PGP SIGNATURE----- diff --git a/readme.md b/readme.md index ec46ee3603..f805ff8b90 100644 --- a/readme.md +++ b/readme.md @@ -90,20 +90,20 @@ Firefly III is pretty feature packed. Some important stuff first: The most exciting features are: -* Create [recurring transactions to manage your money](https://docs.firefly-iii.org/firefly-iii/financial-concepts/recurring/). -* [Rule based transaction handling](https://docs.firefly-iii.org/firefly-iii/features/rules/) with the ability to create your own rules. +* Create [recurring transactions to manage your money](https://docs.firefly-iii.org/explanation/financial-concepts/recurring/). +* [Rule based transaction handling](https://docs.firefly-iii.org/how-to/firefly-iii/features/rules/) with the ability to create your own rules. Then the things that make you go "yeah OK, makes sense". * A [double-entry](https://en.wikipedia.org/wiki/Double-entry_bookkeeping_system) bookkeeping system. -* Save towards a goal using [piggy banks](https://docs.firefly-iii.org/firefly-iii/financial-concepts/piggies/). -* View [income and expense reports](https://docs.firefly-iii.org/firefly-iii/features/reports/). +* Save towards a goal using [piggy banks](https://docs.firefly-iii.org/explanation/financial-concepts/piggies/). +* View [income and expense reports](https://docs.firefly-iii.org/how-to/firefly-iii/finances/reports/). And the things you would hope for but not expect: * 2 factor authentication for extra security 🔒. -* Supports [any currency you want](https://docs.firefly-iii.org/firefly-iii/financial-concepts/currencies/). -* There is a [Docker image](https://docs.firefly-iii.org/firefly-iii/installation/docker/). +* Supports [any currency you want](https://docs.firefly-iii.org/how-to/firefly-iii/features/currencies/). +* There is a [Docker image](https://docs.firefly-iii.org/how-to/firefly-iii/installation/docker/). And to organise everything: @@ -111,7 +111,7 @@ And to organise everything: * Easy navigation through your records. * Lots of charts because we all love them. -Many more features are listed in the [documentation](https://docs.firefly-iii.org/firefly-iii/about-firefly-iii/introduction/). +Many more features are listed in the [documentation](https://docs.firefly-iii.org/explanation/firefly-iii/about/introduction/). ## Who's it for? Firefly III on iPhone @@ -122,14 +122,14 @@ Many more features are listed in the [documentation](https://docs.firefly-iii.or ## The Firefly III eco-system -Several users have built pretty awesome stuff around the Firefly III API. [Check out these tools in the documentation](https://docs.firefly-iii.org/firefly-iii/more-information/3rdparty/). +Several users have built pretty awesome stuff around the Firefly III API. [Check out these tools in the documentation](https://docs.firefly-iii.org/references/firefly-iii/third-parties/apps/). ## Getting Started There are many ways to run Firefly III 1. There is a [demo site](https://demo.firefly-iii.org) with an example financial administration already present. -2. You can [install it on your server](https://docs.firefly-iii.org/firefly-iii/installation/self-hosted/). -3. You can [run it using Docker](https://docs.firefly-iii.org/firefly-iii/installation/docker/). +2. You can [install it on your server](https://docs.firefly-iii.org/how-to/firefly-iii/installation/self-managed/). +3. You can [run it using Docker](https://docs.firefly-iii.org/how-to/firefly-iii/installation/docker/). 4. You can [deploy via Kubernetes](https://firefly-iii.github.io/kubernetes/). 5. You can [install it using Softaculous](https://www.softaculous.com/softaculous/apps/others/Firefly_III). 6. You can [install it using AMPPS](https://www.ampps.com/). @@ -143,7 +143,7 @@ You can contact me at [james@firefly-iii.org](mailto:james@firefly-iii.org), you Of course, there are some [contributing guidelines](https://docs.firefly-iii.org/firefly-iii/support/#contributing-code) and a [code of conduct](https://github.com/firefly-iii/firefly-iii/blob/main/.github/code_of_conduct.md), which I invite you to check out. -I can always use your help [squashing bugs](https://docs.firefly-iii.org/data-importer/support/issues/), thinking about [new features](https://docs.firefly-iii.org/data-importer/support/issues/) or [translating Firefly III](https://docs.firefly-iii.org/firefly-iii/faq/translate/) into other languages. +I can always use your help [squashing bugs](https://docs.firefly-iii.org/references/support/), thinking about [new features](https://docs.firefly-iii.org/references/support/) or [translating Firefly III](https://docs.firefly-iii.org/how-to/firefly-iii/development/translations/) into other languages. [Sonarcloud][sc-project-url] scans the code of Firefly III. If you want to help improve Firefly III, check out the latest reports and take your pick!