Skip to content
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
base: 49a6964a4250
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 17232131b5bb
Choose a head ref
  • 7 commits
  • 28 files changed
  • 2 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
    Copy the full SHA
    0f8fcfa View commit details
    Browse the repository at this point in the history
  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
    Copy the full SHA
    5a4c26c View commit details
    Browse the repository at this point in the history
  3. doc: ran make format

    With visual inspection that nothing got worse.
    samueldr committed Jun 1, 2018
    Copy the full SHA
    820ca3c View commit details
    Browse the repository at this point in the history
  4. nixos/doc: ran make format

    With visual inspection that nothing got worse.
    samueldr committed Jun 1, 2018
    Copy the full SHA
    8b19c12 View commit details
    Browse the repository at this point in the history
  5. Copy the full SHA
    eeea0ff View commit details
    Browse the repository at this point in the history
  6. Copy the full SHA
    3a33c58 View commit details
    Browse the repository at this point in the history

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 committed Jun 5, 2018
    Copy the full SHA
    1723213 View commit details
    Browse the repository at this point in the history