From: | Brian Dolbec <brian.dolbec@×××××.com> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] proj/layman:overlord_merge commit in: doc/ |
Date: | Mon, 14 Feb 2011 04:39:34 |
Message-Id: | 3b67511e45d73ab67715d44bb552de03c73881c3.dol-sen@gentoo |
1 | commit: 3b67511e45d73ab67715d44bb552de03c73881c3 |
2 | Author: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com> |
3 | AuthorDate: Mon Feb 14 04:38:11 2011 +0000 |
4 | Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com> |
5 | CommitDate: Mon Feb 14 04:38:11 2011 +0000 |
6 | URL: http://git.overlays.gentoo.org/gitweb/?p=proj/layman.git;a=commit;h=3b67511e |
7 | |
8 | Revert "try commenting the example xml code in an attempt to solve the xmllint error generating the html page" |
9 | |
10 | This reverts commit f87c3df8527653549f59e175ba91a2fef635433f. |
11 | Problem was MAKEOPTS causing the random failure. |
12 | |
13 | --- |
14 | doc/layman.8.txt | 37 ++++++++++++++++++------------------- |
15 | 1 files changed, 18 insertions(+), 19 deletions(-) |
16 | |
17 | diff --git a/doc/layman.8.txt b/doc/layman.8.txt |
18 | index 91a6faf..94fa650 100644 |
19 | --- a/doc/layman.8.txt |
20 | +++ b/doc/layman.8.txt |
21 | @@ -342,26 +342,25 @@ like this: |
22 | |
23 | Example 1. An example overlays.xml file |
24 | |
25 | - |
26 | ------------------------------------------- |
27 | -# <?xml version="1.0" encoding="UTF-8"?> |
28 | -# <!DOCTYPE repositories SYSTEM "/dtd/repositories.dtd"> |
29 | -# <repositories xmlns="" version="1.0"> |
30 | -# <repo quality="experimental" status="official"> |
31 | -# <name>gnome</name> |
32 | -# <description>experimental gnome ebuilds</description> |
33 | -# <homepage>http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=summary</homepage> |
34 | -# <owner type="project"> |
35 | -# <email>gnome@g.o</email> |
36 | -# <name>GNOME herd</name> |
37 | -# </owner> |
38 | -# <source type="git">git://git.overlays.gentoo.org/proj/gnome.git</source> |
39 | -# <source type="git">http://git.overlays.gentoo.org/gitroot/proj/gnome.git</source> |
40 | -# <source type="git">git+ssh://git@×××××××××××××××××××.org/proj/gnome.git</source> |
41 | -# <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=atom</feed> |
42 | -# <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=rss</feed> |
43 | -# </repo> |
44 | -# </repositories> |
45 | +<?xml version="1.0" encoding="UTF-8"?> |
46 | +<!DOCTYPE repositories SYSTEM "/dtd/repositories.dtd"> |
47 | +<repositories xmlns="" version="1.0"> |
48 | +<repo quality="experimental" status="official"> |
49 | + <name>gnome</name> |
50 | + <description>experimental gnome ebuilds</description> |
51 | + <homepage>http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=summary</homepage> |
52 | + <owner type="project"> |
53 | + <email>gnome@g.o</email> |
54 | + <name>GNOME herd</name> |
55 | + </owner> |
56 | + <source type="git">git://git.overlays.gentoo.org/proj/gnome.git</source> |
57 | + <source type="git">http://git.overlays.gentoo.org/gitroot/proj/gnome.git</source> |
58 | + <source type="git">git+ssh://git@×××××××××××××××××××.org/proj/gnome.git</source> |
59 | + <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=atom</feed> |
60 | + <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=rss</feed> |
61 | +</repo> |
62 | +</repositories> |
63 | ------------------------------------------- |