Ignore:
Timestamp:
02/11/11 01:04:43 (2 years ago)
Author:
Joe Ciccone <jciccone@…>
Branches:
('systemd', 'ec008670fee2dc8086a6ce805d4831378d59895d')
Children:
8050e8be56109f00f0c575afd0ba43a6d2ef027c
Parents:
e59e93488143a92370af0304b76c3b67fc92f6646d1db7d24d91f671c539e905cbe95b395561913a
git-author:
Joe Ciccone <jciccone@gmail.com>2011-02-10 19:52:13-05:00
git-committer:
Joe Ciccone <jciccone@gmail.com>2011-02-10 20:04:43-05:00
Message:

Merge branch 'master' into systemd

Conflicts:

BOOK/general.ent
BOOK/introduction/common/changelog.xml

File:
1 edited

Legend:

Unmodified
Added
Removed

  • BOOK/users_groups.ent

    r27f57ec r2b687ad  
    11<?xml version="1.0" encoding="ISO-8859-1"?> 
    22 
    3 <!-- User IDs for use throught the book --> 
     3<!-- User IDs for use throughout the book --> 
    44 
    55<!ENTITY uid-root "0"> 
    … …  
    1515<!ENTITY uid-nobody "65534"> 
    1616 
    17 <!-- Group IDs for use throught the book --> 
     17<!-- Group IDs for use throughout the book --> 
    1818 
    1919<!ENTITY gid-root "0"> 
Note: See TracChangeset for help on using the changeset viewer.