Changeset 6cefbfb for BOOK/general.ent


Ignore:
Timestamp:
Apr 16, 2011, 2:36:23 PM (14 years ago)
Author:
Joe Ciccone <jciccone@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
21e442f
Parents:
8c3f58f (diff), af891d2 (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/introduction/common/changelog.xml
BOOK/packages.ent

File:
1 edited

Legend:

Unmodified
Added
Removed

  • BOOK/general.ent

    r8c3f58f r6cefbfb  
    11<?xml version="1.0" encoding="ISO-8859-1"?>
    22
    3 <!ENTITY month "02"> <!-- Use two digits -->
    4 <!ENTITY month_name "Feburary">
    5 <!ENTITY day "13"> <!-- Use two digits -->
     3<!ENTITY month "04"> <!-- Use two digits -->
     4<!ENTITY month_name "April">
     5<!ENTITY day "16"> <!-- Use two digits -->
    66<!ENTITY year "2011"> <!-- Use four digits -->
    77
Note: See TracChangeset for help on using the changeset viewer.