diff options
author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-07-30 03:54:16 +0200 |
---|---|---|
committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-07-30 03:54:27 +0200 |
commit | 167f6dfee4d08ba092190b916afd103719456e86 (patch) | |
tree | 714f44350d2c7b8767fd90cbac4cd3ee95fed3b0 /doc | |
parent | 8a0886a3459fbbec66e5e1b2c789d65ac0f64bed (diff) | |
parent | acedeab23694d2b7fdcffe0dff52f98838cb23ae (diff) |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: - pkgs/development/libraries/science/astronomy/cfitsio/default.nix
Diffstat (limited to 'doc')
-rw-r--r-- | doc/contributing/contributing-to-documentation.chapter.md | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/doc/contributing/contributing-to-documentation.chapter.md b/doc/contributing/contributing-to-documentation.chapter.md index 0b7b49bf7dda1..557473555f8ab 100644 --- a/doc/contributing/contributing-to-documentation.chapter.md +++ b/doc/contributing/contributing-to-documentation.chapter.md @@ -1,24 +1,12 @@ # Contributing to this documentation {#chap-contributing} -The sources of the Nixpkgs manual are in the [doc](https://github.com/NixOS/nixpkgs/tree/master/doc) subdirectory of the Nixpkgs repository. The manual is still partially written in DocBook but it is progressively being converted to [Markdown](#sec-contributing-markup). +The sources of the Nixpkgs manual are in the [doc](https://github.com/NixOS/nixpkgs/tree/master/doc) subdirectory of the Nixpkgs repository. -You can quickly check your edits with `make`: +You can quickly check your edits with `nix-build`: ```ShellSession -$ cd /path/to/nixpkgs/doc -$ nix-shell -[nix-shell]$ make -``` - -If you experience problems, run `make debug` to help understand the docbook errors. - -After making modifications to the manual, it's important to build it before committing. You can do that as follows: - -```ShellSession -$ cd /path/to/nixpkgs/doc -$ nix-shell -[nix-shell]$ make clean -[nix-shell]$ nix-build . +$ cd /path/to/nixpkgs +$ nix-build doc ``` If the build succeeds, the manual will be in `./result/share/doc/nixpkgs/manual.html`. @@ -122,5 +110,3 @@ Additional syntax extensions are available, all of which can be used in NixOS op > > watermelon > : green fruit with red flesh - -For contributing to the legacy parts, please see [DocBook: The Definitive Guide](https://tdg.docbook.org/) or the [DocBook rocks! primer](https://web.archive.org/web/20200816233747/https://docbook.rocks/). |