Changeset 229ed25 for BOOK/general.ent


Ignore:
Timestamp:
Jan 4, 2014, 12:03:38 AM (10 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
f90d077
Parents:
ec008670 (diff), e57ce38 (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 'master' into systemd

Conflicts:

BOOK/appendices/dependencies/common.xml
BOOK/boot/common/devices.xml
BOOK/boot/common/pwdgroup.xml
BOOK/boot/ppc64-64/powerpc-utils.xml
BOOK/boot/ppc64/util-linux-32.xml
BOOK/bootscripts/common/bootscripts.xml
BOOK/final-system/alpha-chapter.xml
BOOK/final-system/common/coreutils.xml
BOOK/final-system/common/eudev.xml
BOOK/final-system/common/kbd.xml
BOOK/final-system/mips-chapter.xml
BOOK/final-system/mips64-64-chapter.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/udev-64bit.xml
BOOK/final-system/multilib/util-linux.xml
BOOK/final-system/ppc-chapter.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc-chapter.xml
BOOK/final-system/sparc64-64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86-chapter.xml
BOOK/final-system/x86_64-64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/introduction/common/changelog.xml
BOOK/materials/common/packages.xml
BOOK/packages.ent

File:
1 edited

Legend:

Unmodified
Added
Removed

  • BOOK/general.ent

    rec008670 r229ed25  
    11<?xml version="1.0" encoding="ISO-8859-1"?>
    22
    3 <!ENTITY month "06"> <!-- Use two digits -->
    4 <!ENTITY month_name "June">
    5 <!ENTITY day "04"> <!-- Use two digits -->
    6 <!ENTITY year "2011"> <!-- Use four digits -->
     3<!ENTITY month "01"> <!-- Use two digits -->
     4<!ENTITY month_name "December">
     5<!ENTITY day "01"> <!-- Use two digits -->
     6<!ENTITY year "2014"> <!-- Use four digits -->
    77
    88<!ENTITY releasedate "&month_name; &day;, &year;">
    99
    10 <!ENTITY major-version "1">
     10<!ENTITY major-version "2">
    1111<!ENTITY minor-version "2">
    1212<!ENTITY extra-version "0">
    … …  
    2121<!ENTITY version-ppc "&version;-PowerPC">
    2222<!ENTITY version-ppc64 "&version;-PowerPC64-Multilib">
     23<!ENTITY version-ppc64-64 "&version;-PowerPC64-Pure64">
    2324<!ENTITY version-sparc "&version;-Sparc">
    2425<!ENTITY version-sparcv8 "&version;-Sparc_v8">
    … …  
    4041<!ENTITY livecd-root "&lfs-root;livecd/">
    4142<!ENTITY test-results "&clfs-root;testsuite-logs/&generic-version;/">
    42 <!ENTITY errata "&clfs-wiki;clfs/errata/&generic-version;/">
     43<!ENTITY errata "&clfs-wiki;wiki/errata">
    4344
    4445<!ENTITY gnu "http://ftp.gnu.org/gnu/">
Note: See TracChangeset for help on using the changeset viewer.