Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 49a6964a4250
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0f73fef53a97
Choose a head ref
  • 8 commits
  • 29 files changed
  • 3 contributors

Commits on Jun 1, 2018

  1. doc: Adds rule to xmlformat to help keep spacing right.

    The other definitions broke term, cmdsynopsis and arg tags; spaces
    inside were removed, making workdsrun-ininstead of keeping them spaced.
    
    (cherry picked from commit aa59151)
    samueldr committed Jun 1, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    Copy the full SHA
    0f8fcfa View commit details
  2. doc: Adds xml fixing script. (see previous and next commits)

    This script is used to automatically fix issues within xml documentation
    files.
    
    The script is *for now* intended to be used ad-hoc, and the commits to
    be examined.
    
    A future discussion will define whether:
    
      * This commit and scripts are kept.
      * The script is extended for common use.
    
    The biggest issue right now with the script is that it *could* in theory
    destroy a valid space-less varlistentry.
    
    The script could, in practical use, be changed and extended to normalize
    some parts of the XML files, mainly:
    
      * A common quoting style for attributes
      * Fix-up some weird formatting automatically that xmlformat doesn't
        catch
    
    (cherry picked from commit bc0421c)
    samueldr committed Jun 1, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    Copy the full SHA
    5a4c26c View commit details
  3. doc: ran make format

    With visual inspection that nothing got worse.
    samueldr committed Jun 1, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    pSub Pascal Wittmann
    Copy the full SHA
    820ca3c View commit details
  4. nixos/doc: ran make format

    With visual inspection that nothing got worse.
    samueldr committed Jun 1, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    Copy the full SHA
    8b19c12 View commit details
  5. Copy the full SHA
    eeea0ff View commit details
  6. Copy the full SHA
    3a33c58 View commit details

Commits on Jun 5, 2018

  1. Merge pull request #41344 from samueldr/fix/doc/formatting-oopsies-un…

    …stable_18.03
    
    Fixes doc auto-formatting oopsies [18.03]
    xeji authored Jun 5, 2018
    Copy the full SHA
    1723213 View commit details
  2. cacert: fix certdata2pem url (#41504)

    backports 933d7f3
    veprbl authored and xeji committed Jun 5, 2018
    Copy the full SHA
    0f73fef View commit details
5 changes: 5 additions & 0 deletions doc/Makefile
Original file line number Diff line number Diff line change
@@ -12,6 +12,11 @@ format:
find . -iname '*.xml' -type f -print0 | xargs -0 -I{} -n1 \
xmlformat --config-file "$$XMLFORMAT_CONFIG" -i {}

.PHONY: fix-misc-xml
fix-misc-xml:
find . -iname '*.xml' -type f \
-exec ../nixos/doc/varlistentry-fixer.rb {} ';'

.PHONY: clean
clean:
rm -f ${MD_TARGETS} .version manual-full.xml
Loading