Merge pull request #65 from afh/clean-up

Clean up

Author: afh

CNAME

@@ -58,7 +58,7 @@
          src = ledger;
 
          nativeBuildInputs = with pkgs; [
-           cmake groff texinfo tex
+           cmake groff ghostscript texinfo tex
          ];
 
          enableParallelBuilding = false;
@@ -68,6 +68,14 @@
          cmakeFlags = [ "-DBUILD_WEB_DOCS:BOOL=ON" "-Wno-dev" ];
 
          buildFlags = "doc";
+
+         postBuild = ''
+           pdfroff -man -dpaper=letter -P-pletter $src/doc/ledger.1 > ledger.1.pdf
+           '';
+
+         postInstall = ''
+           cp ledger.1.pdf $out/share/doc/ledger
+           '';
        };
 
        doc-ledger-mode = pkgs.stdenvNoCC.mkDerivation rec {

flake.nix

@@ -5,55 +5,19 @@ title: About the site - Ledger
 # About the site
 
 The ledger-cli.org site is kept in the
-[ledger.github.io](https://github.com/ledger/ledger.github.io) repo ([changes](https://github.com/ledger/ledger.github.io/commits/master)).
+[ledger.github.io](https://git.ledger-cli.org/ledger.github.io) repo ([changes](https://git.ledger-cli.org/ledger.github.io/commits/master)).
 It is static html generated from markdown by [middleman](https://middlemanapp.com).
 Commits will normally appear on ledger-cli.org immediately, otherwise on the hour.
 
 Documentation comes from the
-[ledger docs in the `master`](https://github.com/ledger/ledger/tree/master/doc)
+[ledger docs in the `master`](https://git.ledger-cli.org/ledger/tree/master/doc)
 branch.
 
 There is also a wiki, that of the ledger repo on GitHub, with a convenient
 url alias: [wiki.ledger-cli.org](https://wiki.ledger-cli.org).
 
-The site is built using [GitHub Actions](https://github.com/ledger/ledger.github.io/actions) and
+The site is built using [GitHub Actions](https://git.ledger-cli.org/ledger.github.io/actions) and
 deploys to [GitHub Pages](https://pages.github.com).
 
-We use this small [Lambda@Edge](https://docs.aws.amazon.com/lambda/latest/dg/lambda-edge.html) function to serve redirects and to redirect bare domain to `www`:
-
-    'use strict';
-
-    exports.handler = (event, context, callback) => {
-        const request = event.Records[0].cf.request;
-        const host = request.headers.host[0].value;
-
-        if (host == "www.ledger-cli.org") {
-            callback(null, request);
-        } else {
-            var redirectTarget = 'https://www.ledger-cli.org';
-
-            if (host == "git.ledger-cli.org") {
-                redirectTarget = "https://github.com/ledger/ledger";
-            } else if (host == "list.ledger-cli.org") {
-                redirectTarget = "https://groups.google.com/group/ledger-cli";
-            } else if (host == "wiki.ledger-cli.org") {
-                redirectTarget = "https://github.com/ledger/ledger/wiki";
-            }
-
-            var response = {
-                status: '302',
-                statusDescription: 'Found',
-                headers: {
-                    location: [{
-                        key: 'Location',
-                        value: redirectTarget,
-                    }],
-                },
-            };
-
-            callback(null, response);
-        }
-    };
-
-
-<!-- The current webmaster is <a href="mailto:[email protected]">Pete Keen</a>. All help is welcome. -->
+[Cloudflare Redirect Rules](https://developers.cloudflare.com/rules/url-forwarding/single-redirects/examples/)
+are used to serve `git`, `wiki`, and `list` subdomain redirects and to redirect the apex domain to `www`.

source/about.html.md

@@ -19,7 +19,7 @@ Searching the list archive is another good way to find answers.
 Please report bugs at the [GitHub issue page](https://github.com/ledger/ledger/issues).
 
 **Code**
-The [ledger source code](https://git.ledger-cli.org/) is available on GitHub, contributions welcome!
+The [ledger source code](https://git.ledger-cli.org/ledger) is available on GitHub, contributions welcome!
 
 **Website**
 [About ledger-cli.org](about.html) documents this site so you can help improve it.

source/contribute.html.md

@@ -8,14 +8,14 @@ title: Documentation - Ledger
 .dim, .dim a:link, .dim a:visited { color:#ccc; }
 </style>
 
-* <b><a href="doc/ledger3.html">Ledger 3 manual</a></b> and <a href="doc/ledger3.pdf">pdf</a> <span class="dim">(<a href="https://github.com/ledger/ledger/commits/master/doc/ledger3.texi">changes</a>)
-* <a href="doc/ledger.1.html">Ledger 3 man page</a> <span class="dim">(<a href="https://github.com/ledger/ledger/commits/master/doc/ledger.1">changes</a>)
-* <a href="doc/ledger-mode.html">ledger-mode manual</a> and <a href="doc/ledger-mode.pdf">pdf</a> <span class="dim">(<a href="https://github.com/ledger/ledger-mode/commits/master/doc/ledger-mode.texi">changes</a>)
+* <b><a href="doc/ledger3.html">Ledger 3 manual</a></b> and <a href="doc/ledger3.pdf">pdf</a> <span class="dim">(<a href="https://git.ledger-cli.org/ledger/commits/master/doc/ledger3.texi">changes</a>)
+* <a href="doc/ledger.1.html">Ledger 3 man page</a> and <a href="doc/ledger.1.pdf">pdf</a> <span class="dim">(<a href="https://git.ledger-cli.org/ledger/commits/master/doc/ledger.1">changes</a>)
+* <a href="doc/ledger-mode.html">ledger-mode manual</a> and <a href="doc/ledger-mode.pdf">pdf</a> <span class="dim">(<a href="https://git.ledger-cli.org/ledger-mode/commits/master/doc/ledger-mode.texi">changes</a>)
 
 ## External links
 
 * The [ledger wiki](https://wiki.ledger-cli.org)
- <span class=dim> ([changes](https://github.com/ledger/ledger/wiki/_history)) </span>
+ <span class=dim> ([changes](https://wiki.ledger-cli.org/_history)) </span>
 * [ledger on Wikipedia](https://en.wikipedia.org/wiki/Ledger_%28software%29)
  <span class=dim> ([changes](https://en.wikipedia.org/w/index.php?title=Ledger_%28software%29&action=history)) </span>
 * John gave a nice audio introduction to Ledger in the [2011/01/26 FLOSS Weekly show](https://twit.tv/floss150)

source/docs.html.md

@@ -4,11 +4,11 @@ title: Download - Ledger
 
 # Getting ledger
 
-The [ledger source code](https://git.ledger-cli.org/) is available on GitHub.
-[![Build Status master](https://img.shields.io/github/actions/workflow/status/ledger/ledger/cmake.yml?branch=master&label=master&style=flat)](https://github.com/ledger/ledger/actions/workflows/cmake.yml)
-[![Status](https://img.shields.io/badge/status-active-brightgreen.svg?style=flat)](https://github.com/ledger/ledger/pulse/monthly)
+The [ledger source code](https://git.ledger-cli.org/ledger) is available on GitHub.
+[![Build Status master](https://img.shields.io/github/actions/workflow/status/ledger/ledger/cmake.yml?branch=master&label=master&style=flat)](https://git.ledger-cli.org/ledger/actions/workflows/cmake.yml)
+[![Status](https://img.shields.io/badge/status-active-brightgreen.svg?style=flat)](https://git.ledger-cli.org/ledger/pulse/monthly)
 [![License](https://img.shields.io/badge/license-BSD-blue.svg?style=flat)](https://opensource.org/licenses/BSD-3-Clause)
-[![GitHub release](https://img.shields.io/github/release/ledger/ledger.svg?style=flat)](https://github.com/ledger/ledger/releases)
+[![GitHub release](https://img.shields.io/github/release/ledger/ledger.svg?style=flat)](https://git.ledger-cli.orgr/ledger/releases)
 
 Several people in the Open Source community have spent time creating
 Ledger binaries for specific platforms. If you discover others or would

source/download.html.md

@@ -6,15 +6,15 @@ title: Features - Ledger
 
 Ledger is a powerful, double-entry accounting system that is accessed
 from the UNIX command-line. This may put off some users, as there is no
-flashy UI, but for those who want unparalleled reporting access to their
-data, there really is no alternative.
+flashy user-interface (UI), but for those who want unparalleled
+reporting access to their data, there really is no alternative.
 
-Here are some of the features of Ledger which set it apart from other
-accounting systems:
+Some of the features of Ledger which set it apart from other
+accounting systems include:
 
--   Ledger never creates or modifies your data. Your entries are kept in
-    a text file that **you maintain**, and you can rest assured, no
-    automated tool will ever change that data.
+- Ledger never creates or modifies your data. Your entries are kept in
+  a text file that **you maintain**, and you can rest assured, no
+  automated tool will ever change that data.
 
 - The amount of data required by Ledger is minimal. It figures out from
   looking at your data what you mean by it and how you want it reported
@@ -28,19 +28,19 @@ accounting systems:
   accuracies of your entries at every run; you won’t ever run into
   problems with “unaccounted” sums in an account.
 
--   Ledger is 100% currency-agnostic. You can store multiple currencies
-    in any account, convert between them, or even pay in one currency
-    and receive change in another.
+- Ledger is 100% currency-agnostic. You can store multiple currencies
+  in any account, convert between them, or even pay in one currency
+  and receive change in another.
 
--   Ledger is international. UTF8 is accepted anywhere in data files,
-    Ledger uses ISO format dates, attaches no meaning to the naming of
-    accounts, and can accept data in either US or European decimal
-    formats. It will report currencies back to you following the manner
-    of your own entries.
+- Ledger is international. UTF8 is accepted anywhere in data files,
+  Ledger uses ISO format dates, attaches no meaning to the naming of
+  accounts, and can accept data in either US or European decimal
+  formats. It will report currencies back to you following the manner
+  of your own entries.
 
--   Ledger uses a simple set of base commands which can be extended in
-    countless ways. You can create monthly reports, average reports,
-    check account balances, reconcile accounts, keep track of capital
-    gains on stocks, etc.
+- Ledger uses a simple set of base commands which can be extended in
+  countless ways. You can create monthly reports, average reports,
+  check account balances, reconcile accounts, keep track of capital
+  gains on stocks, etc.
 
 Read the [docs](docs.html) to learn more.

source/features.html.md

@@ -7,7 +7,7 @@ title: ledger, a powerful command-line accounting system
 Ledger is a powerful, double-entry accounting system that is accessed from
 the UNIX command-line. Ledger, begun in 2003, is written by John Wiegley
 and released under the BSD license.  It has also inspired several
-[ports](https://github.com/ledger/ledger/wiki/Ports) to other languages.
+[ports](https://wiki.ledger-cli.org/Ports) to other languages.
 
 To get started with Ledger, add transactions to a text file in Ledger’s
 own textual format. Here’s what a single transaction might look like:
@@ -18,10 +18,10 @@ own textual format. Here’s what a single transaction might look like:
     Liabilities:MasterCard   $-10.00
 ```
 
-You use the `ledger` command line program to see the balance of your accounts:
+You use the `ledger` command-line program to see the balance of your accounts:
 
 ```
-$ ledger -f your-file.dat balance
+$ ledger -f example.dat balance
               $10.00  Expenses:Auto:Gas
              $-10.00  Liabilities:MasterCard
 --------------------
@@ -31,7 +31,7 @@ $ ledger -f your-file.dat balance
 or the history of a particular account:
 
 ```
-$ ledger -f your-file.dat register Expenses
+$ ledger -f example.dat register Expenses
 15-Oct-12 Exxon               Expenses:Auto:Gas          $10.00      $10.00
 ```
 

source/index.html.md

@@ -7,7 +7,7 @@
   </head>
   <body>
     <div id="content">
-      <a href="https://git.ledger-cli.org" class="github-corner" aria-label="View source on GitHub"><svg width="80" height="80" viewBox="0 0 250 250" style="fill:#151513; color:#fff; position: absolute; top: 0; border: 0; right: 0;" aria-hidden="true"><title>Fork me on GitHub</title><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg></a><style>.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}</style>
+      <a href="https://git.ledger-cli.org/ledger" class="github-corner" aria-label="View source on GitHub"><svg width="80" height="80" viewBox="0 0 250 250" style="fill:#151513; color:#fff; position: absolute; top: 0; border: 0; right: 0;" aria-hidden="true"><title>Fork me on GitHub</title><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg></a><style>.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}</style>
       <div id="header">
         <div id="logo">
           <a href="/" style="color:black;">ledger</a>