Changeset 03e6a40 for BOOK/general.ent


Ignore:
Timestamp:
Apr 20, 2014, 8:57:39 AM (12 years ago)
Author:
Chris Staub <chris@…>
Children:
0be79ea
Parents:
88ef769 (diff), 578ca586 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'systemd' into simp

Conflicts:

BOOK/final-system/common/bash.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/bash.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/general.ent
BOOK/packages.ent
BOOK/temp-system/common/bash.xml
BOOK/temp-system/mips64-64-chapter.xml
BOOK/temp-system/mips64-chapter.xml
BOOK/temp-system/multilib/bash.xml
BOOK/temp-system/ppc64-64-chapter.xml
BOOK/temp-system/ppc64-chapter.xml
BOOK/temp-system/sparc64-64-chapter.xml
BOOK/temp-system/sparc64-chapter.xml
BOOK/temp-system/x86_64-64-chapter.xml
BOOK/temp-system/x86_64-chapter.xml

File:
1 edited

Legend:

Unmodified
Added
Removed

  • BOOK/general.ent

    r88ef769 r03e6a40  
    11<?xml version="1.0" encoding="ISO-8859-1"?>
    22
    3 <!ENTITY month "12"> <!-- Use two digits -->
    4 <!ENTITY month_name "December">
    5 <!ENTITY day "30"> <!-- Use two digits -->
    6 <!ENTITY year "2013"> <!-- Use four digits -->
     3<!ENTITY month "04"> <!-- Use two digits -->
     4<!ENTITY month_name "April">
     5<!ENTITY day "20"> <!-- Use two digits -->
     6<!ENTITY year "2014"> <!-- Use four digits -->
    77
    88<!ENTITY releasedate "&month_name; &day;, &year;">
    … …  
    1313<!ENTITY generic-version "git"> <!-- Use "git", "testing", or "x.y.z[-pre{x}]" -->
    1414
    15 <!ENTITY version "GIT-&year;&month;&day;">
     15<!ENTITY versionid "&year;&month;&day;"> <!-- /etc/os-release from systemd -->
     16<!ENTITY version "SYSTEMD-&year;&month;&day;">
    1617
    1718<!ENTITY version-x86 "&version;-x86">
    … …  
    2829<!ENTITY version-mips64 "&version;-MIPS64-Multilib">
    2930<!ENTITY version-mips64-64 "&version;-MIPS64-Pure64">
     31<!-- Alpha isn't tested anymore
    3032<!ENTITY version-alpha "&version;-ALPHA">
     33-->
    3134<!ENTITY version-native "&version;-Native">
    3235<!ENTITY version-native64 "&version;-Native-Multilib">
Note: See TracChangeset for help on using the changeset viewer.