commit b50803fb94bd94b39120986af4a6980b182150e9
Merge: e810143 c5a4b90
Author: Eric Christensen <eric.christensen(a)citrix.com>
Date: Tue Jun 26 11:13:58 2012 -0400
Merge branch 'master' of
ssh+git://fedorahosted.org/git/docs/web
Conflicts:
public_html/as-IN/opds-Community_Services_Infrastructure.xml
public_html/as-IN/opds-Fedora.xml
public_html/as-IN/opds-Fedora_Contributor_Documentation.xml
public_html/as-IN/opds-Fedora_Core.xml
public_html/as-IN/opds-Fedora_Draft_Documentation.xml
public_html/as-IN/opds.xml
public_html/bg-BG/opds-Community_Services_Infrastructure.xml
public_html/bg-BG/opds-Fedora.xml
public_html/bg-BG/opds-Fedora_Contributor_Documentation.xml
public_html/bg-BG/opds-Fedora_Core.xml
public_html/bg-BG/opds-Fedora_Draft_Documentation.xml
public_html/bg-BG/opds.xml
public_html/bn-IN/opds-Community_Services_Infrastructure.xml
public_html/bn-IN/opds-Fedora.xml
public_html/bn-IN/opds-Fedora_Contributor_Documentation.xml
public_html/bn-IN/opds-Fedora_Core.xml
public_html/bn-IN/opds-Fedora_Draft_Documentation.xml
public_html/bn-IN/opds.xml
public_html/bs-BA/opds-Community_Services_Infrastructure.xml
public_html/bs-BA/opds-Fedora.xml
public_html/bs-BA/opds-Fedora_Contributor_Documentation.xml
public_html/bs-BA/opds-Fedora_Core.xml
public_html/bs-BA/opds-Fedora_Draft_Documentation.xml
public_html/bs-BA/opds.xml
public_html/ca-ES/opds-Community_Services_Infrastructure.xml
public_html/ca-ES/opds-Fedora.xml
public_html/ca-ES/opds-Fedora_Contributor_Documentation.xml
public_html/ca-ES/opds-Fedora_Core.xml
public_html/ca-ES/opds-Fedora_Draft_Documentation.xml
public_html/ca-ES/opds.xml
public_html/cs-CZ/opds-Community_Services_Infrastructure.xml
public_html/cs-CZ/opds-Fedora.xml
public_html/cs-CZ/opds-Fedora_Contributor_Documentation.xml
public_html/cs-CZ/opds-Fedora_Core.xml
public_html/cs-CZ/opds-Fedora_Draft_Documentation.xml
public_html/cs-CZ/opds.xml
public_html/da-DK/opds-Community_Services_Infrastructure.xml
public_html/da-DK/opds-Fedora.xml
public_html/da-DK/opds-Fedora_Contributor_Documentation.xml
public_html/da-DK/opds-Fedora_Core.xml
public_html/da-DK/opds-Fedora_Draft_Documentation.xml
public_html/da-DK/opds.xml
public_html/de-DE/opds-Community_Services_Infrastructure.xml
public_html/de-DE/opds-Fedora.xml
public_html/de-DE/opds-Fedora_Contributor_Documentation.xml
public_html/de-DE/opds-Fedora_Core.xml
public_html/de-DE/opds-Fedora_Draft_Documentation.xml
public_html/de-DE/opds.xml
public_html/el-GR/opds-Community_Services_Infrastructure.xml
public_html/el-GR/opds-Fedora.xml
public_html/el-GR/opds-Fedora_Contributor_Documentation.xml
public_html/el-GR/opds-Fedora_Core.xml
public_html/el-GR/opds-Fedora_Draft_Documentation.xml
public_html/el-GR/opds.xml
public_html/en-US/opds-Community_Services_Infrastructure.xml
public_html/en-US/opds-Fedora.xml
public_html/en-US/opds-Fedora_Contributor_Documentation.xml
public_html/en-US/opds-Fedora_Core.xml
public_html/en-US/opds-Fedora_Draft_Documentation.xml
public_html/en-US/opds.xml
public_html/es-ES/opds-Community_Services_Infrastructure.xml
public_html/es-ES/opds-Fedora.xml
public_html/es-ES/opds-Fedora_15.xml
public_html/es-ES/opds-Fedora_Contributor_Documentation.xml
public_html/es-ES/opds-Fedora_Core.xml
public_html/es-ES/opds-Fedora_Draft_Documentation.xml
public_html/es-ES/opds.xml
public_html/fa-IR/opds-Community_Services_Infrastructure.xml
public_html/fa-IR/opds-Fedora.xml
public_html/fa-IR/opds-Fedora_Contributor_Documentation.xml
public_html/fa-IR/opds-Fedora_Core.xml
public_html/fa-IR/opds-Fedora_Draft_Documentation.xml
public_html/fa-IR/opds.xml
public_html/fi-FI/opds-Community_Services_Infrastructure.xml
public_html/fi-FI/opds-Fedora.xml
public_html/fi-FI/opds-Fedora_Contributor_Documentation.xml
public_html/fi-FI/opds-Fedora_Core.xml
public_html/fi-FI/opds-Fedora_Draft_Documentation.xml
public_html/fi-FI/opds.xml
public_html/fr-FR/opds-Community_Services_Infrastructure.xml
public_html/fr-FR/opds-Fedora.xml
public_html/fr-FR/opds-Fedora_Contributor_Documentation.xml
public_html/fr-FR/opds-Fedora_Core.xml
public_html/fr-FR/opds-Fedora_Draft_Documentation.xml
public_html/fr-FR/opds.xml
public_html/gu-IN/opds-Community_Services_Infrastructure.xml
public_html/gu-IN/opds-Fedora.xml
public_html/gu-IN/opds-Fedora_Contributor_Documentation.xml
public_html/gu-IN/opds-Fedora_Core.xml
public_html/gu-IN/opds-Fedora_Draft_Documentation.xml
public_html/gu-IN/opds.xml
public_html/he-IL/opds-Community_Services_Infrastructure.xml
public_html/he-IL/opds-Fedora.xml
public_html/he-IL/opds-Fedora_Contributor_Documentation.xml
public_html/he-IL/opds-Fedora_Core.xml
public_html/he-IL/opds-Fedora_Draft_Documentation.xml
public_html/he-IL/opds.xml
public_html/hi-IN/opds-Community_Services_Infrastructure.xml
public_html/hi-IN/opds-Fedora.xml
public_html/hi-IN/opds-Fedora_Contributor_Documentation.xml
public_html/hi-IN/opds-Fedora_Core.xml
public_html/hi-IN/opds-Fedora_Draft_Documentation.xml
public_html/hi-IN/opds.xml
public_html/hu-HU/opds-Community_Services_Infrastructure.xml
public_html/hu-HU/opds-Fedora.xml
public_html/hu-HU/opds-Fedora_Contributor_Documentation.xml
public_html/hu-HU/opds-Fedora_Core.xml
public_html/hu-HU/opds-Fedora_Draft_Documentation.xml
public_html/hu-HU/opds.xml
public_html/id-ID/opds-Community_Services_Infrastructure.xml
public_html/id-ID/opds-Fedora.xml
public_html/id-ID/opds-Fedora_Contributor_Documentation.xml
public_html/id-ID/opds-Fedora_Core.xml
public_html/id-ID/opds-Fedora_Draft_Documentation.xml
public_html/id-ID/opds.xml
public_html/it-IT/opds-Community_Services_Infrastructure.xml
public_html/it-IT/opds-Fedora.xml
public_html/it-IT/opds-Fedora_Contributor_Documentation.xml
public_html/it-IT/opds-Fedora_Core.xml
public_html/it-IT/opds-Fedora_Draft_Documentation.xml
public_html/it-IT/opds.xml
public_html/ja-JP/opds-Community_Services_Infrastructure.xml
public_html/ja-JP/opds-Fedora.xml
public_html/ja-JP/opds-Fedora_Contributor_Documentation.xml
public_html/ja-JP/opds-Fedora_Core.xml
public_html/ja-JP/opds-Fedora_Draft_Documentation.xml
public_html/ja-JP/opds.xml
public_html/kn-IN/opds-Community_Services_Infrastructure.xml
public_html/kn-IN/opds-Fedora.xml
public_html/kn-IN/opds-Fedora_Contributor_Documentation.xml
public_html/kn-IN/opds-Fedora_Core.xml
public_html/kn-IN/opds-Fedora_Draft_Documentation.xml
public_html/kn-IN/opds.xml
public_html/ko-KR/opds-Community_Services_Infrastructure.xml
public_html/ko-KR/opds-Fedora.xml
public_html/ko-KR/opds-Fedora_Contributor_Documentation.xml
public_html/ko-KR/opds-Fedora_Core.xml
public_html/ko-KR/opds-Fedora_Draft_Documentation.xml
public_html/ko-KR/opds.xml
public_html/ml-IN/opds-Community_Services_Infrastructure.xml
public_html/ml-IN/opds-Fedora.xml
public_html/ml-IN/opds-Fedora_Contributor_Documentation.xml
public_html/ml-IN/opds-Fedora_Core.xml
public_html/ml-IN/opds-Fedora_Draft_Documentation.xml
public_html/ml-IN/opds.xml
public_html/mr-IN/opds-Community_Services_Infrastructure.xml
public_html/mr-IN/opds-Fedora.xml
public_html/mr-IN/opds-Fedora_Contributor_Documentation.xml
public_html/mr-IN/opds-Fedora_Core.xml
public_html/mr-IN/opds-Fedora_Draft_Documentation.xml
public_html/mr-IN/opds.xml
public_html/nb-NO/opds-Community_Services_Infrastructure.xml
public_html/nb-NO/opds-Fedora.xml
public_html/nb-NO/opds-Fedora_Contributor_Documentation.xml
public_html/nb-NO/opds-Fedora_Core.xml
public_html/nb-NO/opds-Fedora_Draft_Documentation.xml
public_html/nb-NO/opds.xml
public_html/nl-NL/opds-Community_Services_Infrastructure.xml
public_html/nl-NL/opds-Fedora.xml
public_html/nl-NL/opds-Fedora_Contributor_Documentation.xml
public_html/nl-NL/opds-Fedora_Core.xml
public_html/nl-NL/opds-Fedora_Draft_Documentation.xml
public_html/nl-NL/opds.xml
public_html/opds.xml
public_html/or-IN/opds-Community_Services_Infrastructure.xml
public_html/or-IN/opds-Fedora.xml
public_html/or-IN/opds-Fedora_Contributor_Documentation.xml
public_html/or-IN/opds-Fedora_Core.xml
public_html/or-IN/opds-Fedora_Draft_Documentation.xml
public_html/or-IN/opds.xml
public_html/pa-IN/opds-Community_Services_Infrastructure.xml
public_html/pa-IN/opds-Fedora.xml
public_html/pa-IN/opds-Fedora_Contributor_Documentation.xml
public_html/pa-IN/opds-Fedora_Core.xml
public_html/pa-IN/opds-Fedora_Draft_Documentation.xml
public_html/pa-IN/opds.xml
public_html/pl-PL/opds-Community_Services_Infrastructure.xml
public_html/pl-PL/opds-Fedora.xml
public_html/pl-PL/opds-Fedora_Contributor_Documentation.xml
public_html/pl-PL/opds-Fedora_Core.xml
public_html/pl-PL/opds-Fedora_Draft_Documentation.xml
public_html/pl-PL/opds.xml
public_html/pt-BR/opds-Community_Services_Infrastructure.xml
public_html/pt-BR/opds-Fedora.xml
public_html/pt-BR/opds-Fedora_Contributor_Documentation.xml
public_html/pt-BR/opds-Fedora_Core.xml
public_html/pt-BR/opds-Fedora_Draft_Documentation.xml
public_html/pt-BR/opds.xml
public_html/pt-PT/opds-Community_Services_Infrastructure.xml
public_html/pt-PT/opds-Fedora.xml
public_html/pt-PT/opds-Fedora_Contributor_Documentation.xml
public_html/pt-PT/opds-Fedora_Core.xml
public_html/pt-PT/opds-Fedora_Draft_Documentation.xml
public_html/pt-PT/opds.xml
public_html/ro/opds-Community_Services_Infrastructure.xml
public_html/ro/opds-Fedora.xml
public_html/ro/opds-Fedora_Contributor_Documentation.xml
public_html/ro/opds-Fedora_Core.xml
public_html/ro/opds-Fedora_Draft_Documentation.xml
public_html/ro/opds.xml
public_html/ru-RU/opds-Community_Services_Infrastructure.xml
public_html/ru-RU/opds-Fedora.xml
public_html/ru-RU/opds-Fedora_Contributor_Documentation.xml
public_html/ru-RU/opds-Fedora_Core.xml
public_html/ru-RU/opds-Fedora_Draft_Documentation.xml
public_html/ru-RU/opds.xml
public_html/sk-SK/opds-Community_Services_Infrastructure.xml
public_html/sk-SK/opds-Fedora.xml
public_html/sk-SK/opds-Fedora_Contributor_Documentation.xml
public_html/sk-SK/opds-Fedora_Core.xml
public_html/sk-SK/opds-Fedora_Draft_Documentation.xml
public_html/sk-SK/opds.xml
public_html/sr-Latn-RS/opds-Community_Services_Infrastructure.xml
public_html/sr-Latn-RS/opds-Fedora.xml
public_html/sr-Latn-RS/opds-Fedora_Contributor_Documentation.xml
public_html/sr-Latn-RS/opds-Fedora_Core.xml
public_html/sr-Latn-RS/opds-Fedora_Draft_Documentation.xml
public_html/sr-Latn-RS/opds.xml
public_html/sr-RS/opds-Community_Services_Infrastructure.xml
public_html/sr-RS/opds-Fedora.xml
public_html/sr-RS/opds-Fedora_Contributor_Documentation.xml
public_html/sr-RS/opds-Fedora_Core.xml
public_html/sr-RS/opds-Fedora_Draft_Documentation.xml
public_html/sr-RS/opds.xml
public_html/sv-SE/opds-Community_Services_Infrastructure.xml
public_html/sv-SE/opds-Fedora.xml
public_html/sv-SE/opds-Fedora_Contributor_Documentation.xml
public_html/sv-SE/opds-Fedora_Core.xml
public_html/sv-SE/opds-Fedora_Draft_Documentation.xml
public_html/sv-SE/opds.xml
public_html/ta-IN/opds-Community_Services_Infrastructure.xml
public_html/ta-IN/opds-Fedora.xml
public_html/ta-IN/opds-Fedora_Contributor_Documentation.xml
public_html/ta-IN/opds-Fedora_Core.xml
public_html/ta-IN/opds-Fedora_Draft_Documentation.xml
public_html/ta-IN/opds.xml
public_html/te-IN/opds-Community_Services_Infrastructure.xml
public_html/te-IN/opds-Fedora.xml
public_html/te-IN/opds-Fedora_Contributor_Documentation.xml
public_html/te-IN/opds-Fedora_Core.xml
public_html/te-IN/opds-Fedora_Draft_Documentation.xml
public_html/te-IN/opds.xml
public_html/uk-UA/opds-Community_Services_Infrastructure.xml
public_html/uk-UA/opds-Fedora.xml
public_html/uk-UA/opds-Fedora_Contributor_Documentation.xml
public_html/uk-UA/opds-Fedora_Core.xml
public_html/uk-UA/opds-Fedora_Draft_Documentation.xml
public_html/uk-UA/opds.xml
public_html/zh-CN/opds-Community_Services_Infrastructure.xml
public_html/zh-CN/opds-Fedora.xml
public_html/zh-CN/opds-Fedora_Contributor_Documentation.xml
public_html/zh-CN/opds-Fedora_Core.xml
public_html/zh-CN/opds-Fedora_Draft_Documentation.xml
public_html/zh-CN/opds.xml
public_html/zh-TW/opds-Community_Services_Infrastructure.xml
public_html/zh-TW/opds-Fedora.xml
public_html/zh-TW/opds-Fedora_Contributor_Documentation.xml
public_html/zh-TW/opds-Fedora_Core.xml
public_html/zh-TW/opds-Fedora_Draft_Documentation.xml
public_html/zh-TW/opds.xml
homepage.cfg~ | 10 -
homepage.tmp~ | 22 -
public_html/.index.html~ | 60 -
public_html/Sitemap | 48 +-
.../opds-Community_Services_Infrastructure.xml | 4 +
public_html/as-IN/opds-Fedora.xml | 8 +-
.../opds-Fedora_Contributor_Documentation.xml | 4 +
public_html/as-IN/opds-Fedora_Core.xml | 4 +
.../as-IN/opds-Fedora_Draft_Documentation.xml | 4 +
public_html/as-IN/opds.xml | 24 +
public_html/as-IN/toc.html | 16 +-
.../opds-Community_Services_Infrastructure.xml | 4 +
public_html/bg-BG/opds-Fedora.xml | 8 +-
.../opds-Fedora_Contributor_Documentation.xml | 4 +
public_html/bg-BG/opds-Fedora_Core.xml | 4 +
.../bg-BG/opds-Fedora_Draft_Documentation.xml | 4 +
public_html/bg-BG/opds.xml | 24 +
public_html/bg-BG/toc.html | 16 +-
.../opds-Community_Services_Infrastructure.xml | 4 +
public_html/bn-IN/opds-Fedora.xml | 8 +-
.../opds-Fedora_Contributor_Documentation.xml | 4 +
public_html/bn-IN/opds-Fedora_Core.xml | 4 +
.../bn-IN/opds-Fedora_Draft_Documentation.xml | 4 +
public_html/bn-IN/opds.xml | 24 +
public_html/bn-IN/toc.html | 16 +-
.../opds-Community_Services_Infrastructure.xml | 4 +
public_html/bs-BA/opds-Fedora.xml | 8 +-
.../opds-Fedora_Contributor_Documentation.xml | 4 +
public_html/bs-BA/opds-Fedora_Core.xml | 4 +
.../bs-BA/opds-Fedora_Draft_Documentation.xml | 4 +
public_html/bs-BA/opds.xml | 24 +
public_html/bs-BA/toc.html | 16 +-
.../opds-Community_Services_Infrastructure.xml | 4 +
public_html/ca-ES/opds-Fedora.xml | 8 +-
.../opds-Fedora_Contributor_Documentation.xml | 4 +
public_html/ca-ES/opds-Fedora_Core.xml | 4 +
.../ca-ES/opds-Fedora_Draft_Documentation.xml | 4 +
public_html/ca-ES/opds.xml | 24 +
public_html/ca-ES/toc.html | 16 +-
.../opds-Community_Services_Infrastructure.xml | 4 +
public_html/cs-CZ/opds-Fedora.xml | 8 +-
.../opds-Fedora_Contributor_Documentation.xml | 4 +
public_html/cs-CZ/opds-Fedora_Core.xml | 4 +
.../cs-CZ/opds-Fedora_Draft_Documentation.xml | 4 +
public_html/cs-CZ/opds.xml | 24 +
public_html/cs-CZ/toc.html | 16 +-
.../opds-Community_Services_Infrastructure.xml | 4 +
public_html/da-DK/opds-Fedora.xml | 8 +-
.../opds-Fedora_Contributor_Documentation.xml | 4 +
public_html/da-DK/opds-Fedora_Core.xml | 4 +
.../da-DK/opds-Fedora_Draft_Documentation.xml | 4 +
public_html/da-DK/opds.xml | 24 +
public_html/da-DK/toc.html | 16 +-
.../opds-Community_Services_Infrastructure.xml | 4 +
public_html/de-DE/opds-Fedora.xml | 8 +-
.../opds-Fedora_Contributor_Documentation.xml | 4 +
public_html/de-DE/opds-Fedora_Core.xml | 4 +
.../de-DE/opds-Fedora_Draft_Documentation.xml | 4 +
public_html/de-DE/opds.xml | 24 +
public_html/de-DE/toc.html | 18 +-
.../opds-Community_Services_Infrastructure.xml | 4 +
public_html/el-GR/opds-Fedora.xml | 8 +-
.../opds-Fedora_Contributor_Documentation.xml | 4 +
public_html/el-GR/opds-Fedora_Core.xml | 4 +
.../el-GR/opds-Fedora_Draft_Documentation.xml | 4 +
public_html/el-GR/opds.xml | 24 +
public_html/el-GR/toc.html | 14 +-
...ation-0.1-Burning_ISO_images_to_disc-en-US.epub | Bin 220740 -> 0 bytes
.../Common_Content/css/common.css | 1528 -------
.../Common_Content/css/default.css | 3 -
.../Common_Content/css/lang.css | 2 -
.../Common_Content/css/overrides.css | 51 -
.../Common_Content/css/print.css | 16 -
.../Common_Content/images/1.png | Bin 710 -> 0 bytes
.../Common_Content/images/1.svg | 27 -
.../Common_Content/images/10.png | Bin 985 -> 0 bytes
.../Common_Content/images/10.svg | 31 -
.../Common_Content/images/11.png | Bin 810 -> 0 bytes
.../Common_Content/images/11.svg | 31 -
.../Common_Content/images/12.png | Bin 1012 -> 0 bytes
.../Common_Content/images/12.svg | 31 -
.../Common_Content/images/13.png | Bin 1048 -> 0 bytes
.../Common_Content/images/13.svg | 31 -
.../Common_Content/images/14.png | Bin 914 -> 0 bytes
.../Common_Content/images/14.svg | 31 -
.../Common_Content/images/15.png | Bin 989 -> 0 bytes
.../Common_Content/images/15.svg | 31 -
.../Common_Content/images/16.png | Bin 1047 -> 0 bytes
.../Common_Content/images/16.svg | 31 -
.../Common_Content/images/17.png | Bin 888 -> 0 bytes
.../Common_Content/images/17.svg | 31 -
.../Common_Content/images/18.png | Bin 1075 -> 0 bytes
.../Common_Content/images/18.svg | 31 -
.../Common_Content/images/19.png | Bin 1049 -> 0 bytes
.../Common_Content/images/19.svg | 31 -
.../Common_Content/images/2.png | Bin 896 -> 0 bytes
.../Common_Content/images/2.svg | 27 -
.../Common_Content/images/20.png | Bin 1151 -> 0 bytes
.../Common_Content/images/20.svg | 31 -
.../Common_Content/images/21.png | Bin 994 -> 0 bytes
.../Common_Content/images/21.svg | 31 -
.../Common_Content/images/22.png | Bin 1162 -> 0 bytes
.../Common_Content/images/22.svg | 31 -
.../Common_Content/images/23.png | Bin 1207 -> 0 bytes
.../Common_Content/images/23.svg | 31 -
.../Common_Content/images/24.png | Bin 1081 -> 0 bytes
.../Common_Content/images/24.svg | 31 -
.../Common_Content/images/25.png | Bin 1173 -> 0 bytes
.../Common_Content/images/25.svg | 31 -
.../Common_Content/images/26.png | Bin 1208 -> 0 bytes
.../Common_Content/images/26.svg | 31 -
.../Common_Content/images/27.png | Bin 1080 -> 0 bytes
.../Common_Content/images/27.svg | 31 -
.../Common_Content/images/28.png | Bin 1225 -> 0 bytes
.../Common_Content/images/28.svg | 31 -
.../Common_Content/images/29.png | Bin 1196 -> 0 bytes
.../Common_Content/images/29.svg | 31 -
.../Common_Content/images/3.png | Bin 958 -> 0 bytes
.../Common_Content/images/3.svg | 27 -
.../Common_Content/images/30.png | Bin 1250 -> 0 bytes
.../Common_Content/images/30.svg | 31 -
.../Common_Content/images/31.png | Bin 1078 -> 0 bytes
.../Common_Content/images/31.svg | 31 -
.../Common_Content/images/32.png | Bin 1241 -> 0 bytes
.../Common_Content/images/32.svg | 31 -
.../Common_Content/images/33.png | Bin 1268 -> 0 bytes
.../Common_Content/images/33.svg | 31 -
.../Common_Content/images/34.png | Bin 1175 -> 0 bytes
.../Common_Content/images/34.svg | 31 -
.../Common_Content/images/35.png | Bin 1224 -> 0 bytes
.../Common_Content/images/35.svg | 31 -
.../Common_Content/images/36.png | Bin 1281 -> 0 bytes
.../Common_Content/images/36.svg | 31 -
.../Common_Content/images/37.png | Bin 1140 -> 0 bytes
.../Common_Content/images/37.svg | 31 -
.../Common_Content/images/38.png | Bin 1300 -> 0 bytes
.../Common_Content/images/38.svg | 31 -
.../Common_Content/images/39.png | Bin 1294 -> 0 bytes
.../Common_Content/images/39.svg | 31 -
.../Common_Content/images/4.png | Bin 849 -> 0 bytes
.../Common_Content/images/4.svg | 27 -
.../Common_Content/images/40.png | Bin 1130 -> 0 bytes
.../Common_Content/images/40.svg | 31 -
.../Common_Content/images/5.png | Bin 900 -> 0 bytes
.../Common_Content/images/5.svg | 27 -
.../Common_Content/images/6.png | Bin 929 -> 0 bytes
.../Common_Content/images/6.svg | 27 -
.../Common_Content/images/7.png | Bin 807 -> 0 bytes
.../Common_Content/images/7.svg | 27 -
.../Common_Content/images/8.png | Bin 962 -> 0 bytes
.../Common_Content/images/8.svg | 27 -
.../Common_Content/images/9.png | Bin 936 -> 0 bytes
.../Common_Content/images/9.svg | 27 -
.../Common_Content/images/bkgrnd_greydots.png | Bin 157 -> 0 bytes
.../Common_Content/images/bullet_arrowblue.png | Bin 177 -> 0 bytes
.../Common_Content/images/documentation.png | Bin 623 -> 0 bytes
.../Common_Content/images/dot.png | Bin 98 -> 0 bytes
.../Common_Content/images/dot2.png | Bin 98 -> 0 bytes
.../Common_Content/images/green.png | Bin 176 -> 0 bytes
.../Common_Content/images/h1-bg.png | Bin 565 -> 0 bytes
.../Common_Content/images/image_left.png | Bin 1114 -> 0 bytes
.../Common_Content/images/image_right.png | Bin 2260 -> 0 bytes
.../Common_Content/images/important.png | Bin 2080 -> 0 bytes
.../Common_Content/images/important.svg | 106 -
.../Common_Content/images/logo.png | Bin 1114 -> 0 bytes
.../Common_Content/images/note.png | Bin 1241 -> 0 bytes
.../Common_Content/images/note.svg | 111 -
.../Common_Content/images/red.png | Bin 163 -> 0 bytes
.../Common_Content/images/shade.png | Bin 101 -> 0 bytes
.../Common_Content/images/shine.png | Bin 146 -> 0 bytes
.../Common_Content/images/stock-go-back.png | Bin 828 -> 0 bytes
.../Common_Content/images/stock-go-forward.png | Bin 828 -> 0 bytes
.../Common_Content/images/stock-go-up.png | Bin 760 -> 0 bytes
.../Common_Content/images/stock-home.png | Bin 808 -> 0 bytes
.../Common_Content/images/title_logo.png | Bin 13399 -> 0 bytes
.../Common_Content/images/title_logo.svg | 61 -
.../Common_Content/images/warning.png | Bin 1340 -> 0 bytes
.../Common_Content/images/warning.svg | 89 -
.../Common_Content/images/watermark-draft.png | Bin 25365 -> 0 bytes
.../Common_Content/images/yellow.png | Bin 175 -> 0 bytes
.../Burning_ISO_images_to_disc/images/icon.svg | 3936 ------------------
.../Burning_ISO_images_to_disc/index.html | 278 --
.../Common_Content/css/common.css | 1528 -------
.../Common_Content/css/default.css | 3 -
.../Common_Content/css/lang.css | 2 -
.../Common_Content/css/overrides.css | 51 -
.../Common_Content/css/print.css | 16 -
.../Common_Content/images/1.png | Bin 710 -> 0 bytes
.../Common_Content/images/1.svg | 27 -
.../Common_Content/images/10.png | Bin 985 -> 0 bytes
.../Common_Content/images/10.svg | 31 -
.../Common_Content/images/11.png | Bin 810 -> 0 bytes
.../Common_Content/images/11.svg | 31 -
.../Common_Content/images/12.png | Bin 1012 -> 0 bytes
.../Common_Content/images/12.svg | 31 -
.../Common_Content/images/13.png | Bin 1048 -> 0 bytes
.../Common_Content/images/13.svg | 31 -
.../Common_Content/images/14.png | Bin 914 -> 0 bytes
.../Common_Content/images/14.svg | 31 -
.../Common_Content/images/15.png | Bin 989 -> 0 bytes
.../Common_Content/images/15.svg | 31 -
.../Common_Content/images/16.png | Bin 1047 -> 0 bytes
.../Common_Content/images/16.svg | 31 -
.../Common_Content/images/17.png | Bin 888 -> 0 bytes
.../Common_Content/images/17.svg | 31 -
.../Common_Content/images/18.png | Bin 1075 -> 0 bytes
.../Common_Content/images/18.svg | 31 -
.../Common_Content/images/19.png | Bin 1049 -> 0 bytes
.../Common_Content/images/19.svg | 31 -
.../Common_Content/images/2.png | Bin 896 -> 0 bytes
.../Common_Content/images/2.svg | 27 -
.../Common_Content/images/20.png | Bin 1151 -> 0 bytes
.../Common_Content/images/20.svg | 31 -
.../Common_Content/images/21.png | Bin 994 -> 0 bytes
.../Common_Content/images/21.svg | 31 -
.../Common_Content/images/22.png | Bin 1162 -> 0 bytes
.../Common_Content/images/22.svg | 31 -
.../Common_Content/images/23.png | Bin 1207 -> 0 bytes
.../Common_Content/images/23.svg | 31 -
.../Common_Content/images/24.png | Bin 1081 -> 0 bytes
.../Common_Content/images/24.svg | 31 -
.../Common_Content/images/25.png | Bin 1173 -> 0 bytes
.../Common_Content/images/25.svg | 31 -
.../Common_Content/images/26.png | Bin 1208 -> 0 bytes
.../Common_Content/images/26.svg | 31 -
.../Common_Content/images/27.png | Bin 1080 -> 0 bytes
.../Common_Content/images/27.svg | 31 -
.../Common_Content/images/28.png | Bin 1225 -> 0 bytes
.../Common_Content/images/28.svg | 31 -
.../Common_Content/images/29.png | Bin 1196 -> 0 bytes
.../Common_Content/images/29.svg | 31 -
.../Common_Content/images/3.png | Bin 958 -> 0 bytes
.../Common_Content/images/3.svg | 27 -
.../Common_Content/images/30.png | Bin 1250 -> 0 bytes
.../Common_Content/images/30.svg | 31 -
.../Common_Content/images/31.png | Bin 1078 -> 0 bytes
.../Common_Content/images/31.svg | 31 -
.../Common_Content/images/32.png | Bin 1241 -> 0 bytes
.../Common_Content/images/32.svg | 31 -
.../Common_Content/images/33.png | Bin 1268 -> 0 bytes
.../Common_Content/images/33.svg | 31 -
.../Common_Content/images/34.png | Bin 1175 -> 0 bytes
.../Common_Content/images/34.svg | 31 -
.../Common_Content/images/35.png | Bin 1224 -> 0 bytes
.../Common_Content/images/35.svg | 31 -
.../Common_Content/images/36.png | Bin 1281 -> 0 bytes
.../Common_Content/images/36.svg | 31 -
.../Common_Content/images/37.png | Bin 1140 -> 0 bytes
.../Common_Content/images/37.svg | 31 -
.../Common_Content/images/38.png | Bin 1300 -> 0 bytes
.../Common_Content/images/38.svg | 31 -
.../Common_Content/images/39.png | Bin 1294 -> 0 bytes
.../Common_Content/images/39.svg | 31 -
.../Common_Content/images/4.png | Bin 849 -> 0 bytes
.../Common_Content/images/4.svg | 27 -
.../Common_Content/images/40.png | Bin 1130 -> 0 bytes
.../Common_Content/images/40.svg | 31 -
.../Common_Content/images/5.png | Bin 900 -> 0 bytes
.../Common_Content/images/5.svg | 27 -
.../Common_Content/images/6.png | Bin 929 -> 0 bytes
.../Common_Content/images/6.svg | 27 -
.../Common_Content/images/7.png | Bin 807 -> 0 bytes
.../Common_Content/images/7.svg | 27 -
.../Common_Content/images/8.png | Bin 962 -> 0 bytes
.../Common_Content/images/8.svg | 27 -
.../Common_Content/images/9.png | Bin 936 -> 0 bytes
.../Common_Content/images/9.svg | 27 -
.../Common_Content/images/bkgrnd_greydots.png | Bin 157 -> 0 bytes
.../Common_Content/images/bullet_arrowblue.png | Bin 177 -> 0 bytes
.../Common_Content/images/documentation.png | Bin 623 -> 0 bytes
.../Common_Content/images/dot.png | Bin 98 -> 0 bytes
.../Common_Content/images/dot2.png | Bin 98 -> 0 bytes
.../Common_Content/images/green.png | Bin 176 -> 0 bytes
.../Common_Content/images/h1-bg.png | Bin 565 -> 0 bytes
.../Common_Content/images/image_left.png | Bin 1114 -> 0 bytes
.../Common_Content/images/image_right.png | Bin 2260 -> 0 bytes
.../Common_Content/images/important.png | Bin 2080 -> 0 bytes
.../Common_Content/images/important.svg | 106 -
.../Common_Content/images/logo.png | Bin 1114 -> 0 bytes
.../Common_Content/images/note.png | Bin 1241 -> 0 bytes
.../Common_Content/images/note.svg | 111 -
.../Common_Content/images/red.png | Bin 163 -> 0 bytes
.../Common_Content/images/shade.png | Bin 101 -> 0 bytes
.../Common_Content/images/shine.png | Bin 146 -> 0 bytes
.../Common_Content/images/stock-go-back.png | Bin 828 -> 0 bytes
.../Common_Content/images/stock-go-forward.png | Bin 828 -> 0 bytes
.../Common_Content/images/stock-go-up.png | Bin 760 -> 0 bytes
.../Common_Content/images/stock-home.png | Bin 808 -> 0 bytes
.../Common_Content/images/title_logo.png | Bin 13399 -> 0 bytes
.../Common_Content/images/title_logo.svg | 61 -
.../Common_Content/images/warning.png | Bin 1340 -> 0 bytes
.../Common_Content/images/warning.svg | 89 -
.../Common_Content/images/watermark-draft.png | Bin 25365 -> 0 bytes
.../Common_Content/images/yellow.png | Bin 175 -> 0 bytes
...urning_ISO_images_to_disc-Revision_History.html | 19 -
.../html/Burning_ISO_images_to_disc/ar01s06.html | 16 -
.../Burning_ISO_images_to_disc/images/icon.svg | 3936 ------------------
.../0.1/html/Burning_ISO_images_to_disc/index.html | 45 -
...urning_ISO_images_to_disc-Burning-cmd-line.html | 30 -
...g_ISO_images_to_disc-Burning-Linux-Brasero.html | 20 -
...rning_ISO_images_to_disc-Burning-Linux-K3b.html | 20 -
...t-Burning_ISO_images_to_disc-Burning-Linux.html | 16 -
...ect-Burning_ISO_images_to_disc-Burning-OSX.html | 20 -
.../sect-Burning_ISO_images_to_disc-Burning.html | 80 -
...to_disc-Downloading-Choosing_the_ISO_Files.html | 18 -
...ect-Burning_ISO_images_to_disc-Downloading.html | 28 -
...sect-Burning_ISO_images_to_disc-Next_steps.html | 20 -
...s-Validating_at_the_Windows_Command_Prompt.html | 22 -
...c-Validating_the_Files-Validating_in_Linux.html | 26 -
...alidating_the_Files-Validating_in_Mac_OS_X.html | 18 -
...ng_ISO_images_to_disc-Validating_the_Files.html | 30 -
.../Fedora-14-Burning_ISO_images_to_disc-en-US.pdf | Bin 156191 -> 0 bytes
...tation-0.1-Burning_ISO_images_to_disc-en-US.pdf | Bin 191031 -> 0 bytes
.../fedora-0.1-Security_Guide-en-US.epub | Bin 853788 -> 0 bytes
.../Security_Guide/Common_Content/css/common.css | 1528 -------
.../Security_Guide/Common_Content/css/default.css | 3 -
.../Security_Guide/Common_Content/css/lang.css | 2 -
.../Common_Content/css/overrides.css | 51 -
.../Security_Guide/Common_Content/css/print.css | 16 -
.../Security_Guide/Common_Content/images/1.png | Bin 710 -> 0 bytes
.../Security_Guide/Common_Content/images/1.svg | 27 -
.../Security_Guide/Common_Content/images/10.png | Bin 985 -> 0 bytes
.../Security_Guide/Common_Content/images/10.svg | 31 -
.../Security_Guide/Common_Content/images/11.png | Bin 810 -> 0 bytes
.../Security_Guide/Common_Content/images/11.svg | 31 -
.../Security_Guide/Common_Content/images/12.png | Bin 1012 -> 0 bytes
.../Security_Guide/Common_Content/images/12.svg | 31 -
.../Security_Guide/Common_Content/images/13.png | Bin 1048 -> 0 bytes
.../Security_Guide/Common_Content/images/13.svg | 31 -
.../Security_Guide/Common_Content/images/14.png | Bin 914 -> 0 bytes
.../Security_Guide/Common_Content/images/14.svg | 31 -
.../Security_Guide/Common_Content/images/15.png | Bin 989 -> 0 bytes
.../Security_Guide/Common_Content/images/15.svg | 31 -
.../Security_Guide/Common_Content/images/16.png | Bin 1047 -> 0 bytes
.../Security_Guide/Common_Content/images/16.svg | 31 -
.../Security_Guide/Common_Content/images/17.png | Bin 888 -> 0 bytes
.../Security_Guide/Common_Content/images/17.svg | 31 -
.../Security_Guide/Common_Content/images/18.png | Bin 1075 -> 0 bytes
.../Security_Guide/Common_Content/images/18.svg | 31 -
.../Security_Guide/Common_Content/images/19.png | Bin 1049 -> 0 bytes
.../Security_Guide/Common_Content/images/19.svg | 31 -
.../Security_Guide/Common_Content/images/2.png | Bin 896 -> 0 bytes
.../Security_Guide/Common_Content/images/2.svg | 27 -
.../Security_Guide/Common_Content/images/20.png | Bin 1151 -> 0 bytes
.../Security_Guide/Common_Content/images/20.svg | 31 -
.../Security_Guide/Common_Content/images/21.png | Bin 994 -> 0 bytes
.../Security_Guide/Common_Content/images/21.svg | 31 -
.../Security_Guide/Common_Content/images/22.png | Bin 1162 -> 0 bytes
.../Security_Guide/Common_Content/images/22.svg | 31 -
.../Security_Guide/Common_Content/images/23.png | Bin 1207 -> 0 bytes
.../Security_Guide/Common_Content/images/23.svg | 31 -
.../Security_Guide/Common_Content/images/24.png | Bin 1081 -> 0 bytes
.../Security_Guide/Common_Content/images/24.svg | 31 -
.../Security_Guide/Common_Content/images/25.png | Bin 1173 -> 0 bytes
.../Security_Guide/Common_Content/images/25.svg | 31 -
.../Security_Guide/Common_Content/images/26.png | Bin 1208 -> 0 bytes
.../Security_Guide/Common_Content/images/26.svg | 31 -
.../Security_Guide/Common_Content/images/27.png | Bin 1080 -> 0 bytes
.../Security_Guide/Common_Content/images/27.svg | 31 -
.../Security_Guide/Common_Content/images/28.png | Bin 1225 -> 0 bytes
.../Security_Guide/Common_Content/images/28.svg | 31 -
.../Security_Guide/Common_Content/images/29.png | Bin 1196 -> 0 bytes
.../Security_Guide/Common_Content/images/29.svg | 31 -
.../Security_Guide/Common_Content/images/3.png | Bin 958 -> 0 bytes
.../Security_Guide/Common_Content/images/3.svg | 27 -
.../Security_Guide/Common_Content/images/30.png | Bin 1250 -> 0 bytes
.../Security_Guide/Common_Content/images/30.svg | 31 -
.../Security_Guide/Common_Content/images/31.png | Bin 1078 -> 0 bytes
.../Security_Guide/Common_Content/images/31.svg | 31 -
.../Security_Guide/Common_Content/images/32.png | Bin 1241 -> 0 bytes
.../Security_Guide/Common_Content/images/32.svg | 31 -
.../Security_Guide/Common_Content/images/33.png | Bin 1268 -> 0 bytes
.../Security_Guide/Common_Content/images/33.svg | 31 -
.../Security_Guide/Common_Content/images/34.png | Bin 1175 -> 0 bytes
.../Security_Guide/Common_Content/images/34.svg | 31 -
.../Security_Guide/Common_Content/images/35.png | Bin 1224 -> 0 bytes
.../Security_Guide/Common_Content/images/35.svg | 31 -
.../Security_Guide/Common_Content/images/36.png | Bin 1281 -> 0 bytes
.../Security_Guide/Common_Content/images/36.svg | 31 -
.../Security_Guide/Common_Content/images/37.png | Bin 1140 -> 0 bytes
.../Security_Guide/Common_Content/images/37.svg | 31 -
.../Security_Guide/Common_Content/images/38.png | Bin 1300 -> 0 bytes
.../Security_Guide/Common_Content/images/38.svg | 31 -
.../Security_Guide/Common_Content/images/39.png | Bin 1294 -> 0 bytes
.../Security_Guide/Common_Content/images/39.svg | 31 -
.../Security_Guide/Common_Content/images/4.png | Bin 849 -> 0 bytes
.../Security_Guide/Common_Content/images/4.svg | 27 -
.../Security_Guide/Common_Content/images/40.png | Bin 1130 -> 0 bytes
.../Security_Guide/Common_Content/images/40.svg | 31 -
.../Security_Guide/Common_Content/images/5.png | Bin 900 -> 0 bytes
.../Security_Guide/Common_Content/images/5.svg | 27 -
.../Security_Guide/Common_Content/images/6.png | Bin 929 -> 0 bytes
.../Security_Guide/Common_Content/images/6.svg | 27 -
.../Security_Guide/Common_Content/images/7.png | Bin 807 -> 0 bytes
.../Security_Guide/Common_Content/images/7.svg | 27 -
.../Security_Guide/Common_Content/images/8.png | Bin 962 -> 0 bytes
.../Security_Guide/Common_Content/images/8.svg | 27 -
.../Security_Guide/Common_Content/images/9.png | Bin 936 -> 0 bytes
.../Security_Guide/Common_Content/images/9.svg | 27 -
.../Common_Content/images/bkgrnd_greydots.png | Bin 157 -> 0 bytes
.../Common_Content/images/bullet_arrowblue.png | Bin 177 -> 0 bytes
.../Common_Content/images/documentation.png | Bin 623 -> 0 bytes
.../Security_Guide/Common_Content/images/dot.png | Bin 98 -> 0 bytes
.../Security_Guide/Common_Content/images/dot2.png | Bin 98 -> 0 bytes
.../Security_Guide/Common_Content/images/green.png | Bin 176 -> 0 bytes
.../Security_Guide/Common_Content/images/h1-bg.png | Bin 565 -> 0 bytes
.../Common_Content/images/image_left.png | Bin 1114 -> 0 bytes
.../Common_Content/images/image_right.png | Bin 2260 -> 0 bytes
.../Common_Content/images/important.png | Bin 2080 -> 0 bytes
.../Common_Content/images/important.svg | 106 -
.../Security_Guide/Common_Content/images/logo.png | Bin 1114 -> 0 bytes
.../Security_Guide/Common_Content/images/note.png | Bin 1241 -> 0 bytes
.../Security_Guide/Common_Content/images/note.svg | 111 -
.../Security_Guide/Common_Content/images/red.png | Bin 163 -> 0 bytes
.../Security_Guide/Common_Content/images/shade.png | Bin 101 -> 0 bytes
.../Security_Guide/Common_Content/images/shine.png | Bin 146 -> 0 bytes
.../Common_Content/images/stock-go-back.png | Bin 828 -> 0 bytes
.../Common_Content/images/stock-go-forward.png | Bin 828 -> 0 bytes
.../Common_Content/images/stock-go-up.png | Bin 760 -> 0 bytes
.../Common_Content/images/stock-home.png | Bin 808 -> 0 bytes
.../Common_Content/images/title_logo.png | Bin 13399 -> 0 bytes
.../Common_Content/images/title_logo.svg | 61 -
.../Common_Content/images/warning.png | Bin 1340 -> 0 bytes
.../Common_Content/images/warning.svg | 89 -
.../Common_Content/images/watermark-draft.png | Bin 25365 -> 0 bytes
.../Common_Content/images/yellow.png | Bin 175 -> 0 bytes
.../html-single/Security_Guide/images/SCLogin.png | Bin 8088 -> 0 bytes
.../Security_Guide/images/SCLoginEnrollment.png | Bin 14924 -> 0 bytes
.../Security_Guide/images/auth-panel.png | Bin 9257 -> 0 bytes
.../html-single/Security_Guide/images/authicon.png | Bin 1163 -> 0 bytes
.../images/fed-firefox_kerberos_SSO.png | Bin 47794 -> 0 bytes
.../Security_Guide/images/fed-firewall_config.png | Bin 76857 -> 0 bytes
.../Security_Guide/images/fed-ipsec_host2host.png | Bin 39081 -> 0 bytes
.../images/fed-ipsec_n_to_n_local.png | Bin 30935 -> 0 bytes
.../images/fed-ipsec_n_to_n_remote.png | Bin 34860 -> 0 bytes
.../Security_Guide/images/fed-service_config.png | Bin 76914 -> 0 bytes
.../Security_Guide/images/fed-user_pass_groups.png | Bin 35369 -> 0 bytes
.../Security_Guide/images/fed-user_pass_info.png | Bin 35624 -> 0 bytes
.../0.1/html-single/Security_Guide/images/icon.svg | 3936 ------------------
.../Security_Guide/images/n-t-n-ipsec-diagram.png | Bin 33470 -> 0 bytes
.../Security_Guide/images/tcp_wrap_diagram.png | Bin 25775 -> 0 bytes
.../0.1/html-single/Security_Guide/index.html | 4363 --------------------
.../Security_Guide/Common_Content/css/common.css | 1528 -------
.../Security_Guide/Common_Content/css/default.css | 3 -
.../Security_Guide/Common_Content/css/lang.css | 2 -
.../Common_Content/css/overrides.css | 51 -
.../Security_Guide/Common_Content/css/print.css | 16 -
.../Security_Guide/Common_Content/images/1.png | Bin 710 -> 0 bytes
.../Security_Guide/Common_Content/images/1.svg | 27 -
.../Security_Guide/Common_Content/images/10.png | Bin 985 -> 0 bytes
.../Security_Guide/Common_Content/images/10.svg | 31 -
.../Security_Guide/Common_Content/images/11.png | Bin 810 -> 0 bytes
.../Security_Guide/Common_Content/images/11.svg | 31 -
.../Security_Guide/Common_Content/images/12.png | Bin 1012 -> 0 bytes
.../Security_Guide/Common_Content/images/12.svg | 31 -
.../Security_Guide/Common_Content/images/13.png | Bin 1048 -> 0 bytes
.../Security_Guide/Common_Content/images/13.svg | 31 -
.../Security_Guide/Common_Content/images/14.png | Bin 914 -> 0 bytes
.../Security_Guide/Common_Content/images/14.svg | 31 -
.../Security_Guide/Common_Content/images/15.png | Bin 989 -> 0 bytes
.../Security_Guide/Common_Content/images/15.svg | 31 -
.../Security_Guide/Common_Content/images/16.png | Bin 1047 -> 0 bytes
.../Security_Guide/Common_Content/images/16.svg | 31 -
.../Security_Guide/Common_Content/images/17.png | Bin 888 -> 0 bytes
.../Security_Guide/Common_Content/images/17.svg | 31 -
.../Security_Guide/Common_Content/images/18.png | Bin 1075 -> 0 bytes
.../Security_Guide/Common_Content/images/18.svg | 31 -
.../Security_Guide/Common_Content/images/19.png | Bin 1049 -> 0 bytes
.../Security_Guide/Common_Content/images/19.svg | 31 -
.../Security_Guide/Common_Content/images/2.png | Bin 896 -> 0 bytes
.../Security_Guide/Common_Content/images/2.svg | 27 -
.../Security_Guide/Common_Content/images/20.png | Bin 1151 -> 0 bytes
.../Security_Guide/Common_Content/images/20.svg | 31 -
.../Security_Guide/Common_Content/images/21.png | Bin 994 -> 0 bytes
.../Security_Guide/Common_Content/images/21.svg | 31 -
.../Security_Guide/Common_Content/images/22.png | Bin 1162 -> 0 bytes
.../Security_Guide/Common_Content/images/22.svg | 31 -
.../Security_Guide/Common_Content/images/23.png | Bin 1207 -> 0 bytes
.../Security_Guide/Common_Content/images/23.svg | 31 -
.../Security_Guide/Common_Content/images/24.png | Bin 1081 -> 0 bytes
.../Security_Guide/Common_Content/images/24.svg | 31 -
.../Security_Guide/Common_Content/images/25.png | Bin 1173 -> 0 bytes
.../Security_Guide/Common_Content/images/25.svg | 31 -
.../Security_Guide/Common_Content/images/26.png | Bin 1208 -> 0 bytes
.../Security_Guide/Common_Content/images/26.svg | 31 -
.../Security_Guide/Common_Content/images/27.png | Bin 1080 -> 0 bytes
.../Security_Guide/Common_Content/images/27.svg | 31 -
.../Security_Guide/Common_Content/images/28.png | Bin 1225 -> 0 bytes
.../Security_Guide/Common_Content/images/28.svg | 31 -
.../Security_Guide/Common_Content/images/29.png | Bin 1196 -> 0 bytes
.../Security_Guide/Common_Content/images/29.svg | 31 -
.../Security_Guide/Common_Content/images/3.png | Bin 958 -> 0 bytes
.../Security_Guide/Common_Content/images/3.svg | 27 -
.../Security_Guide/Common_Content/images/30.png | Bin 1250 -> 0 bytes
.../Security_Guide/Common_Content/images/30.svg | 31 -
.../Security_Guide/Common_Content/images/31.png | Bin 1078 -> 0 bytes
.../Security_Guide/Common_Content/images/31.svg | 31 -
.../Security_Guide/Common_Content/images/32.png | Bin 1241 -> 0 bytes
.../Security_Guide/Common_Content/images/32.svg | 31 -
.../Security_Guide/Common_Content/images/33.png | Bin 1268 -> 0 bytes
.../Security_Guide/Common_Content/images/33.svg | 31 -
.../Security_Guide/Common_Content/images/34.png | Bin 1175 -> 0 bytes
.../Security_Guide/Common_Content/images/34.svg | 31 -
.../Security_Guide/Common_Content/images/35.png | Bin 1224 -> 0 bytes
.../Security_Guide/Common_Content/images/35.svg | 31 -
.../Security_Guide/Common_Content/images/36.png | Bin 1281 -> 0 bytes
.../Security_Guide/Common_Content/images/36.svg | 31 -
.../Security_Guide/Common_Content/images/37.png | Bin 1140 -> 0 bytes
.../Security_Guide/Common_Content/images/37.svg | 31 -
.../Security_Guide/Common_Content/images/38.png | Bin 1300 -> 0 bytes
.../Security_Guide/Common_Content/images/38.svg | 31 -
.../Security_Guide/Common_Content/images/39.png | Bin 1294 -> 0 bytes
.../Security_Guide/Common_Content/images/39.svg | 31 -
.../Security_Guide/Common_Content/images/4.png | Bin 849 -> 0 bytes
.../Security_Guide/Common_Content/images/4.svg | 27 -
.../Security_Guide/Common_Content/images/40.png | Bin 1130 -> 0 bytes
.../Security_Guide/Common_Content/images/40.svg | 31 -
.../Security_Guide/Common_Content/images/5.png | Bin 900 -> 0 bytes
.../Security_Guide/Common_Content/images/5.svg | 27 -
.../Security_Guide/Common_Content/images/6.png | Bin 929 -> 0 bytes
.../Security_Guide/Common_Content/images/6.svg | 27 -
.../Security_Guide/Common_Content/images/7.png | Bin 807 -> 0 bytes
.../Security_Guide/Common_Content/images/7.svg | 27 -
.../Security_Guide/Common_Content/images/8.png | Bin 962 -> 0 bytes
.../Security_Guide/Common_Content/images/8.svg | 27 -
.../Security_Guide/Common_Content/images/9.png | Bin 936 -> 0 bytes
.../Security_Guide/Common_Content/images/9.svg | 27 -
.../Common_Content/images/bkgrnd_greydots.png | Bin 157 -> 0 bytes
.../Common_Content/images/bullet_arrowblue.png | Bin 177 -> 0 bytes
.../Common_Content/images/documentation.png | Bin 623 -> 0 bytes
.../Security_Guide/Common_Content/images/dot.png | Bin 98 -> 0 bytes
.../Security_Guide/Common_Content/images/dot2.png | Bin 98 -> 0 bytes
.../Security_Guide/Common_Content/images/green.png | Bin 176 -> 0 bytes
.../Security_Guide/Common_Content/images/h1-bg.png | Bin 565 -> 0 bytes
.../Common_Content/images/image_left.png | Bin 1114 -> 0 bytes
.../Common_Content/images/image_right.png | Bin 2260 -> 0 bytes
.../Common_Content/images/important.png | Bin 2080 -> 0 bytes
.../Common_Content/images/important.svg | 106 -
.../Security_Guide/Common_Content/images/logo.png | Bin 1114 -> 0 bytes
.../Security_Guide/Common_Content/images/note.png | Bin 1241 -> 0 bytes
.../Security_Guide/Common_Content/images/note.svg | 111 -
.../Security_Guide/Common_Content/images/red.png | Bin 163 -> 0 bytes
.../Security_Guide/Common_Content/images/shade.png | Bin 101 -> 0 bytes
.../Security_Guide/Common_Content/images/shine.png | Bin 146 -> 0 bytes
.../Common_Content/images/stock-go-back.png | Bin 828 -> 0 bytes
.../Common_Content/images/stock-go-forward.png | Bin 828 -> 0 bytes
.../Common_Content/images/stock-go-up.png | Bin 760 -> 0 bytes
.../Common_Content/images/stock-home.png | Bin 808 -> 0 bytes
.../Common_Content/images/title_logo.png | Bin 13399 -> 0 bytes
.../Common_Content/images/title_logo.svg | 61 -
.../Common_Content/images/warning.png | Bin 1340 -> 0 bytes
.../Common_Content/images/warning.svg | 89 -
.../Common_Content/images/watermark-draft.png | Bin 25365 -> 0 bytes
.../Common_Content/images/yellow.png | Bin 175 -> 0 bytes
...ide-Encryption-Data_in_Motion-Secure_Shell.html | 31 -
.../Security_Guide-Encryption-Data_in_Motion.html | 403 --
.../0.1/html/Security_Guide/We_Need_Feedback.html | 14 -
.../fedora/0.1/html/Security_Guide/apas02.html | 46 -
.../fedora/0.1/html/Security_Guide/apas02s02.html | 14 -
.../fedora/0.1/html/Security_Guide/apas02s03.html | 14 -
.../fedora/0.1/html/Security_Guide/apas02s04.html | 24 -
.../fedora/0.1/html/Security_Guide/apas02s05.html | 14 -
.../fedora/0.1/html/Security_Guide/apas02s06.html | 14 -
.../appe-Publican-Revision_History.html | 102 -
.../chap-Security_Guide-Basic_Hardening.html | 16 -
.../Security_Guide/chap-Security_Guide-CVE.html | 18 -
.../chap-Security_Guide-Encryption.html | 24 -
.../chap-Security_Guide-Encryption_Standards.html | 38 -
...General_Principles_of_Information_Security.html | 38 -
.../chap-Security_Guide-References.html | 52 -
.../chap-Security_Guide-Secure_Installation.html | 20 -
.../chap-Security_Guide-Securing_Your_Network.html | 528 ---
.../chap-Security_Guide-Security_Overview.html | 128 -
.../chap-Security_Guide-Software_Maintenance.html | 14 -
.../0.1/html/Security_Guide/images/SCLogin.png | Bin 8088 -> 0 bytes
.../Security_Guide/images/SCLoginEnrollment.png | Bin 14924 -> 0 bytes
.../0.1/html/Security_Guide/images/auth-panel.png | Bin 9257 -> 0 bytes
.../0.1/html/Security_Guide/images/authicon.png | Bin 1163 -> 0 bytes
.../images/fed-firefox_kerberos_SSO.png | Bin 47794 -> 0 bytes
.../Security_Guide/images/fed-firewall_config.png | Bin 76857 -> 0 bytes
.../Security_Guide/images/fed-ipsec_host2host.png | Bin 39081 -> 0 bytes
.../images/fed-ipsec_n_to_n_local.png | Bin 30935 -> 0 bytes
.../images/fed-ipsec_n_to_n_remote.png | Bin 34860 -> 0 bytes
.../Security_Guide/images/fed-service_config.png | Bin 76914 -> 0 bytes
.../Security_Guide/images/fed-user_pass_groups.png | Bin 35369 -> 0 bytes
.../Security_Guide/images/fed-user_pass_info.png | Bin 35624 -> 0 bytes
.../fedora/0.1/html/Security_Guide/images/icon.svg | 3936 ------------------
.../Security_Guide/images/n-t-n-ipsec-diagram.png | Bin 33470 -> 0 bytes
.../Security_Guide/images/tcp_wrap_diagram.png | Bin 25775 -> 0 bytes
.../fedora/0.1/html/Security_Guide/index.html | 35 -
.../pref-Security_Guide-Preface.html | 95 -
...y_Guide-Additional_Resources-Related_Books.html | 12 -
...Additional_Resources-Related_Documentation.html | 14 -
...itional_Resources-Useful_Firewall_Websites.html | 16 -
...tional_Resources-Useful_IP_Tables_Websites.html | 14 -
...itional_Resources-Useful_Kerberos_Websites.html | 22 -
...e-Additional_Resources-Useful_PAM_Websites.html | 14 -
...nal_Resources-Useful_TCP_Wrappers_Websites.html | 14 -
...Configuration_Files-Access_Control_Options.html | 60 -
...tion_Files-Binding_and_Redirection_Options.html | 37 -
...guration_Files-Resource_Management_Options.html | 22 -
...ulnerabilities-Threats_to_Network_Security.html | 18 -
...Vulnerabilities-Threats_to_Server_Security.html | 16 -
...hreats_to_Workstation_and_Home_PC_Security.html | 14 -
...curity_Guide-Attackers_and_Vulnerabilities.html | 30 -
...figuration-Activating_the_IPTables_Service.html | 14 -
...ration-Enabling_and_Disabling_the_Firewall.html | 20 -
...e-Basic_Firewall_Configuration-Other_Ports.html | 14 -
...Firewall_Configuration-Saving_the_Settings.html | 16 -
...ic_Firewall_Configuration-Trusted_Services.html | 28 -
...rity_Guide-Basic_Hardening-Disk_Partitions.html | 11 -
...g-General_Principles-Why_is_this_important.html | 12 -
.../sect-Security_Guide-Basic_Hardening-NTP.html | 11 -
..._Guide-Basic_Hardening-Networking-IPTables.html | 11 -
...rity_Guide-Basic_Hardening-Networking-IPv6.html | 11 -
...-Security_Guide-Basic_Hardening-Networking.html | 11 -
...ening-Physical_Security-What_else_can_I_do.html | 12 -
...ng-Physical_Security-Why_is_this_important.html | 12 -
...ty_Guide-Basic_Hardening-Physical_Security.html | 16 -
...ect-Security_Guide-Basic_Hardening-SELinux.html | 11 -
...ct-Security_Guide-Basic_Hardening-Services.html | 11 -
...-Security_Guide-Basic_Hardening-Up_to_date.html | 11 -
...e-CVE-yum_plugin-using_yum_plugin_security.html | 45 -
...mmand_Options_for_IPTables-Command_Options.html | 48 -
...ptions_for_IPTables-IPTables_Match_Options.html | 71 -
...ns_for_IPTables-IPTables_Parameter_Options.html | 56 -
...mmand_Options_for_IPTables-Listing_Options.html | 22 -
...ommand_Options_for_IPTables-Target_Options.html | 50 -
...Security_Guide-Common_Exploits_and_Attacks.html | 67 -
...crypted_Archives-Installation-Instructions.html | 16 -
...on-7_Zip_Encrypted_Archives-Things_of_note.html | 12 -
..._Zip_Encrypted_Archives-Usage_Instructions.html | 34 -
..._Guide-Encryption-7_Zip_Encrypted_Archives.html | 14 -
...tion-Using_GPG-About_Public_Key_Encryption.html | 14 -
...ryption-Using_GPG-Creating_GPG_Keys_in_KDE.html | 48 -
...yption-Using_GPG-Creating_GPG_Keys_in_KDE1.html | 16 -
...Encryption-Using_GPG-Using_GPG_with_Alpine.html | 28 -
..._GPG_with_Evolution-Signing_and_Encrypting.html | 14 -
...ing_GPG-Using_GPG_with_Evolution-Verifying.html | 12 -
...ryption-Using_GPG-Using_GPG_with_Evolution.html | 16 -
...ption-Using_GPG-Using_GPG_with_Thunderbird.html | 24 -
.../sect-Security_Guide-Encryption-Using_GPG.html | 24 -
...g_the_Tools-Anticipating_Your_Future_Needs.html | 12 -
...Security_Guide-Evaluating_the_Tools-Nessus.html | 18 -
...-Security_Guide-Evaluating_the_Tools-Nikto.html | 16 -
...uide-Evaluating_the_Tools-VLAD_the_Scanner.html | 18 -
...de-FORWARD_and_NAT_Rules-DMZs_and_IPTables.html | 18 -
...ity_Guide-FORWARD_and_NAT_Rules-Prerouting.html | 20 -
...urity_Guide-Firewalls-Additional_Resources.html | 16 -
...ide-Firewalls-Basic_Firewall_Configuration.html | 24 -
..._Guide-Firewalls-Common_IPTables_Filtering.html | 39 -
...rity_Guide-Firewalls-FORWARD_and_NAT_Rules.html | 45 -
...Firewalls-IPTables_and_Connection_Tracking.html | 22 -
.../sect-Security_Guide-Firewalls-IPv6.html | 18 -
...alicious_Software_and_Spoofed_IP_Addresses.html | 31 -
...ct-Security_Guide-Firewalls-Using_IPTables.html | 28 -
.../sect-Security_Guide-Firewalls.html | 62 -
...curity_Guide-IPTables-Additional_Resources.html | 16 -
...uide-IPTables-Command_Options_for_IPTables.html | 42 -
...ty_Guide-IPTables-IPTables_Control_Scripts.html | 78 -
...-Security_Guide-IPTables-IPTables_and_IPv6.html | 20 -
...urity_Guide-IPTables-Saving_IPTables_Rules.html | 24 -
.../sect-Security_Guide-IPTables.html | 70 -
...ch_Options-Additional_Match_Option_Modules.html | 62 -
...Guide-IPTables_Match_Options-ICMP_Protocol.html | 14 -
..._Guide-IPTables_Match_Options-UDP_Protocol.html | 18 -
...curity_Guide-Kerberos-Additional_Resources.html | 38 -
...e-Kerberos-Configuring_a_Kerberos_5_Client.html | 38 -
...e-Kerberos-Configuring_a_Kerberos_5_Server.html | 48 -
...ity_Guide-Kerberos-Domain_to_Realm_Mapping.html | 23 -
...Security_Guide-Kerberos-How_Kerberos_Works.html | 38 -
...curity_Guide-Kerberos-Kerberos_Terminology.html | 52 -
...t-Security_Guide-Kerberos-Kerberos_and_PAM.html | 14 -
...eros-Setting_Up_Cross_Realm_Authentication.html | 97 -
...y_Guide-Kerberos-Setting_Up_Secondary_KDCs.html | 70 -
.../sect-Security_Guide-Kerberos.html | 42 -
...ide-LUKS_Disk_Encryption-Links_of_Interest.html | 16 -
...ting_Directories-Step_by_Step_Instructions.html | 48 -
...irectories-What_you_have_just_accomplished.html | 12 -
...Encryption-Manually_Encrypting_Directories.html | 16 -
.../sect-Security_Guide-LUKS_Disk_Encryption.html | 26 -
...ecurity_Guide-Option_Fields-Access_Control.html | 17 -
...ct-Security_Guide-Option_Fields-Expansions.html | 49 -
...ecurity_Guide-Option_Fields-Shell_Commands.html | 25 -
...PAM_Configuration_File_Format-Control_Flag.html | 28 -
...Configuration_File_Format-Module_Arguments.html | 18 -
...-PAM_Configuration_File_Format-Module_Name.html | 12 -
...al_Caching-Common_pam_timestamp_Directives.html | 18 -
...AM_and_Device_Ownership-Application_Access.html | 28 -
...ntication_Modules_PAM-Additional_Resources.html | 30 -
...ntication_Modules_PAM-Creating_PAM_Modules.html | 18 -
..._Modules_PAM-PAM_Configuration_File_Format.html | 49 -
...cation_Modules_PAM-PAM_Configuration_Files.html | 16 -
...-PAM_and_Administrative_Credential_Caching.html | 38 -
...ation_Modules_PAM-PAM_and_Device_Ownership.html | 35 -
...Modules_PAM-Sample_PAM_Configuration_Files.html | 51 -
...Guide-Pluggable_Authentication_Modules_PAM.html | 26 -
...allation-Utilize_LUKS_Partition_Encryption.html | 12 -
...curity_Guide-Securing_FTP-Anonymous_Access.html | 30 -
...ing_FTP-Use_TCP_Wrappers_To_Control_Access.html | 12 -
...-Security_Guide-Securing_FTP-User_Accounts.html | 20 -
...Guide-Securing_NFS-Beware_of_Syntax_Errors.html | 18 -
...g_NFS-Do_Not_Use_the_no_root_squash_Option.html | 14 -
...de-Securing_NFS-NFS_Firewall_Configuration.html | 24 -
...Assign_Static_Ports_and_Use_iptables_Rules.html | 21 -
...Securing_NIS-Edit_the_varypsecurenets_File.html | 18 -
...e-Securing_NIS-Use_Kerberos_Authentication.html | 14 -
...Password_like_NIS_Domain_Name_and_Hostname.html | 20 -
...ring_Portmap-Protect_portmap_With_iptables.html | 19 -
...ty_Guide-Securing_Sendmail-Mail_only_Users.html | 12 -
...y_Guide-Securing_Sendmail-NFS_and_Sendmail.html | 16 -
.../sect-Security_Guide-Security_Updates.html | 18 -
...ecurity_Guide-Server_Security-Securing_FTP.html | 36 -
...ecurity_Guide-Server_Security-Securing_NFS.html | 14 -
...ecurity_Guide-Server_Security-Securing_NIS.html | 28 -
...ity_Guide-Server_Security-Securing_Portmap.html | 20 -
...ty_Guide-Server_Security-Securing_Sendmail.html | 26 -
...r_Security-Securing_the_Apache_HTTP_Server.html | 27 -
...curity-Verifying_Which_Ports_Are_Listening.html | 57 -
.../sect-Security_Guide-Server_Security.html | 102 -
...onfiguring_Firefox_to_use_Kerberos_for_SSO.html | 67 -
...O-Getting_Started_with_your_new_Smart_Card.html | 74 -
...ign_on_SSO-How_Smart_Card_Enrollment_Works.html | 20 -
...gle_Sign_on_SSO-How_Smart_Card_Login_Works.html | 24 -
.../sect-Security_Guide-Single_Sign_on_SSO.html | 44 -
...gned_Packages_from_Well_Known_Repositories.html | 14 -
...curity_Updates-Adjusting_Automatic_Updates.html | 14 -
...enance-Plan_and_Configure_Security_Updates.html | 16 -
...Wrappers_Configuration_Files-Option_Fields.html | 20 -
...P_Wrappers_and_xinetd-Additional_Resources.html | 28 -
...nd_xinetd-TCP_Wrappers_Configuration_Files.html | 118 -
...urity_Guide-TCP_Wrappers_and_xinetd-xinetd.html | 18 -
...pers_and_xinetd-xinetd_Configuration_Files.html | 42 -
...ect-Security_Guide-TCP_Wrappers_and_xinetd.html | 44 -
...Server_Security-Inattentive_Administration.html | 16 -
...rver_Security-Inherently_Insecure_Services.html | 20 -
...eats_to_Server_Security-Unpatched_Services.html | 18 -
...PC_Security-Vulnerable_Client_Applications.html | 16 -
...ide-Updating_Packages-Applying_the_Changes.html | 50 -
...dating_Packages-Installing_Signed_Packages.html | 24 -
...pdating_Packages-Verifying_Signed_Packages.html | 28 -
...ide-Using_IPTables-Basic_Firewall_Policies.html | 23 -
...Tables-Saving_and_Restoring_IPTables_Rules.html | 14 -
...Assessment-Defining_Assessment_and_Testing.html | 50 -
...nerability_Assessment-Evaluating_the_Tools.html | 41 -
...ct-Security_Guide-Vulnerability_Assessment.html | 30 -
..._Files-Altering_xinetd_Configuration_Files.html | 30 -
...figuration_Files-The_etcxinetd.d_Directory.html | 47 -
.../fedora-0.1-Security_Guide-en-US.pdf | Bin 1582084 -> 0 bytes
.../opds-Community_Services_Infrastructure.xml | 4 +
public_html/en-US/opds-Fedora.xml | 8 +-
.../opds-Fedora_Contributor_Documentation.xml | 4 +
public_html/en-US/opds-Fedora_Core.xml | 4 +
.../en-US/opds-Fedora_Draft_Documentation.xml | 4 +
public_html/en-US/opds.xml | 24 +
public_html/en-US/toc.html | 16 +-
.../opds-Community_Services_Infrastructure.xml | 4 +
public_html/es-ES/opds-Fedora.xml | 4 +
public_html/es-ES/opds-Fedora_15.xml | 4 +
.../opds-Fedora_Contributor_Documentation.xml | 4 +
public_html/es-ES/opds-Fedora_Core.xml | 4 +
.../es-ES/opds-Fedora_Draft_Documentation.xml | 4 +
public_html/es-ES/opds.xml | 28 +
public_html/es-ES/toc.html | 6 +-
.../opds-Community_Services_Infrastructure.xml | 4 +
public_html/fa-IR/opds-Fedora.xml | 8 +-
.../opds-Fedora_Contributor_Documentation.xml | 4 +
public_html/fa-IR/opds-Fedora_Core.xml | 4 +
.../fa-IR/opds-Fedora_Draft_Documentation.xml | 4 +
public_html/fa-IR/opds.xml | 24 +
public_html/fa-IR/toc.html | 16 +-
.../opds-Community_Services_Infrastructure.xml | 4 +
public_html/fi-FI/opds-Fedora.xml | 8 +-
.../opds-Fedora_Contributor_Documentation.xml | 4 +
public_html/fi-FI/opds-Fedora_Core.xml | 4 +
.../fi-FI/opds-Fedora_Draft_Documentation.xml | 4 +
public_html/fi-FI/opds.xml | 24 +
public_html/fi-FI/toc.html | 18 +-
.../fr-FR/Fedora_Documentation--Welcome-fr-FR.epub | Bin 212530 -> 212530 bytes
.../fr-FR/Fedora_Documentation--Welcome-fr-FR.pdf | Bin 55051 -> 54563 bytes
public_html/fr-FR/index.html | 10 +-
.../opds-Community_Services_Infrastructure.xml | 4 +
public_html/fr-FR/opds-Fedora.xml | 8 +-
.../opds-Fedora_Contributor_Documentation.xml | 4 +
public_html/fr-FR/opds-Fedora_Core.xml | 4 +
.../fr-FR/opds-Fedora_Draft_Documentation.xml | 4 +
public_html/fr-FR/opds.xml | 24 +
public_html/fr-FR/toc.html | 16 +-
.../opds-Community_Services_Infrastructure.xml | 4 +
public_html/gu-IN/opds-Fedora.xml | 8 +-
.../opds-Fedora_Contributor_Documentation.xml | 4 +
public_html/gu-IN/opds-Fedora_Core.xml | 4 +
.../gu-IN/opds-Fedora_Draft_Documentation.xml | 4 +
public_html/gu-IN/opds.xml | 24 +
public_html/gu-IN/toc.html | 16 +-
.../opds-Community_Services_Infrastructure.xml | 4 +
public_html/he-IL/opds-Fedora.xml | 8 +-
.../opds-Fedora_Contributor_Documentation.xml | 4 +
public_html/he-IL/opds-Fedora_Core.xml | 4 +
.../he-IL/opds-Fedora_Draft_Documentation.xml | 4 +
public_html/he-IL/opds.xml | 24 +
public_html/he-IL/toc.html | 16 +-
.../opds-Community_Services_Infrastructure.xml | 4 +
public_html/hi-IN/opds-Fedora.xml | 8 +-
.../opds-Fedora_Contributor_Documentation.xml | 4 +
public_html/hi-IN/opds-Fedora_Core.xml | 4 +
.../hi-IN/opds-Fedora_Draft_Documentation.xml | 4 +
public_html/hi-IN/opds.xml | 24 +
public_html/hi-IN/toc.html | 16 +-
.../opds-Community_Services_Infrastructure.xml | 4 +
public_html/hu-HU/opds-Fedora.xml | 8 +-
.../opds-Fedora_Contributor_Documentation.xml | 4 +
public_html/hu-HU/opds-Fedora_Core.xml | 4 +
.../hu-HU/opds-Fedora_Draft_Documentation.xml | 4 +
public_html/hu-HU/opds.xml | 24 +
public_html/hu-HU/toc.html | 16 +-
.../opds-Community_Services_Infrastructure.xml | 4 +
public_html/id-ID/opds-Fedora.xml | 8 +-
.../opds-Fedora_Contributor_Documentation.xml | 4 +
public_html/id-ID/opds-Fedora_Core.xml | 4 +
.../id-ID/opds-Fedora_Draft_Documentation.xml | 4 +
public_html/id-ID/opds.xml | 24 +
public_html/id-ID/toc.html | 14 +-
.../opds-Community_Services_Infrastructure.xml | 4 +
public_html/it-IT/opds-Fedora.xml | 4 +
.../opds-Fedora_Contributor_Documentation.xml | 4 +
public_html/it-IT/opds-Fedora_Core.xml | 4 +
.../it-IT/opds-Fedora_Draft_Documentation.xml | 4 +
public_html/it-IT/opds.xml | 24 +
public_html/it-IT/toc.html | 14 +-
.../opds-Community_Services_Infrastructure.xml | 4 +
public_html/ja-JP/opds-Fedora.xml | 4 +
.../opds-Fedora_Contributor_Documentation.xml | 4 +
public_html/ja-JP/opds-Fedora_Core.xml | 4 +
.../ja-JP/opds-Fedora_Draft_Documentation.xml | 4 +
public_html/ja-JP/opds.xml | 24 +
public_html/ja-JP/toc.html | 12 +-
.../opds-Community_Services_Infrastructure.xml | 4 +
public_html/kn-IN/opds-Fedora.xml | 8 +-
.../opds-Fedora_Contributor_Documentation.xml | 4 +
public_html/kn-IN/opds-Fedora_Core.xml | 4 +
.../kn-IN/opds-Fedora_Draft_Documentation.xml | 4 +
public_html/kn-IN/opds.xml | 24 +
public_html/kn-IN/toc.html | 16 +-
.../opds-Community_Services_Infrastructure.xml | 4 +
public_html/ko-KR/opds-Fedora.xml | 8 +-
.../opds-Fedora_Contributor_Documentation.xml | 4 +
public_html/ko-KR/opds-Fedora_Core.xml | 4 +
.../ko-KR/opds-Fedora_Draft_Documentation.xml | 4 +
public_html/ko-KR/opds.xml | 24 +
public_html/ko-KR/toc.html | 16 +-
.../opds-Community_Services_Infrastructure.xml | 4 +
public_html/ml-IN/opds-Fedora.xml | 8 +-
.../opds-Fedora_Contributor_Documentation.xml | 4 +
public_html/ml-IN/opds-Fedora_Core.xml | 4 +
.../ml-IN/opds-Fedora_Draft_Documentation.xml | 4 +
public_html/ml-IN/opds.xml | 24 +
public_html/ml-IN/toc.html | 16 +-
.../opds-Community_Services_Infrastructure.xml | 4 +
public_html/mr-IN/opds-Fedora.xml | 8 +-
.../opds-Fedora_Contributor_Documentation.xml | 4 +
public_html/mr-IN/opds-Fedora_Core.xml | 4 +
.../mr-IN/opds-Fedora_Draft_Documentation.xml | 4 +
public_html/mr-IN/opds.xml | 24 +
public_html/mr-IN/toc.html | 16 +-
.../opds-Community_Services_Infrastructure.xml | 4 +
public_html/nb-NO/opds-Fedora.xml | 8 +-
.../opds-Fedora_Contributor_Documentation.xml | 4 +
public_html/nb-NO/opds-Fedora_Core.xml | 4 +
.../nb-NO/opds-Fedora_Draft_Documentation.xml | 4 +
public_html/nb-NO/opds.xml | 24 +
public_html/nb-NO/toc.html | 16 +-
.../opds-Community_Services_Infrastructure.xml | 4 +
public_html/nl-NL/opds-Fedora.xml | 4 +
.../opds-Fedora_Contributor_Documentation.xml | 4 +
public_html/nl-NL/opds-Fedora_Core.xml | 4 +
.../nl-NL/opds-Fedora_Draft_Documentation.xml | 4 +
public_html/nl-NL/opds.xml | 24 +
public_html/nl-NL/toc.html | 8 +-
public_html/opds.xml | 176 +
.../opds-Community_Services_Infrastructure.xml | 4 +
public_html/or-IN/opds-Fedora.xml | 8 +-
.../opds-Fedora_Contributor_Documentation.xml | 4 +
public_html/or-IN/opds-Fedora_Core.xml | 4 +
.../or-IN/opds-Fedora_Draft_Documentation.xml | 4 +
public_html/or-IN/opds.xml | 24 +
public_html/or-IN/toc.html | 16 +-
.../opds-Community_Services_Infrastructure.xml | 4 +
public_html/pa-IN/opds-Fedora.xml | 8 +-
.../opds-Fedora_Contributor_Documentation.xml | 4 +
public_html/pa-IN/opds-Fedora_Core.xml | 4 +
.../pa-IN/opds-Fedora_Draft_Documentation.xml | 4 +
public_html/pa-IN/opds.xml | 24 +
public_html/pa-IN/toc.html | 16 +-
.../opds-Community_Services_Infrastructure.xml | 4 +
public_html/pl-PL/opds-Fedora.xml | 8 +-
.../opds-Fedora_Contributor_Documentation.xml | 4 +
public_html/pl-PL/opds-Fedora_Core.xml | 4 +
.../pl-PL/opds-Fedora_Draft_Documentation.xml | 4 +
public_html/pl-PL/opds.xml | 24 +
public_html/pl-PL/toc.html | 16 +-
.../opds-Community_Services_Infrastructure.xml | 4 +
public_html/pt-BR/opds-Fedora.xml | 8 +-
.../opds-Fedora_Contributor_Documentation.xml | 4 +
public_html/pt-BR/opds-Fedora_Core.xml | 4 +
.../pt-BR/opds-Fedora_Draft_Documentation.xml | 4 +
public_html/pt-BR/opds.xml | 24 +
public_html/pt-BR/toc.html | 14 +-
.../opds-Community_Services_Infrastructure.xml | 4 +
public_html/pt-PT/opds-Fedora.xml | 8 +-
.../opds-Fedora_Contributor_Documentation.xml | 4 +
public_html/pt-PT/opds-Fedora_Core.xml | 4 +
.../pt-PT/opds-Fedora_Draft_Documentation.xml | 4 +
public_html/pt-PT/opds.xml | 24 +
public_html/pt-PT/toc.html | 16 +-
.../ro/opds-Community_Services_Infrastructure.xml | 4 +
public_html/ro/opds-Fedora.xml | 8 +-
.../ro/opds-Fedora_Contributor_Documentation.xml | 4 +
public_html/ro/opds-Fedora_Core.xml | 4 +
public_html/ro/opds-Fedora_Draft_Documentation.xml | 4 +
public_html/ro/opds.xml | 24 +
public_html/ro/toc.html | 16 +-
.../opds-Community_Services_Infrastructure.xml | 4 +
public_html/ru-RU/opds-Fedora.xml | 8 +-
.../opds-Fedora_Contributor_Documentation.xml | 4 +
public_html/ru-RU/opds-Fedora_Core.xml | 4 +
.../ru-RU/opds-Fedora_Draft_Documentation.xml | 4 +
public_html/ru-RU/opds.xml | 24 +
public_html/ru-RU/toc.html | 14 +-
.../opds-Community_Services_Infrastructure.xml | 4 +
public_html/sk-SK/opds-Fedora.xml | 8 +-
.../opds-Fedora_Contributor_Documentation.xml | 4 +
public_html/sk-SK/opds-Fedora_Core.xml | 4 +
.../sk-SK/opds-Fedora_Draft_Documentation.xml | 4 +
public_html/sk-SK/opds.xml | 24 +
public_html/sk-SK/toc.html | 16 +-
.../opds-Community_Services_Infrastructure.xml | 4 +
public_html/sr-Latn-RS/opds-Fedora.xml | 8 +-
.../opds-Fedora_Contributor_Documentation.xml | 4 +
public_html/sr-Latn-RS/opds-Fedora_Core.xml | 4 +
.../sr-Latn-RS/opds-Fedora_Draft_Documentation.xml | 4 +
public_html/sr-Latn-RS/opds.xml | 24 +
public_html/sr-Latn-RS/toc.html | 14 +-
.../opds-Community_Services_Infrastructure.xml | 4 +
public_html/sr-RS/opds-Fedora.xml | 8 +-
.../opds-Fedora_Contributor_Documentation.xml | 4 +
public_html/sr-RS/opds-Fedora_Core.xml | 4 +
.../sr-RS/opds-Fedora_Draft_Documentation.xml | 4 +
public_html/sr-RS/opds.xml | 24 +
public_html/sr-RS/toc.html | 14 +-
.../opds-Community_Services_Infrastructure.xml | 4 +
public_html/sv-SE/opds-Fedora.xml | 8 +-
.../opds-Fedora_Contributor_Documentation.xml | 4 +
public_html/sv-SE/opds-Fedora_Core.xml | 4 +
.../sv-SE/opds-Fedora_Draft_Documentation.xml | 4 +
public_html/sv-SE/opds.xml | 24 +
public_html/sv-SE/toc.html | 18 +-
.../opds-Community_Services_Infrastructure.xml | 4 +
public_html/ta-IN/opds-Fedora.xml | 8 +-
.../opds-Fedora_Contributor_Documentation.xml | 4 +
public_html/ta-IN/opds-Fedora_Core.xml | 4 +
.../ta-IN/opds-Fedora_Draft_Documentation.xml | 4 +
public_html/ta-IN/opds.xml | 24 +
public_html/ta-IN/toc.html | 16 +-
.../opds-Community_Services_Infrastructure.xml | 4 +
public_html/te-IN/opds-Fedora.xml | 8 +-
.../opds-Fedora_Contributor_Documentation.xml | 4 +
public_html/te-IN/opds-Fedora_Core.xml | 4 +
.../te-IN/opds-Fedora_Draft_Documentation.xml | 4 +
public_html/te-IN/opds.xml | 24 +
public_html/te-IN/toc.html | 16 +-
public_html/toc.html | 48 +-
.../opds-Community_Services_Infrastructure.xml | 4 +
public_html/uk-UA/opds-Fedora.xml | 8 +-
.../opds-Fedora_Contributor_Documentation.xml | 4 +
public_html/uk-UA/opds-Fedora_Core.xml | 4 +
.../uk-UA/opds-Fedora_Draft_Documentation.xml | 4 +
public_html/uk-UA/opds.xml | 24 +
public_html/uk-UA/toc.html | 14 +-
.../opds-Community_Services_Infrastructure.xml | 4 +
public_html/zh-CN/opds-Fedora.xml | 8 +-
.../opds-Fedora_Contributor_Documentation.xml | 4 +
public_html/zh-CN/opds-Fedora_Core.xml | 4 +
.../zh-CN/opds-Fedora_Draft_Documentation.xml | 4 +
public_html/zh-CN/opds.xml | 24 +
public_html/zh-CN/toc.html | 18 +-
.../opds-Community_Services_Infrastructure.xml | 4 +
public_html/zh-TW/opds-Fedora.xml | 8 +-
.../opds-Fedora_Contributor_Documentation.xml | 4 +
public_html/zh-TW/opds-Fedora_Core.xml | 4 +
.../zh-TW/opds-Fedora_Draft_Documentation.xml | 4 +
public_html/zh-TW/opds.xml | 24 +
public_html/zh-TW/toc.html | 16 +-
993 files changed, 2536 insertions(+), 40192 deletions(-)
---
diff --cc public_html/as-IN/opds-Community_Services_Infrastructure.xml
index 2965655,92ec15f..b2da027
--- a/public_html/as-IN/opds-Community_Services_Infrastructure.xml
+++ b/public_html/as-IN/opds-Community_Services_Infrastructure.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/as-IN/opds-Community_Services_Infrast...
<title>Community Services Infrastructure</title>
<subtitle>Community Services Infrastructure</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:54</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/as-IN/opds-Fedora.xml
index 3a13490,6ba1c0c..b93a8b9
--- a/public_html/as-IN/opds-Fedora.xml
+++ b/public_html/as-IN/opds-Fedora.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/as-IN/opds-Fedora.xml</id>
<title>Fedora</title>
<subtitle>Fedora</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:54</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/as-IN/opds-Fedora_Contributor_Documentation.xml
index 09eb56a,ea225bf..c639e25
--- a/public_html/as-IN/opds-Fedora_Contributor_Documentation.xml
+++ b/public_html/as-IN/opds-Fedora_Contributor_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/as-IN/opds-Fedora_Contributor_Documen...
<title>Fedora Contributor Documentation</title>
<subtitle>Fedora Contributor Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:54</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/as-IN/opds-Fedora_Core.xml
index b2e1d83,e55662a..204788e
--- a/public_html/as-IN/opds-Fedora_Core.xml
+++ b/public_html/as-IN/opds-Fedora_Core.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/as-IN/opds-Fedora_Core.xml</id>
<title>Fedora Core</title>
<subtitle>Fedora Core</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:54</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/as-IN/opds-Fedora_Draft_Documentation.xml
index f55751c,17eaeeb..0ff675e
--- a/public_html/as-IN/opds-Fedora_Draft_Documentation.xml
+++ b/public_html/as-IN/opds-Fedora_Draft_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/as-IN/opds-Fedora_Draft_Documentation...
<title>Fedora Draft Documentation</title>
<subtitle>Fedora Draft Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:54</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/as-IN/opds.xml
index 98ba4c2,ba03180..8f58f90
--- a/public_html/as-IN/opds.xml
+++ b/public_html/as-IN/opds.xml
@@@ -6,7 -6,7 +6,11 @@@
<link
rel="http://opds-spec.org/crawlable"
type="application/atom+xml"
href="http://bookserver.archive.org/catalog/crawlable" title="Crawlable
feed"/>
<
id>http://docs.fedoraproject.org/as-IN/opds.xml</id>
<title>Product List</title>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:54</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
@@@ -15,7 -15,7 +19,11 @@@
<entry>
<title>Community Services Infrastructure</title>
<
id>http://docs.fedoraproject.org/as-IN/Community_Services_Infrastructu...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:54</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>as-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Community_Services_Infrastructure.xml"/>
@@@ -23,7 -23,7 +31,11 @@@
<entry>
<title>Fedora</title>
<
id>http://docs.fedoraproject.org/as-IN/Fedora/opds-Fedora.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:54</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>as-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora.xml"/>
@@@ -31,7 -31,7 +43,11 @@@
<entry>
<title>Fedora Contributor Documentation</title>
<
id>http://docs.fedoraproject.org/as-IN/Fedora_Contributor_Documentatio...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:54</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>as-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Contributor_Documentation.xml"/>
@@@ -39,7 -39,7 +55,11 @@@
<entry>
<title>Fedora Core</title>
<
id>http://docs.fedoraproject.org/as-IN/Fedora_Core/opds-Fedora_Core.xm...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:54</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>as-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Core.xml"/>
@@@ -47,7 -47,7 +67,11 @@@
<entry>
<title>Fedora Draft Documentation</title>
<
id>http://docs.fedoraproject.org/as-IN/Fedora_Draft_Documentation/opds...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:54</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>as-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Draft_Documentation.xml"/>
diff --cc public_html/bg-BG/opds-Community_Services_Infrastructure.xml
index 58a75a8,b6be677..ddd1ba3
--- a/public_html/bg-BG/opds-Community_Services_Infrastructure.xml
+++ b/public_html/bg-BG/opds-Community_Services_Infrastructure.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/bg-BG/opds-Community_Services_Infrast...
<title>Community Services Infrastructure</title>
<subtitle>Community Services Infrastructure</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:54</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/bg-BG/opds-Fedora.xml
index e2b4e58,56fbeb8..798beb8
--- a/public_html/bg-BG/opds-Fedora.xml
+++ b/public_html/bg-BG/opds-Fedora.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/bg-BG/opds-Fedora.xml</id>
<title>Fedora</title>
<subtitle>Fedora</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/bg-BG/opds-Fedora_Contributor_Documentation.xml
index 5c22be2,853d44d..273046e
--- a/public_html/bg-BG/opds-Fedora_Contributor_Documentation.xml
+++ b/public_html/bg-BG/opds-Fedora_Contributor_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/bg-BG/opds-Fedora_Contributor_Documen...
<title>Fedora Contributor Documentation</title>
<subtitle>Fedora Contributor Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/bg-BG/opds-Fedora_Core.xml
index cdb0154,d4a0285..8cb0b5a
--- a/public_html/bg-BG/opds-Fedora_Core.xml
+++ b/public_html/bg-BG/opds-Fedora_Core.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/bg-BG/opds-Fedora_Core.xml</id>
<title>Fedora Core</title>
<subtitle>Fedora Core</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/bg-BG/opds-Fedora_Draft_Documentation.xml
index 8764414,64d8dcc..6a8d8d7
--- a/public_html/bg-BG/opds-Fedora_Draft_Documentation.xml
+++ b/public_html/bg-BG/opds-Fedora_Draft_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/bg-BG/opds-Fedora_Draft_Documentation...
<title>Fedora Draft Documentation</title>
<subtitle>Fedora Draft Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/bg-BG/opds.xml
index ff29f75,ed45cbc..48f4bd7
--- a/public_html/bg-BG/opds.xml
+++ b/public_html/bg-BG/opds.xml
@@@ -6,7 -6,7 +6,11 @@@
<link
rel="http://opds-spec.org/crawlable"
type="application/atom+xml"
href="http://bookserver.archive.org/catalog/crawlable" title="Crawlable
feed"/>
<
id>http://docs.fedoraproject.org/bg-BG/opds.xml</id>
<title>Product List</title>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
@@@ -15,7 -15,7 +19,11 @@@
<entry>
<title>Community Services Infrastructure</title>
<
id>http://docs.fedoraproject.org/bg-BG/Community_Services_Infrastructu...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:54</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>bg-BG</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Community_Services_Infrastructure.xml"/>
@@@ -23,7 -23,7 +31,11 @@@
<entry>
<title>Fedora</title>
<
id>http://docs.fedoraproject.org/bg-BG/Fedora/opds-Fedora.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>bg-BG</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora.xml"/>
@@@ -31,7 -31,7 +43,11 @@@
<entry>
<title>Fedora Contributor Documentation</title>
<
id>http://docs.fedoraproject.org/bg-BG/Fedora_Contributor_Documentatio...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>bg-BG</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Contributor_Documentation.xml"/>
@@@ -39,7 -39,7 +55,11 @@@
<entry>
<title>Fedora Core</title>
<
id>http://docs.fedoraproject.org/bg-BG/Fedora_Core/opds-Fedora_Core.xm...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>bg-BG</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Core.xml"/>
@@@ -47,7 -47,7 +67,11 @@@
<entry>
<title>Fedora Draft Documentation</title>
<
id>http://docs.fedoraproject.org/bg-BG/Fedora_Draft_Documentation/opds...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>bg-BG</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Draft_Documentation.xml"/>
diff --cc public_html/bn-IN/opds-Community_Services_Infrastructure.xml
index 60a7238,34df35b..9eec956
--- a/public_html/bn-IN/opds-Community_Services_Infrastructure.xml
+++ b/public_html/bn-IN/opds-Community_Services_Infrastructure.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/bn-IN/opds-Community_Services_Infrast...
<title>Community Services Infrastructure</title>
<subtitle>Community Services Infrastructure</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/bn-IN/opds-Fedora.xml
index 2e1f561,82fdc6d..240d125
--- a/public_html/bn-IN/opds-Fedora.xml
+++ b/public_html/bn-IN/opds-Fedora.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/bn-IN/opds-Fedora.xml</id>
<title>Fedora</title>
<subtitle>Fedora</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/bn-IN/opds-Fedora_Contributor_Documentation.xml
index 15b738c,3b40f19..e0f5c89
--- a/public_html/bn-IN/opds-Fedora_Contributor_Documentation.xml
+++ b/public_html/bn-IN/opds-Fedora_Contributor_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/bn-IN/opds-Fedora_Contributor_Documen...
<title>Fedora Contributor Documentation</title>
<subtitle>Fedora Contributor Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/bn-IN/opds-Fedora_Core.xml
index 09d6eeb,9098680..cd4b259
--- a/public_html/bn-IN/opds-Fedora_Core.xml
+++ b/public_html/bn-IN/opds-Fedora_Core.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/bn-IN/opds-Fedora_Core.xml</id>
<title>Fedora Core</title>
<subtitle>Fedora Core</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/bn-IN/opds-Fedora_Draft_Documentation.xml
index 8477e08,3d31dc7..a6a9533
--- a/public_html/bn-IN/opds-Fedora_Draft_Documentation.xml
+++ b/public_html/bn-IN/opds-Fedora_Draft_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/bn-IN/opds-Fedora_Draft_Documentation...
<title>Fedora Draft Documentation</title>
<subtitle>Fedora Draft Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/bn-IN/opds.xml
index 10cee13,af0cb3e..92ddc07
--- a/public_html/bn-IN/opds.xml
+++ b/public_html/bn-IN/opds.xml
@@@ -6,7 -6,7 +6,11 @@@
<link
rel="http://opds-spec.org/crawlable"
type="application/atom+xml"
href="http://bookserver.archive.org/catalog/crawlable" title="Crawlable
feed"/>
<
id>http://docs.fedoraproject.org/bn-IN/opds.xml</id>
<title>Product List</title>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
@@@ -15,7 -15,7 +19,11 @@@
<entry>
<title>Community Services Infrastructure</title>
<
id>http://docs.fedoraproject.org/bn-IN/Community_Services_Infrastructu...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>bn-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Community_Services_Infrastructure.xml"/>
@@@ -23,7 -23,7 +31,11 @@@
<entry>
<title>Fedora</title>
<
id>http://docs.fedoraproject.org/bn-IN/Fedora/opds-Fedora.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>bn-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora.xml"/>
@@@ -31,7 -31,7 +43,11 @@@
<entry>
<title>Fedora Contributor Documentation</title>
<
id>http://docs.fedoraproject.org/bn-IN/Fedora_Contributor_Documentatio...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>bn-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Contributor_Documentation.xml"/>
@@@ -39,7 -39,7 +55,11 @@@
<entry>
<title>Fedora Core</title>
<
id>http://docs.fedoraproject.org/bn-IN/Fedora_Core/opds-Fedora_Core.xm...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>bn-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Core.xml"/>
@@@ -47,7 -47,7 +67,11 @@@
<entry>
<title>Fedora Draft Documentation</title>
<
id>http://docs.fedoraproject.org/bn-IN/Fedora_Draft_Documentation/opds...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>bn-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Draft_Documentation.xml"/>
diff --cc public_html/bs-BA/opds-Community_Services_Infrastructure.xml
index d4813da,c98bcb7..4cae14d
--- a/public_html/bs-BA/opds-Community_Services_Infrastructure.xml
+++ b/public_html/bs-BA/opds-Community_Services_Infrastructure.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/bs-BA/opds-Community_Services_Infrast...
<title>Community Services Infrastructure</title>
<subtitle>Community Services Infrastructure</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/bs-BA/opds-Fedora.xml
index 2562ff6,95355c0..0c7665b
--- a/public_html/bs-BA/opds-Fedora.xml
+++ b/public_html/bs-BA/opds-Fedora.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/bs-BA/opds-Fedora.xml</id>
<title>Fedora</title>
<subtitle>Fedora</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/bs-BA/opds-Fedora_Contributor_Documentation.xml
index 3286668,3b7dd2d..72f169a
--- a/public_html/bs-BA/opds-Fedora_Contributor_Documentation.xml
+++ b/public_html/bs-BA/opds-Fedora_Contributor_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/bs-BA/opds-Fedora_Contributor_Documen...
<title>Fedora Contributor Documentation</title>
<subtitle>Fedora Contributor Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/bs-BA/opds-Fedora_Core.xml
index 9d0f842,869f382..1284086
--- a/public_html/bs-BA/opds-Fedora_Core.xml
+++ b/public_html/bs-BA/opds-Fedora_Core.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/bs-BA/opds-Fedora_Core.xml</id>
<title>Fedora Core</title>
<subtitle>Fedora Core</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/bs-BA/opds-Fedora_Draft_Documentation.xml
index 64cecba,52d2c85..77a8499
--- a/public_html/bs-BA/opds-Fedora_Draft_Documentation.xml
+++ b/public_html/bs-BA/opds-Fedora_Draft_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/bs-BA/opds-Fedora_Draft_Documentation...
<title>Fedora Draft Documentation</title>
<subtitle>Fedora Draft Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/bs-BA/opds.xml
index a547294,c7ccb36..f1efb19
--- a/public_html/bs-BA/opds.xml
+++ b/public_html/bs-BA/opds.xml
@@@ -6,7 -6,7 +6,11 @@@
<link
rel="http://opds-spec.org/crawlable"
type="application/atom+xml"
href="http://bookserver.archive.org/catalog/crawlable" title="Crawlable
feed"/>
<
id>http://docs.fedoraproject.org/bs-BA/opds.xml</id>
<title>Product List</title>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
@@@ -15,7 -15,7 +19,11 @@@
<entry>
<title>Community Services Infrastructure</title>
<
id>http://docs.fedoraproject.org/bs-BA/Community_Services_Infrastructu...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>bs-BA</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Community_Services_Infrastructure.xml"/>
@@@ -23,7 -23,7 +31,11 @@@
<entry>
<title>Fedora</title>
<
id>http://docs.fedoraproject.org/bs-BA/Fedora/opds-Fedora.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>bs-BA</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora.xml"/>
@@@ -31,7 -31,7 +43,11 @@@
<entry>
<title>Fedora Contributor Documentation</title>
<
id>http://docs.fedoraproject.org/bs-BA/Fedora_Contributor_Documentatio...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>bs-BA</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Contributor_Documentation.xml"/>
@@@ -39,7 -39,7 +55,11 @@@
<entry>
<title>Fedora Core</title>
<
id>http://docs.fedoraproject.org/bs-BA/Fedora_Core/opds-Fedora_Core.xm...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>bs-BA</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Core.xml"/>
@@@ -47,7 -47,7 +67,11 @@@
<entry>
<title>Fedora Draft Documentation</title>
<
id>http://docs.fedoraproject.org/bs-BA/Fedora_Draft_Documentation/opds...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>bs-BA</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Draft_Documentation.xml"/>
diff --cc public_html/ca-ES/opds-Community_Services_Infrastructure.xml
index 2fe2f0e,c8696a1..cbaa591
--- a/public_html/ca-ES/opds-Community_Services_Infrastructure.xml
+++ b/public_html/ca-ES/opds-Community_Services_Infrastructure.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/ca-ES/opds-Community_Services_Infrast...
<title>Community Services Infrastructure</title>
<subtitle>Community Services Infrastructure</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/ca-ES/opds-Fedora.xml
index 9575b31,87a8698..935f52b
--- a/public_html/ca-ES/opds-Fedora.xml
+++ b/public_html/ca-ES/opds-Fedora.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/ca-ES/opds-Fedora.xml</id>
<title>Fedora</title>
<subtitle>Fedora</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/ca-ES/opds-Fedora_Contributor_Documentation.xml
index 1dbc362,d17d6b1..a19c27a
--- a/public_html/ca-ES/opds-Fedora_Contributor_Documentation.xml
+++ b/public_html/ca-ES/opds-Fedora_Contributor_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/ca-ES/opds-Fedora_Contributor_Documen...
<title>Fedora Contributor Documentation</title>
<subtitle>Fedora Contributor Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/ca-ES/opds-Fedora_Core.xml
index 7d53d9f,546268b..8eabf25
--- a/public_html/ca-ES/opds-Fedora_Core.xml
+++ b/public_html/ca-ES/opds-Fedora_Core.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/ca-ES/opds-Fedora_Core.xml</id>
<title>Fedora Core</title>
<subtitle>Fedora Core</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/ca-ES/opds-Fedora_Draft_Documentation.xml
index e7a3de7,62a2dcc..cc60c78
--- a/public_html/ca-ES/opds-Fedora_Draft_Documentation.xml
+++ b/public_html/ca-ES/opds-Fedora_Draft_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/ca-ES/opds-Fedora_Draft_Documentation...
<title>Fedora Draft Documentation</title>
<subtitle>Fedora Draft Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/ca-ES/opds.xml
index f1d6189,7b7b94e..3ec607a
--- a/public_html/ca-ES/opds.xml
+++ b/public_html/ca-ES/opds.xml
@@@ -6,7 -6,7 +6,11 @@@
<link
rel="http://opds-spec.org/crawlable"
type="application/atom+xml"
href="http://bookserver.archive.org/catalog/crawlable" title="Crawlable
feed"/>
<
id>http://docs.fedoraproject.org/ca-ES/opds.xml</id>
<title>Product List</title>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
@@@ -15,7 -15,7 +19,11 @@@
<entry>
<title>Community Services Infrastructure</title>
<
id>http://docs.fedoraproject.org/ca-ES/Community_Services_Infrastructu...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>ca-ES</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Community_Services_Infrastructure.xml"/>
@@@ -23,7 -23,7 +31,11 @@@
<entry>
<title>Fedora</title>
<
id>http://docs.fedoraproject.org/ca-ES/Fedora/opds-Fedora.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>ca-ES</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora.xml"/>
@@@ -31,7 -31,7 +43,11 @@@
<entry>
<title>Fedora Contributor Documentation</title>
<
id>http://docs.fedoraproject.org/ca-ES/Fedora_Contributor_Documentatio...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>ca-ES</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Contributor_Documentation.xml"/>
@@@ -39,7 -39,7 +55,11 @@@
<entry>
<title>Fedora Core</title>
<
id>http://docs.fedoraproject.org/ca-ES/Fedora_Core/opds-Fedora_Core.xm...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>ca-ES</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Core.xml"/>
@@@ -47,7 -47,7 +67,11 @@@
<entry>
<title>Fedora Draft Documentation</title>
<
id>http://docs.fedoraproject.org/ca-ES/Fedora_Draft_Documentation/opds...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>ca-ES</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Draft_Documentation.xml"/>
diff --cc public_html/cs-CZ/opds-Community_Services_Infrastructure.xml
index 56c67ad,0edac9f..9e1ac5a
--- a/public_html/cs-CZ/opds-Community_Services_Infrastructure.xml
+++ b/public_html/cs-CZ/opds-Community_Services_Infrastructure.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/cs-CZ/opds-Community_Services_Infrast...
<title>Community Services Infrastructure</title>
<subtitle>Community Services Infrastructure</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/cs-CZ/opds-Fedora.xml
index 9f782d8,43472bc..dce20a4
--- a/public_html/cs-CZ/opds-Fedora.xml
+++ b/public_html/cs-CZ/opds-Fedora.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/cs-CZ/opds-Fedora.xml</id>
<title>Fedora</title>
<subtitle>Fedora</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/cs-CZ/opds-Fedora_Contributor_Documentation.xml
index bd06180,58a199f..3840732
--- a/public_html/cs-CZ/opds-Fedora_Contributor_Documentation.xml
+++ b/public_html/cs-CZ/opds-Fedora_Contributor_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/cs-CZ/opds-Fedora_Contributor_Documen...
<title>Fedora Contributor Documentation</title>
<subtitle>Fedora Contributor Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/cs-CZ/opds-Fedora_Core.xml
index 885ed99,5143e28..9305a87
--- a/public_html/cs-CZ/opds-Fedora_Core.xml
+++ b/public_html/cs-CZ/opds-Fedora_Core.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/cs-CZ/opds-Fedora_Core.xml</id>
<title>Fedora Core</title>
<subtitle>Fedora Core</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/cs-CZ/opds-Fedora_Draft_Documentation.xml
index 4540bca,ac8b540..6e725af
--- a/public_html/cs-CZ/opds-Fedora_Draft_Documentation.xml
+++ b/public_html/cs-CZ/opds-Fedora_Draft_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/cs-CZ/opds-Fedora_Draft_Documentation...
<title>Fedora Draft Documentation</title>
<subtitle>Fedora Draft Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/cs-CZ/opds.xml
index 2d9be75,d6e0bfa..d44c014
--- a/public_html/cs-CZ/opds.xml
+++ b/public_html/cs-CZ/opds.xml
@@@ -6,7 -6,7 +6,11 @@@
<link
rel="http://opds-spec.org/crawlable"
type="application/atom+xml"
href="http://bookserver.archive.org/catalog/crawlable" title="Crawlable
feed"/>
<
id>http://docs.fedoraproject.org/cs-CZ/opds.xml</id>
<title>Product List</title>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
@@@ -15,7 -15,7 +19,11 @@@
<entry>
<title>Community Services Infrastructure</title>
<
id>http://docs.fedoraproject.org/cs-CZ/Community_Services_Infrastructu...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>cs-CZ</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Community_Services_Infrastructure.xml"/>
@@@ -23,7 -23,7 +31,11 @@@
<entry>
<title>Fedora</title>
<
id>http://docs.fedoraproject.org/cs-CZ/Fedora/opds-Fedora.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>cs-CZ</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora.xml"/>
@@@ -31,7 -31,7 +43,11 @@@
<entry>
<title>Fedora Contributor Documentation</title>
<
id>http://docs.fedoraproject.org/cs-CZ/Fedora_Contributor_Documentatio...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>cs-CZ</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Contributor_Documentation.xml"/>
@@@ -39,7 -39,7 +55,11 @@@
<entry>
<title>Fedora Core</title>
<
id>http://docs.fedoraproject.org/cs-CZ/Fedora_Core/opds-Fedora_Core.xm...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>cs-CZ</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Core.xml"/>
@@@ -47,7 -47,7 +67,11 @@@
<entry>
<title>Fedora Draft Documentation</title>
<
id>http://docs.fedoraproject.org/cs-CZ/Fedora_Draft_Documentation/opds...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>cs-CZ</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Draft_Documentation.xml"/>
diff --cc public_html/da-DK/opds-Community_Services_Infrastructure.xml
index cf151df,327c9fa..b4e53fd
--- a/public_html/da-DK/opds-Community_Services_Infrastructure.xml
+++ b/public_html/da-DK/opds-Community_Services_Infrastructure.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/da-DK/opds-Community_Services_Infrast...
<title>Community Services Infrastructure</title>
<subtitle>Community Services Infrastructure</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/da-DK/opds-Fedora.xml
index 7cddcf9,48380d9..8bb05f2
--- a/public_html/da-DK/opds-Fedora.xml
+++ b/public_html/da-DK/opds-Fedora.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/da-DK/opds-Fedora.xml</id>
<title>Fedora</title>
<subtitle>Fedora</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/da-DK/opds-Fedora_Contributor_Documentation.xml
index 1c21370,c43b878..d305bc3
--- a/public_html/da-DK/opds-Fedora_Contributor_Documentation.xml
+++ b/public_html/da-DK/opds-Fedora_Contributor_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/da-DK/opds-Fedora_Contributor_Documen...
<title>Fedora Contributor Documentation</title>
<subtitle>Fedora Contributor Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/da-DK/opds-Fedora_Core.xml
index 6ee44e6,089f276..497299c
--- a/public_html/da-DK/opds-Fedora_Core.xml
+++ b/public_html/da-DK/opds-Fedora_Core.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/da-DK/opds-Fedora_Core.xml</id>
<title>Fedora Core</title>
<subtitle>Fedora Core</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/da-DK/opds-Fedora_Draft_Documentation.xml
index 5d14b6c,4902b24..977191e
--- a/public_html/da-DK/opds-Fedora_Draft_Documentation.xml
+++ b/public_html/da-DK/opds-Fedora_Draft_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/da-DK/opds-Fedora_Draft_Documentation...
<title>Fedora Draft Documentation</title>
<subtitle>Fedora Draft Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/da-DK/opds.xml
index 1863aeb,bb13881..d158cf4
--- a/public_html/da-DK/opds.xml
+++ b/public_html/da-DK/opds.xml
@@@ -6,7 -6,7 +6,11 @@@
<link
rel="http://opds-spec.org/crawlable"
type="application/atom+xml"
href="http://bookserver.archive.org/catalog/crawlable" title="Crawlable
feed"/>
<
id>http://docs.fedoraproject.org/da-DK/opds.xml</id>
<title>Product List</title>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
@@@ -15,7 -15,7 +19,11 @@@
<entry>
<title>Community Services Infrastructure</title>
<
id>http://docs.fedoraproject.org/da-DK/Community_Services_Infrastructu...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>da-DK</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Community_Services_Infrastructure.xml"/>
@@@ -23,7 -23,7 +31,11 @@@
<entry>
<title>Fedora</title>
<
id>http://docs.fedoraproject.org/da-DK/Fedora/opds-Fedora.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>da-DK</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora.xml"/>
@@@ -31,7 -31,7 +43,11 @@@
<entry>
<title>Fedora Contributor Documentation</title>
<
id>http://docs.fedoraproject.org/da-DK/Fedora_Contributor_Documentatio...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>da-DK</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Contributor_Documentation.xml"/>
@@@ -39,7 -39,7 +55,11 @@@
<entry>
<title>Fedora Core</title>
<
id>http://docs.fedoraproject.org/da-DK/Fedora_Core/opds-Fedora_Core.xm...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>da-DK</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Core.xml"/>
@@@ -47,7 -47,7 +67,11 @@@
<entry>
<title>Fedora Draft Documentation</title>
<
id>http://docs.fedoraproject.org/da-DK/Fedora_Draft_Documentation/opds...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>da-DK</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Draft_Documentation.xml"/>
diff --cc public_html/de-DE/opds-Community_Services_Infrastructure.xml
index 73e1bf9,d3e0261..808843b
--- a/public_html/de-DE/opds-Community_Services_Infrastructure.xml
+++ b/public_html/de-DE/opds-Community_Services_Infrastructure.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/de-DE/opds-Community_Services_Infrast...
<title>Community Services Infrastructure</title>
<subtitle>Community Services Infrastructure</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/de-DE/opds-Fedora.xml
index 8dfc7dd,3d6747d..9e3cdeb
--- a/public_html/de-DE/opds-Fedora.xml
+++ b/public_html/de-DE/opds-Fedora.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/de-DE/opds-Fedora.xml</id>
<title>Fedora</title>
<subtitle>Fedora</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/de-DE/opds-Fedora_Contributor_Documentation.xml
index d2b28f8,23adf3a..de7ec99
--- a/public_html/de-DE/opds-Fedora_Contributor_Documentation.xml
+++ b/public_html/de-DE/opds-Fedora_Contributor_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/de-DE/opds-Fedora_Contributor_Documen...
<title>Fedora Contributor Documentation</title>
<subtitle>Fedora Contributor Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/de-DE/opds-Fedora_Core.xml
index a6b89a9,8196126..576d93b
--- a/public_html/de-DE/opds-Fedora_Core.xml
+++ b/public_html/de-DE/opds-Fedora_Core.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/de-DE/opds-Fedora_Core.xml</id>
<title>Fedora Core</title>
<subtitle>Fedora Core</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/de-DE/opds-Fedora_Draft_Documentation.xml
index d23dafc,1cca2ad..41651cc
--- a/public_html/de-DE/opds-Fedora_Draft_Documentation.xml
+++ b/public_html/de-DE/opds-Fedora_Draft_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/de-DE/opds-Fedora_Draft_Documentation...
<title>Fedora Draft Documentation</title>
<subtitle>Fedora Draft Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/de-DE/opds.xml
index deb9502,f4f784d..5cf6bab
--- a/public_html/de-DE/opds.xml
+++ b/public_html/de-DE/opds.xml
@@@ -6,7 -6,7 +6,11 @@@
<link
rel="http://opds-spec.org/crawlable"
type="application/atom+xml"
href="http://bookserver.archive.org/catalog/crawlable" title="Crawlable
feed"/>
<
id>http://docs.fedoraproject.org/de-DE/opds.xml</id>
<title>Product List</title>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
@@@ -15,7 -15,7 +19,11 @@@
<entry>
<title>Community Services Infrastructure</title>
<
id>http://docs.fedoraproject.org/de-DE/Community_Services_Infrastructu...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>de-DE</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Community_Services_Infrastructure.xml"/>
@@@ -23,7 -23,7 +31,11 @@@
<entry>
<title>Fedora</title>
<
id>http://docs.fedoraproject.org/de-DE/Fedora/opds-Fedora.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>de-DE</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora.xml"/>
@@@ -31,7 -31,7 +43,11 @@@
<entry>
<title>Fedora Contributor Documentation</title>
<
id>http://docs.fedoraproject.org/de-DE/Fedora_Contributor_Documentatio...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>de-DE</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Contributor_Documentation.xml"/>
@@@ -39,7 -39,7 +55,11 @@@
<entry>
<title>Fedora Core</title>
<
id>http://docs.fedoraproject.org/de-DE/Fedora_Core/opds-Fedora_Core.xm...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>de-DE</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Core.xml"/>
@@@ -47,7 -47,7 +67,11 @@@
<entry>
<title>Fedora Draft Documentation</title>
<
id>http://docs.fedoraproject.org/de-DE/Fedora_Draft_Documentation/opds...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>de-DE</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Draft_Documentation.xml"/>
diff --cc public_html/el-GR/opds-Community_Services_Infrastructure.xml
index 0c5fffc,bffacc1..2670ee6
--- a/public_html/el-GR/opds-Community_Services_Infrastructure.xml
+++ b/public_html/el-GR/opds-Community_Services_Infrastructure.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/el-GR/opds-Community_Services_Infrast...
<title>Community Services Infrastructure</title>
<subtitle>Community Services Infrastructure</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/el-GR/opds-Fedora.xml
index 9335178,118c13e..1e6618b
--- a/public_html/el-GR/opds-Fedora.xml
+++ b/public_html/el-GR/opds-Fedora.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/el-GR/opds-Fedora.xml</id>
<title>Fedora</title>
<subtitle>Fedora</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/el-GR/opds-Fedora_Contributor_Documentation.xml
index 15f1de1,843f24e..ba4a192
--- a/public_html/el-GR/opds-Fedora_Contributor_Documentation.xml
+++ b/public_html/el-GR/opds-Fedora_Contributor_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/el-GR/opds-Fedora_Contributor_Documen...
<title>Fedora Contributor Documentation</title>
<subtitle>Fedora Contributor Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/el-GR/opds-Fedora_Core.xml
index 21cfec9,ea158b1..f42384a
--- a/public_html/el-GR/opds-Fedora_Core.xml
+++ b/public_html/el-GR/opds-Fedora_Core.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/el-GR/opds-Fedora_Core.xml</id>
<title>Fedora Core</title>
<subtitle>Fedora Core</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/el-GR/opds-Fedora_Draft_Documentation.xml
index 0cab7a7,20d507b..e661693
--- a/public_html/el-GR/opds-Fedora_Draft_Documentation.xml
+++ b/public_html/el-GR/opds-Fedora_Draft_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/el-GR/opds-Fedora_Draft_Documentation...
<title>Fedora Draft Documentation</title>
<subtitle>Fedora Draft Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/el-GR/opds.xml
index fb0b373,2da0603..51454f4
--- a/public_html/el-GR/opds.xml
+++ b/public_html/el-GR/opds.xml
@@@ -6,7 -6,7 +6,11 @@@
<link
rel="http://opds-spec.org/crawlable"
type="application/atom+xml"
href="http://bookserver.archive.org/catalog/crawlable" title="Crawlable
feed"/>
<
id>http://docs.fedoraproject.org/el-GR/opds.xml</id>
<title>Product List</title>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
@@@ -15,7 -15,7 +19,11 @@@
<entry>
<title>Community Services Infrastructure</title>
<
id>http://docs.fedoraproject.org/el-GR/Community_Services_Infrastructu...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>el-GR</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Community_Services_Infrastructure.xml"/>
@@@ -23,7 -23,7 +31,11 @@@
<entry>
<title>Fedora</title>
<
id>http://docs.fedoraproject.org/el-GR/Fedora/opds-Fedora.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>el-GR</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora.xml"/>
@@@ -31,7 -31,7 +43,11 @@@
<entry>
<title>Fedora Contributor Documentation</title>
<
id>http://docs.fedoraproject.org/el-GR/Fedora_Contributor_Documentatio...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>el-GR</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Contributor_Documentation.xml"/>
@@@ -39,7 -39,7 +55,11 @@@
<entry>
<title>Fedora Core</title>
<
id>http://docs.fedoraproject.org/el-GR/Fedora_Core/opds-Fedora_Core.xm...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>el-GR</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Core.xml"/>
@@@ -47,7 -47,7 +67,11 @@@
<entry>
<title>Fedora Draft Documentation</title>
<
id>http://docs.fedoraproject.org/el-GR/Fedora_Draft_Documentation/opds...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>el-GR</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Draft_Documentation.xml"/>
diff --cc public_html/en-US/opds-Community_Services_Infrastructure.xml
index d2540ca,40003f2..a5f4fd6
--- a/public_html/en-US/opds-Community_Services_Infrastructure.xml
+++ b/public_html/en-US/opds-Community_Services_Infrastructure.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/en-US/opds-Community_Services_Infrast...
<title>Community Services Infrastructure</title>
<subtitle>Community Services Infrastructure</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/en-US/opds-Fedora.xml
index e7d791a,f83b7b1..170d19e
--- a/public_html/en-US/opds-Fedora.xml
+++ b/public_html/en-US/opds-Fedora.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/en-US/opds-Fedora.xml</id>
<title>Fedora</title>
<subtitle>Fedora</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/en-US/opds-Fedora_Contributor_Documentation.xml
index 038b0da,725622d..43a55b1
--- a/public_html/en-US/opds-Fedora_Contributor_Documentation.xml
+++ b/public_html/en-US/opds-Fedora_Contributor_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/en-US/opds-Fedora_Contributor_Documen...
<title>Fedora Contributor Documentation</title>
<subtitle>Fedora Contributor Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/en-US/opds-Fedora_Core.xml
index 6eef515,a1912f8..4f5079a
--- a/public_html/en-US/opds-Fedora_Core.xml
+++ b/public_html/en-US/opds-Fedora_Core.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/en-US/opds-Fedora_Core.xml</id>
<title>Fedora Core</title>
<subtitle>Fedora Core</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/en-US/opds-Fedora_Draft_Documentation.xml
index 2d55283,b8ae347..711badb
--- a/public_html/en-US/opds-Fedora_Draft_Documentation.xml
+++ b/public_html/en-US/opds-Fedora_Draft_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/en-US/opds-Fedora_Draft_Documentation...
<title>Fedora Draft Documentation</title>
<subtitle>Fedora Draft Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/en-US/opds.xml
index f6f2a3c,00feea8..4504c01
--- a/public_html/en-US/opds.xml
+++ b/public_html/en-US/opds.xml
@@@ -6,7 -6,7 +6,11 @@@
<link
rel="http://opds-spec.org/crawlable"
type="application/atom+xml"
href="http://bookserver.archive.org/catalog/crawlable" title="Crawlable
feed"/>
<
id>http://docs.fedoraproject.org/en-US/opds.xml</id>
<title>Product List</title>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
@@@ -15,7 -15,7 +19,11 @@@
<entry>
<title>Community Services Infrastructure</title>
<
id>http://docs.fedoraproject.org/en-US/Community_Services_Infrastructu...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>en-US</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Community_Services_Infrastructure.xml"/>
@@@ -23,7 -23,7 +31,11 @@@
<entry>
<title>Fedora</title>
<
id>http://docs.fedoraproject.org/en-US/Fedora/opds-Fedora.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>en-US</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora.xml"/>
@@@ -31,7 -31,7 +43,11 @@@
<entry>
<title>Fedora Contributor Documentation</title>
<
id>http://docs.fedoraproject.org/en-US/Fedora_Contributor_Documentatio...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>en-US</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Contributor_Documentation.xml"/>
@@@ -39,7 -39,7 +55,11 @@@
<entry>
<title>Fedora Core</title>
<
id>http://docs.fedoraproject.org/en-US/Fedora_Core/opds-Fedora_Core.xm...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>en-US</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Core.xml"/>
@@@ -47,7 -47,7 +67,11 @@@
<entry>
<title>Fedora Draft Documentation</title>
<
id>http://docs.fedoraproject.org/en-US/Fedora_Draft_Documentation/opds...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>en-US</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Draft_Documentation.xml"/>
diff --cc public_html/es-ES/opds-Community_Services_Infrastructure.xml
index 625ee0c,df27712..8316382
--- a/public_html/es-ES/opds-Community_Services_Infrastructure.xml
+++ b/public_html/es-ES/opds-Community_Services_Infrastructure.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/es-ES/opds-Community_Services_Infrast...
<title>Community Services Infrastructure</title>
<subtitle>Community Services Infrastructure</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/es-ES/opds-Fedora.xml
index 81eb1eb,c7e563a..ad797e9
--- a/public_html/es-ES/opds-Fedora.xml
+++ b/public_html/es-ES/opds-Fedora.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/es-ES/opds-Fedora.xml</id>
<title>Fedora</title>
<subtitle>Fedora</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/es-ES/opds-Fedora_15.xml
index 855e5f9,5444845..39241a8
--- a/public_html/es-ES/opds-Fedora_15.xml
+++ b/public_html/es-ES/opds-Fedora_15.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/es-ES/opds-Fedora_15.xml</id>
<title>Fedora 15</title>
<subtitle>Fedora 15</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/es-ES/opds-Fedora_Contributor_Documentation.xml
index 11eeaf8,5649a31..4a2bab7
--- a/public_html/es-ES/opds-Fedora_Contributor_Documentation.xml
+++ b/public_html/es-ES/opds-Fedora_Contributor_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/es-ES/opds-Fedora_Contributor_Documen...
<title>Fedora Documentación de Contribuyente</title>
<subtitle>Fedora Documentación de Contribuyente</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/es-ES/opds-Fedora_Core.xml
index 2c81b13,7af87bb..f9ac9d1
--- a/public_html/es-ES/opds-Fedora_Core.xml
+++ b/public_html/es-ES/opds-Fedora_Core.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/es-ES/opds-Fedora_Core.xml</id>
<title>Fedora Core</title>
<subtitle>Fedora Core</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/es-ES/opds-Fedora_Draft_Documentation.xml
index ca4f522,4a00e7b..d269744
--- a/public_html/es-ES/opds-Fedora_Draft_Documentation.xml
+++ b/public_html/es-ES/opds-Fedora_Draft_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/es-ES/opds-Fedora_Draft_Documentation...
<title>Fedora Draft Documentation</title>
<subtitle>Fedora Draft Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/es-ES/opds.xml
index 30f7ac3,032d350..fb1614d
--- a/public_html/es-ES/opds.xml
+++ b/public_html/es-ES/opds.xml
@@@ -6,7 -6,7 +6,11 @@@
<link
rel="http://opds-spec.org/crawlable"
type="application/atom+xml"
href="http://bookserver.archive.org/catalog/crawlable" title="Crawlable
feed"/>
<
id>http://docs.fedoraproject.org/es-ES/opds.xml</id>
<title>Product List</title>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
@@@ -15,7 -15,7 +19,11 @@@
<entry>
<title>Community Services Infrastructure</title>
<
id>http://docs.fedoraproject.org/es-ES/Community_Services_Infrastructu...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>es-ES</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Community_Services_Infrastructure.xml"/>
@@@ -23,7 -23,7 +31,11 @@@
<entry>
<title>Fedora</title>
<
id>http://docs.fedoraproject.org/es-ES/Fedora/opds-Fedora.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>es-ES</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora.xml"/>
@@@ -31,7 -31,7 +43,11 @@@
<entry>
<title>Fedora 15</title>
<
id>http://docs.fedoraproject.org/es-ES/Fedora_15/opds-Fedora_15.xml<...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>es-ES</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_15.xml"/>
@@@ -39,7 -39,7 +55,11 @@@
<entry>
<title>Fedora Documentación de Contribuyente</title>
<
id>http://docs.fedoraproject.org/es-ES/Fedora_Contributor_Documentatio...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>es-ES</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Contributor_Documentation.xml"/>
@@@ -47,7 -47,7 +67,11 @@@
<entry>
<title>Fedora Core</title>
<
id>http://docs.fedoraproject.org/es-ES/Fedora_Core/opds-Fedora_Core.xm...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>es-ES</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Core.xml"/>
@@@ -55,7 -55,7 +79,11 @@@
<entry>
<title>Fedora Draft Documentation</title>
<
id>http://docs.fedoraproject.org/es-ES/Fedora_Draft_Documentation/opds...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>es-ES</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Draft_Documentation.xml"/>
diff --cc public_html/fa-IR/opds-Community_Services_Infrastructure.xml
index 12aaec7,237260b..e7ea7d2
--- a/public_html/fa-IR/opds-Community_Services_Infrastructure.xml
+++ b/public_html/fa-IR/opds-Community_Services_Infrastructure.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/fa-IR/opds-Community_Services_Infrast...
<title>Community Services Infrastructure</title>
<subtitle>Community Services Infrastructure</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/fa-IR/opds-Fedora.xml
index 9217d07,426c08b..f04e6c1
--- a/public_html/fa-IR/opds-Fedora.xml
+++ b/public_html/fa-IR/opds-Fedora.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/fa-IR/opds-Fedora.xml</id>
<title>Fedora</title>
<subtitle>Fedora</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/fa-IR/opds-Fedora_Contributor_Documentation.xml
index 6f9738a,dabf619..8a3d946
--- a/public_html/fa-IR/opds-Fedora_Contributor_Documentation.xml
+++ b/public_html/fa-IR/opds-Fedora_Contributor_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/fa-IR/opds-Fedora_Contributor_Documen...
<title>مستندات مشارکت کننده فدورا</title>
<subtitle>مستندات مشارکت کننده فدورا</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/fa-IR/opds-Fedora_Core.xml
index 47ed4f6,96833f2..3f9f833
--- a/public_html/fa-IR/opds-Fedora_Core.xml
+++ b/public_html/fa-IR/opds-Fedora_Core.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/fa-IR/opds-Fedora_Core.xml</id>
<title>Fedora Core</title>
<subtitle>Fedora Core</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/fa-IR/opds-Fedora_Draft_Documentation.xml
index a6ecf4b,5b98101..6ed2a63
--- a/public_html/fa-IR/opds-Fedora_Draft_Documentation.xml
+++ b/public_html/fa-IR/opds-Fedora_Draft_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/fa-IR/opds-Fedora_Draft_Documentation...
<title>Fedora Draft Documentation</title>
<subtitle>Fedora Draft Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/fa-IR/opds.xml
index 8ef62a6,56fd4ea..5614a56
--- a/public_html/fa-IR/opds.xml
+++ b/public_html/fa-IR/opds.xml
@@@ -6,7 -6,7 +6,11 @@@
<link
rel="http://opds-spec.org/crawlable"
type="application/atom+xml"
href="http://bookserver.archive.org/catalog/crawlable" title="Crawlable
feed"/>
<
id>http://docs.fedoraproject.org/fa-IR/opds.xml</id>
<title>Product List</title>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
@@@ -15,7 -15,7 +19,11 @@@
<entry>
<title>Community Services Infrastructure</title>
<
id>http://docs.fedoraproject.org/fa-IR/Community_Services_Infrastructu...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>fa-IR</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Community_Services_Infrastructure.xml"/>
@@@ -23,7 -23,7 +31,11 @@@
<entry>
<title>Fedora</title>
<
id>http://docs.fedoraproject.org/fa-IR/Fedora/opds-Fedora.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>fa-IR</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora.xml"/>
@@@ -31,7 -31,7 +43,11 @@@
<entry>
<title>مستندات مشارکت کننده فدورا</title>
<
id>http://docs.fedoraproject.org/fa-IR/Fedora_Contributor_Documentatio...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>fa-IR</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Contributor_Documentation.xml"/>
@@@ -39,7 -39,7 +55,11 @@@
<entry>
<title>Fedora Core</title>
<
id>http://docs.fedoraproject.org/fa-IR/Fedora_Core/opds-Fedora_Core.xm...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>fa-IR</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Core.xml"/>
@@@ -47,7 -47,7 +67,11 @@@
<entry>
<title>Fedora Draft Documentation</title>
<
id>http://docs.fedoraproject.org/fa-IR/Fedora_Draft_Documentation/opds...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>fa-IR</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Draft_Documentation.xml"/>
diff --cc public_html/fi-FI/opds-Community_Services_Infrastructure.xml
index 1651a92,612f214..f13444d
--- a/public_html/fi-FI/opds-Community_Services_Infrastructure.xml
+++ b/public_html/fi-FI/opds-Community_Services_Infrastructure.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/fi-FI/opds-Community_Services_Infrast...
<title>Community Services Infrastructure</title>
<subtitle>Community Services Infrastructure</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/fi-FI/opds-Fedora.xml
index 6000172,0771d22..5c84c9f
--- a/public_html/fi-FI/opds-Fedora.xml
+++ b/public_html/fi-FI/opds-Fedora.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/fi-FI/opds-Fedora.xml</id>
<title>Fedora</title>
<subtitle>Fedora</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/fi-FI/opds-Fedora_Contributor_Documentation.xml
index ea78042,7c3326f..7fd4b14
--- a/public_html/fi-FI/opds-Fedora_Contributor_Documentation.xml
+++ b/public_html/fi-FI/opds-Fedora_Contributor_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/fi-FI/opds-Fedora_Contributor_Documen...
<title>Fedora Contributor Documentation</title>
<subtitle>Fedora Contributor Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/fi-FI/opds-Fedora_Core.xml
index 19f00a4,39e3b1c..9ae4db1
--- a/public_html/fi-FI/opds-Fedora_Core.xml
+++ b/public_html/fi-FI/opds-Fedora_Core.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/fi-FI/opds-Fedora_Core.xml</id>
<title>Fedora Core</title>
<subtitle>Fedora Core</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/fi-FI/opds-Fedora_Draft_Documentation.xml
index 2462c09,d601e32..ab21e86
--- a/public_html/fi-FI/opds-Fedora_Draft_Documentation.xml
+++ b/public_html/fi-FI/opds-Fedora_Draft_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/fi-FI/opds-Fedora_Draft_Documentation...
<title>Fedora Draft Documentation</title>
<subtitle>Fedora Draft Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/fi-FI/opds.xml
index 818b8db,1745884..98de6f1
--- a/public_html/fi-FI/opds.xml
+++ b/public_html/fi-FI/opds.xml
@@@ -6,7 -6,7 +6,11 @@@
<link
rel="http://opds-spec.org/crawlable"
type="application/atom+xml"
href="http://bookserver.archive.org/catalog/crawlable" title="Crawlable
feed"/>
<
id>http://docs.fedoraproject.org/fi-FI/opds.xml</id>
<title>Product List</title>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
@@@ -15,7 -15,7 +19,11 @@@
<entry>
<title>Community Services Infrastructure</title>
<
id>http://docs.fedoraproject.org/fi-FI/Community_Services_Infrastructu...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>fi-FI</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Community_Services_Infrastructure.xml"/>
@@@ -23,7 -23,7 +31,11 @@@
<entry>
<title>Fedora</title>
<
id>http://docs.fedoraproject.org/fi-FI/Fedora/opds-Fedora.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>fi-FI</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora.xml"/>
@@@ -31,7 -31,7 +43,11 @@@
<entry>
<title>Fedora Contributor Documentation</title>
<
id>http://docs.fedoraproject.org/fi-FI/Fedora_Contributor_Documentatio...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>fi-FI</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Contributor_Documentation.xml"/>
@@@ -39,7 -39,7 +55,11 @@@
<entry>
<title>Fedora Core</title>
<
id>http://docs.fedoraproject.org/fi-FI/Fedora_Core/opds-Fedora_Core.xm...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>fi-FI</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Core.xml"/>
@@@ -47,7 -47,7 +67,11 @@@
<entry>
<title>Fedora Draft Documentation</title>
<
id>http://docs.fedoraproject.org/fi-FI/Fedora_Draft_Documentation/opds...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>fi-FI</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Draft_Documentation.xml"/>
diff --cc public_html/fr-FR/opds-Community_Services_Infrastructure.xml
index 1b1c57e,3ec94d7..85fb6cd
--- a/public_html/fr-FR/opds-Community_Services_Infrastructure.xml
+++ b/public_html/fr-FR/opds-Community_Services_Infrastructure.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/fr-FR/opds-Community_Services_Infrast...
<title>Community Services Infrastructure</title>
<subtitle>Community Services Infrastructure</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/fr-FR/opds-Fedora.xml
index 4a5de00,ca2ba63..40ee098
--- a/public_html/fr-FR/opds-Fedora.xml
+++ b/public_html/fr-FR/opds-Fedora.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/fr-FR/opds-Fedora.xml</id>
<title>Fedora</title>
<subtitle>Fedora</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/fr-FR/opds-Fedora_Contributor_Documentation.xml
index 5dc3973,95b2ba1..0ed3881
--- a/public_html/fr-FR/opds-Fedora_Contributor_Documentation.xml
+++ b/public_html/fr-FR/opds-Fedora_Contributor_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/fr-FR/opds-Fedora_Contributor_Documen...
<title>Fedora Contributor Documentation</title>
<subtitle>Fedora Contributor Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/fr-FR/opds-Fedora_Core.xml
index 86b2005,a8cd4b8..c6c345b
--- a/public_html/fr-FR/opds-Fedora_Core.xml
+++ b/public_html/fr-FR/opds-Fedora_Core.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/fr-FR/opds-Fedora_Core.xml</id>
<title>Fedora Core</title>
<subtitle>Fedora Core</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/fr-FR/opds-Fedora_Draft_Documentation.xml
index afb8845,6640aea..272f92a
--- a/public_html/fr-FR/opds-Fedora_Draft_Documentation.xml
+++ b/public_html/fr-FR/opds-Fedora_Draft_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/fr-FR/opds-Fedora_Draft_Documentation...
<title>Fedora Draft Documentation</title>
<subtitle>Fedora Draft Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/fr-FR/opds.xml
index fc57878,6cf607a..1f7062f
--- a/public_html/fr-FR/opds.xml
+++ b/public_html/fr-FR/opds.xml
@@@ -6,7 -6,7 +6,11 @@@
<link
rel="http://opds-spec.org/crawlable"
type="application/atom+xml"
href="http://bookserver.archive.org/catalog/crawlable" title="Crawlable
feed"/>
<
id>http://docs.fedoraproject.org/fr-FR/opds.xml</id>
<title>Product List</title>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
@@@ -15,7 -15,7 +19,11 @@@
<entry>
<title>Community Services Infrastructure</title>
<
id>http://docs.fedoraproject.org/fr-FR/Community_Services_Infrastructu...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>fr-FR</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Community_Services_Infrastructure.xml"/>
@@@ -23,7 -23,7 +31,11 @@@
<entry>
<title>Fedora</title>
<
id>http://docs.fedoraproject.org/fr-FR/Fedora/opds-Fedora.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>fr-FR</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora.xml"/>
@@@ -31,7 -31,7 +43,11 @@@
<entry>
<title>Fedora Contributor Documentation</title>
<
id>http://docs.fedoraproject.org/fr-FR/Fedora_Contributor_Documentatio...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>fr-FR</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Contributor_Documentation.xml"/>
@@@ -39,7 -39,7 +55,11 @@@
<entry>
<title>Fedora Core</title>
<
id>http://docs.fedoraproject.org/fr-FR/Fedora_Core/opds-Fedora_Core.xm...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>fr-FR</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Core.xml"/>
@@@ -47,7 -47,7 +67,11 @@@
<entry>
<title>Fedora Draft Documentation</title>
<
id>http://docs.fedoraproject.org/fr-FR/Fedora_Draft_Documentation/opds...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>fr-FR</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Draft_Documentation.xml"/>
diff --cc public_html/gu-IN/opds-Community_Services_Infrastructure.xml
index cc7ba89,fa8a8c7..12be015
--- a/public_html/gu-IN/opds-Community_Services_Infrastructure.xml
+++ b/public_html/gu-IN/opds-Community_Services_Infrastructure.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/gu-IN/opds-Community_Services_Infrast...
<title>Community Services Infrastructure</title>
<subtitle>Community Services Infrastructure</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/gu-IN/opds-Fedora.xml
index 8f52d64,086061e..db6ed58
--- a/public_html/gu-IN/opds-Fedora.xml
+++ b/public_html/gu-IN/opds-Fedora.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/gu-IN/opds-Fedora.xml</id>
<title>Fedora</title>
<subtitle>Fedora</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/gu-IN/opds-Fedora_Contributor_Documentation.xml
index f0f83a3,6603202..9c7d682
--- a/public_html/gu-IN/opds-Fedora_Contributor_Documentation.xml
+++ b/public_html/gu-IN/opds-Fedora_Contributor_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/gu-IN/opds-Fedora_Contributor_Documen...
<title>Fedora Contributor Documentation</title>
<subtitle>Fedora Contributor Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/gu-IN/opds-Fedora_Core.xml
index 1c4f5c1,c8a3e45..1d7bfbe
--- a/public_html/gu-IN/opds-Fedora_Core.xml
+++ b/public_html/gu-IN/opds-Fedora_Core.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/gu-IN/opds-Fedora_Core.xml</id>
<title>Fedora Core</title>
<subtitle>Fedora Core</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/gu-IN/opds-Fedora_Draft_Documentation.xml
index e4560a7,c29a362..d61c074
--- a/public_html/gu-IN/opds-Fedora_Draft_Documentation.xml
+++ b/public_html/gu-IN/opds-Fedora_Draft_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/gu-IN/opds-Fedora_Draft_Documentation...
<title>Fedora Draft Documentation</title>
<subtitle>Fedora Draft Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/gu-IN/opds.xml
index 50a69c1,5669e05..72cb8b9
--- a/public_html/gu-IN/opds.xml
+++ b/public_html/gu-IN/opds.xml
@@@ -6,7 -6,7 +6,11 @@@
<link
rel="http://opds-spec.org/crawlable"
type="application/atom+xml"
href="http://bookserver.archive.org/catalog/crawlable" title="Crawlable
feed"/>
<
id>http://docs.fedoraproject.org/gu-IN/opds.xml</id>
<title>Product List</title>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
@@@ -15,7 -15,7 +19,11 @@@
<entry>
<title>Community Services Infrastructure</title>
<
id>http://docs.fedoraproject.org/gu-IN/Community_Services_Infrastructu...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>gu-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Community_Services_Infrastructure.xml"/>
@@@ -23,7 -23,7 +31,11 @@@
<entry>
<title>Fedora</title>
<
id>http://docs.fedoraproject.org/gu-IN/Fedora/opds-Fedora.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>gu-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora.xml"/>
@@@ -31,7 -31,7 +43,11 @@@
<entry>
<title>Fedora Contributor Documentation</title>
<
id>http://docs.fedoraproject.org/gu-IN/Fedora_Contributor_Documentatio...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>gu-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Contributor_Documentation.xml"/>
@@@ -39,7 -39,7 +55,11 @@@
<entry>
<title>Fedora Core</title>
<
id>http://docs.fedoraproject.org/gu-IN/Fedora_Core/opds-Fedora_Core.xm...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>gu-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Core.xml"/>
@@@ -47,7 -47,7 +67,11 @@@
<entry>
<title>Fedora Draft Documentation</title>
<
id>http://docs.fedoraproject.org/gu-IN/Fedora_Draft_Documentation/opds...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>gu-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Draft_Documentation.xml"/>
diff --cc public_html/he-IL/opds-Community_Services_Infrastructure.xml
index 991e127,60683aa..cbfcdc0
--- a/public_html/he-IL/opds-Community_Services_Infrastructure.xml
+++ b/public_html/he-IL/opds-Community_Services_Infrastructure.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/he-IL/opds-Community_Services_Infrast...
<title>Community Services Infrastructure</title>
<subtitle>Community Services Infrastructure</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/he-IL/opds-Fedora.xml
index 304e0da,f17206d..427d5df
--- a/public_html/he-IL/opds-Fedora.xml
+++ b/public_html/he-IL/opds-Fedora.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/he-IL/opds-Fedora.xml</id>
<title>Fedora</title>
<subtitle>Fedora</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/he-IL/opds-Fedora_Contributor_Documentation.xml
index a63249f,aa1a367..1441384
--- a/public_html/he-IL/opds-Fedora_Contributor_Documentation.xml
+++ b/public_html/he-IL/opds-Fedora_Contributor_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/he-IL/opds-Fedora_Contributor_Documen...
<title>Fedora Contributor Documentation</title>
<subtitle>Fedora Contributor Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/he-IL/opds-Fedora_Core.xml
index e818c71,ecbb32c..9fdada4
--- a/public_html/he-IL/opds-Fedora_Core.xml
+++ b/public_html/he-IL/opds-Fedora_Core.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/he-IL/opds-Fedora_Core.xml</id>
<title>Fedora Core</title>
<subtitle>Fedora Core</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/he-IL/opds-Fedora_Draft_Documentation.xml
index b028124,6946e19..65a90ef
--- a/public_html/he-IL/opds-Fedora_Draft_Documentation.xml
+++ b/public_html/he-IL/opds-Fedora_Draft_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/he-IL/opds-Fedora_Draft_Documentation...
<title>Fedora Draft Documentation</title>
<subtitle>Fedora Draft Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/he-IL/opds.xml
index 9ef8ee1,a08989d..a472479
--- a/public_html/he-IL/opds.xml
+++ b/public_html/he-IL/opds.xml
@@@ -6,7 -6,7 +6,11 @@@
<link
rel="http://opds-spec.org/crawlable"
type="application/atom+xml"
href="http://bookserver.archive.org/catalog/crawlable" title="Crawlable
feed"/>
<
id>http://docs.fedoraproject.org/he-IL/opds.xml</id>
<title>Product List</title>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
@@@ -15,7 -15,7 +19,11 @@@
<entry>
<title>Community Services Infrastructure</title>
<
id>http://docs.fedoraproject.org/he-IL/Community_Services_Infrastructu...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>he-IL</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Community_Services_Infrastructure.xml"/>
@@@ -23,7 -23,7 +31,11 @@@
<entry>
<title>Fedora</title>
<
id>http://docs.fedoraproject.org/he-IL/Fedora/opds-Fedora.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>he-IL</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora.xml"/>
@@@ -31,7 -31,7 +43,11 @@@
<entry>
<title>Fedora Contributor Documentation</title>
<
id>http://docs.fedoraproject.org/he-IL/Fedora_Contributor_Documentatio...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>he-IL</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Contributor_Documentation.xml"/>
@@@ -39,7 -39,7 +55,11 @@@
<entry>
<title>Fedora Core</title>
<
id>http://docs.fedoraproject.org/he-IL/Fedora_Core/opds-Fedora_Core.xm...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>he-IL</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Core.xml"/>
@@@ -47,7 -47,7 +67,11 @@@
<entry>
<title>Fedora Draft Documentation</title>
<
id>http://docs.fedoraproject.org/he-IL/Fedora_Draft_Documentation/opds...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>he-IL</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Draft_Documentation.xml"/>
diff --cc public_html/hi-IN/opds-Community_Services_Infrastructure.xml
index a3a43aa,8d9e868..208a76e
--- a/public_html/hi-IN/opds-Community_Services_Infrastructure.xml
+++ b/public_html/hi-IN/opds-Community_Services_Infrastructure.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/hi-IN/opds-Community_Services_Infrast...
<title>Community Services Infrastructure</title>
<subtitle>Community Services Infrastructure</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/hi-IN/opds-Fedora.xml
index b3f87c8,0852bcc..62de4ca
--- a/public_html/hi-IN/opds-Fedora.xml
+++ b/public_html/hi-IN/opds-Fedora.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/hi-IN/opds-Fedora.xml</id>
<title>Fedora</title>
<subtitle>Fedora</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/hi-IN/opds-Fedora_Contributor_Documentation.xml
index 18b613d,0258348..0cc4386
--- a/public_html/hi-IN/opds-Fedora_Contributor_Documentation.xml
+++ b/public_html/hi-IN/opds-Fedora_Contributor_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/hi-IN/opds-Fedora_Contributor_Documen...
<title>Fedora Contributor Documentation</title>
<subtitle>Fedora Contributor Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/hi-IN/opds-Fedora_Core.xml
index 37b1623,ad6bff1..a1d39e0
--- a/public_html/hi-IN/opds-Fedora_Core.xml
+++ b/public_html/hi-IN/opds-Fedora_Core.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/hi-IN/opds-Fedora_Core.xml</id>
<title>Fedora Core</title>
<subtitle>Fedora Core</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/hi-IN/opds-Fedora_Draft_Documentation.xml
index 09fd9e6,7a35e15..fe14d48
--- a/public_html/hi-IN/opds-Fedora_Draft_Documentation.xml
+++ b/public_html/hi-IN/opds-Fedora_Draft_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/hi-IN/opds-Fedora_Draft_Documentation...
<title>Fedora Draft Documentation</title>
<subtitle>Fedora Draft Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/hi-IN/opds.xml
index 8e9de92,46c5eb5..a9b8617
--- a/public_html/hi-IN/opds.xml
+++ b/public_html/hi-IN/opds.xml
@@@ -6,7 -6,7 +6,11 @@@
<link
rel="http://opds-spec.org/crawlable"
type="application/atom+xml"
href="http://bookserver.archive.org/catalog/crawlable" title="Crawlable
feed"/>
<
id>http://docs.fedoraproject.org/hi-IN/opds.xml</id>
<title>Product List</title>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
@@@ -15,7 -15,7 +19,11 @@@
<entry>
<title>Community Services Infrastructure</title>
<
id>http://docs.fedoraproject.org/hi-IN/Community_Services_Infrastructu...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>hi-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Community_Services_Infrastructure.xml"/>
@@@ -23,7 -23,7 +31,11 @@@
<entry>
<title>Fedora</title>
<
id>http://docs.fedoraproject.org/hi-IN/Fedora/opds-Fedora.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>hi-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora.xml"/>
@@@ -31,7 -31,7 +43,11 @@@
<entry>
<title>Fedora Contributor Documentation</title>
<
id>http://docs.fedoraproject.org/hi-IN/Fedora_Contributor_Documentatio...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>hi-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Contributor_Documentation.xml"/>
@@@ -39,7 -39,7 +55,11 @@@
<entry>
<title>Fedora Core</title>
<
id>http://docs.fedoraproject.org/hi-IN/Fedora_Core/opds-Fedora_Core.xm...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>hi-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Core.xml"/>
@@@ -47,7 -47,7 +67,11 @@@
<entry>
<title>Fedora Draft Documentation</title>
<
id>http://docs.fedoraproject.org/hi-IN/Fedora_Draft_Documentation/opds...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>hi-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Draft_Documentation.xml"/>
diff --cc public_html/hu-HU/opds-Community_Services_Infrastructure.xml
index 111344b,f9b6cfe..684a6a6
--- a/public_html/hu-HU/opds-Community_Services_Infrastructure.xml
+++ b/public_html/hu-HU/opds-Community_Services_Infrastructure.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/hu-HU/opds-Community_Services_Infrast...
<title>Community Services Infrastructure</title>
<subtitle>Community Services Infrastructure</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/hu-HU/opds-Fedora.xml
index 4851dcc,44b3b2b..e176e7d
--- a/public_html/hu-HU/opds-Fedora.xml
+++ b/public_html/hu-HU/opds-Fedora.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/hu-HU/opds-Fedora.xml</id>
<title>Fedora</title>
<subtitle>Fedora</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/hu-HU/opds-Fedora_Contributor_Documentation.xml
index ad04fce,61f9a2b..458aaa5
--- a/public_html/hu-HU/opds-Fedora_Contributor_Documentation.xml
+++ b/public_html/hu-HU/opds-Fedora_Contributor_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/hu-HU/opds-Fedora_Contributor_Documen...
<title>Fedora Contributor Documentation</title>
<subtitle>Fedora Contributor Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/hu-HU/opds-Fedora_Core.xml
index bd66ea1,264ea6c..6d857d7
--- a/public_html/hu-HU/opds-Fedora_Core.xml
+++ b/public_html/hu-HU/opds-Fedora_Core.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/hu-HU/opds-Fedora_Core.xml</id>
<title>Fedora Core</title>
<subtitle>Fedora Core</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/hu-HU/opds-Fedora_Draft_Documentation.xml
index 4ee11b1,2fe482b..1067f9a
--- a/public_html/hu-HU/opds-Fedora_Draft_Documentation.xml
+++ b/public_html/hu-HU/opds-Fedora_Draft_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/hu-HU/opds-Fedora_Draft_Documentation...
<title>Fedora Draft Documentation</title>
<subtitle>Fedora Draft Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/hu-HU/opds.xml
index 91afccf,a72442e..e9183a2
--- a/public_html/hu-HU/opds.xml
+++ b/public_html/hu-HU/opds.xml
@@@ -6,7 -6,7 +6,11 @@@
<link
rel="http://opds-spec.org/crawlable"
type="application/atom+xml"
href="http://bookserver.archive.org/catalog/crawlable" title="Crawlable
feed"/>
<
id>http://docs.fedoraproject.org/hu-HU/opds.xml</id>
<title>Product List</title>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
@@@ -15,7 -15,7 +19,11 @@@
<entry>
<title>Community Services Infrastructure</title>
<
id>http://docs.fedoraproject.org/hu-HU/Community_Services_Infrastructu...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>hu-HU</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Community_Services_Infrastructure.xml"/>
@@@ -23,7 -23,7 +31,11 @@@
<entry>
<title>Fedora</title>
<
id>http://docs.fedoraproject.org/hu-HU/Fedora/opds-Fedora.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>hu-HU</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora.xml"/>
@@@ -31,7 -31,7 +43,11 @@@
<entry>
<title>Fedora Contributor Documentation</title>
<
id>http://docs.fedoraproject.org/hu-HU/Fedora_Contributor_Documentatio...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>hu-HU</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Contributor_Documentation.xml"/>
@@@ -39,7 -39,7 +55,11 @@@
<entry>
<title>Fedora Core</title>
<
id>http://docs.fedoraproject.org/hu-HU/Fedora_Core/opds-Fedora_Core.xm...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>hu-HU</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Core.xml"/>
@@@ -47,7 -47,7 +67,11 @@@
<entry>
<title>Fedora Draft Documentation</title>
<
id>http://docs.fedoraproject.org/hu-HU/Fedora_Draft_Documentation/opds...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>hu-HU</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Draft_Documentation.xml"/>
diff --cc public_html/id-ID/opds-Community_Services_Infrastructure.xml
index 304eb65,393ef8d..d8f789b
--- a/public_html/id-ID/opds-Community_Services_Infrastructure.xml
+++ b/public_html/id-ID/opds-Community_Services_Infrastructure.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/id-ID/opds-Community_Services_Infrast...
<title>Community Services Infrastructure</title>
<subtitle>Community Services Infrastructure</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/id-ID/opds-Fedora.xml
index e820329,b817e7b..b3c1a78
--- a/public_html/id-ID/opds-Fedora.xml
+++ b/public_html/id-ID/opds-Fedora.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/id-ID/opds-Fedora.xml</id>
<title>Fedora</title>
<subtitle>Fedora</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/id-ID/opds-Fedora_Contributor_Documentation.xml
index 1f562fb,72c04b7..1fc4b3b
--- a/public_html/id-ID/opds-Fedora_Contributor_Documentation.xml
+++ b/public_html/id-ID/opds-Fedora_Contributor_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/id-ID/opds-Fedora_Contributor_Documen...
<title>Fedora Contributor Documentation</title>
<subtitle>Fedora Contributor Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/id-ID/opds-Fedora_Core.xml
index b80d77d,6cb0ef1..b319052
--- a/public_html/id-ID/opds-Fedora_Core.xml
+++ b/public_html/id-ID/opds-Fedora_Core.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/id-ID/opds-Fedora_Core.xml</id>
<title>Fedora Core</title>
<subtitle>Fedora Core</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/id-ID/opds-Fedora_Draft_Documentation.xml
index cd5ee3d,5e56490..c0b80ce
--- a/public_html/id-ID/opds-Fedora_Draft_Documentation.xml
+++ b/public_html/id-ID/opds-Fedora_Draft_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/id-ID/opds-Fedora_Draft_Documentation...
<title>Fedora Draft Documentation</title>
<subtitle>Fedora Draft Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/id-ID/opds.xml
index fab9138,ef4baa9..c05d0d7
--- a/public_html/id-ID/opds.xml
+++ b/public_html/id-ID/opds.xml
@@@ -6,7 -6,7 +6,11 @@@
<link
rel="http://opds-spec.org/crawlable"
type="application/atom+xml"
href="http://bookserver.archive.org/catalog/crawlable" title="Crawlable
feed"/>
<
id>http://docs.fedoraproject.org/id-ID/opds.xml</id>
<title>Product List</title>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
@@@ -15,7 -15,7 +19,11 @@@
<entry>
<title>Community Services Infrastructure</title>
<
id>http://docs.fedoraproject.org/id-ID/Community_Services_Infrastructu...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>id-ID</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Community_Services_Infrastructure.xml"/>
@@@ -23,7 -23,7 +31,11 @@@
<entry>
<title>Fedora</title>
<
id>http://docs.fedoraproject.org/id-ID/Fedora/opds-Fedora.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>id-ID</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora.xml"/>
@@@ -31,7 -31,7 +43,11 @@@
<entry>
<title>Fedora Contributor Documentation</title>
<
id>http://docs.fedoraproject.org/id-ID/Fedora_Contributor_Documentatio...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>id-ID</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Contributor_Documentation.xml"/>
@@@ -39,7 -39,7 +55,11 @@@
<entry>
<title>Fedora Core</title>
<
id>http://docs.fedoraproject.org/id-ID/Fedora_Core/opds-Fedora_Core.xm...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>id-ID</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Core.xml"/>
@@@ -47,7 -47,7 +67,11 @@@
<entry>
<title>Fedora Draft Documentation</title>
<
id>http://docs.fedoraproject.org/id-ID/Fedora_Draft_Documentation/opds...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>id-ID</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Draft_Documentation.xml"/>
diff --cc public_html/it-IT/opds-Community_Services_Infrastructure.xml
index 7cf98fb,fe6afd4..b32e677
--- a/public_html/it-IT/opds-Community_Services_Infrastructure.xml
+++ b/public_html/it-IT/opds-Community_Services_Infrastructure.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/it-IT/opds-Community_Services_Infrast...
<title>Community Services Infrastructure</title>
<subtitle>Community Services Infrastructure</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/it-IT/opds-Fedora.xml
index 5e7c078,6bfec6e..b32abdb
--- a/public_html/it-IT/opds-Fedora.xml
+++ b/public_html/it-IT/opds-Fedora.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/it-IT/opds-Fedora.xml</id>
<title>Fedora</title>
<subtitle>Fedora</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/it-IT/opds-Fedora_Contributor_Documentation.xml
index 59180fa,444147a..7676937
--- a/public_html/it-IT/opds-Fedora_Contributor_Documentation.xml
+++ b/public_html/it-IT/opds-Fedora_Contributor_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/it-IT/opds-Fedora_Contributor_Documen...
<title>Documentazione Collaboratori Fedora</title>
<subtitle>Documentazione Collaboratori Fedora</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/it-IT/opds-Fedora_Core.xml
index b01e787,973a1eb..6e37106
--- a/public_html/it-IT/opds-Fedora_Core.xml
+++ b/public_html/it-IT/opds-Fedora_Core.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/it-IT/opds-Fedora_Core.xml</id>
<title>Fedora Core</title>
<subtitle>Fedora Core</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/it-IT/opds-Fedora_Draft_Documentation.xml
index 30b80af,cedad03..190019e
--- a/public_html/it-IT/opds-Fedora_Draft_Documentation.xml
+++ b/public_html/it-IT/opds-Fedora_Draft_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/it-IT/opds-Fedora_Draft_Documentation...
<title>Fedora Draft Documentation</title>
<subtitle>Fedora Draft Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/it-IT/opds.xml
index 91241b8,1232527..8dc015b
--- a/public_html/it-IT/opds.xml
+++ b/public_html/it-IT/opds.xml
@@@ -6,7 -6,7 +6,11 @@@
<link
rel="http://opds-spec.org/crawlable"
type="application/atom+xml"
href="http://bookserver.archive.org/catalog/crawlable" title="Crawlable
feed"/>
<
id>http://docs.fedoraproject.org/it-IT/opds.xml</id>
<title>Product List</title>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
@@@ -15,7 -15,7 +19,11 @@@
<entry>
<title>Community Services Infrastructure</title>
<
id>http://docs.fedoraproject.org/it-IT/Community_Services_Infrastructu...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>it-IT</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Community_Services_Infrastructure.xml"/>
@@@ -23,7 -23,7 +31,11 @@@
<entry>
<title>Fedora</title>
<
id>http://docs.fedoraproject.org/it-IT/Fedora/opds-Fedora.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>it-IT</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora.xml"/>
@@@ -31,7 -31,7 +43,11 @@@
<entry>
<title>Documentazione Collaboratori Fedora</title>
<
id>http://docs.fedoraproject.org/it-IT/Fedora_Contributor_Documentatio...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>it-IT</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Contributor_Documentation.xml"/>
@@@ -39,7 -39,7 +55,11 @@@
<entry>
<title>Fedora Core</title>
<
id>http://docs.fedoraproject.org/it-IT/Fedora_Core/opds-Fedora_Core.xm...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>it-IT</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Core.xml"/>
@@@ -47,7 -47,7 +67,11 @@@
<entry>
<title>Fedora Draft Documentation</title>
<
id>http://docs.fedoraproject.org/it-IT/Fedora_Draft_Documentation/opds...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>it-IT</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Draft_Documentation.xml"/>
diff --cc public_html/ja-JP/opds-Community_Services_Infrastructure.xml
index 50f94ef,2bc11b9..105c28a
--- a/public_html/ja-JP/opds-Community_Services_Infrastructure.xml
+++ b/public_html/ja-JP/opds-Community_Services_Infrastructure.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/ja-JP/opds-Community_Services_Infrast...
<title>Community Services Infrastructure</title>
<subtitle>Community Services Infrastructure</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/ja-JP/opds-Fedora.xml
index 58adc74,d43b513..4c0474c
--- a/public_html/ja-JP/opds-Fedora.xml
+++ b/public_html/ja-JP/opds-Fedora.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/ja-JP/opds-Fedora.xml</id>
<title>Fedora</title>
<subtitle>Fedora</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/ja-JP/opds-Fedora_Contributor_Documentation.xml
index ac39cfa,28a6542..220d9b1
--- a/public_html/ja-JP/opds-Fedora_Contributor_Documentation.xml
+++ b/public_html/ja-JP/opds-Fedora_Contributor_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/ja-JP/opds-Fedora_Contributor_Documen...
<title>Fedora コントリビュータ用ドキュメント</title>
<subtitle>Fedora コントリビュータ用ドキュメント</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/ja-JP/opds-Fedora_Core.xml
index 98be481,e5f8ed1..cf2bb55
--- a/public_html/ja-JP/opds-Fedora_Core.xml
+++ b/public_html/ja-JP/opds-Fedora_Core.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/ja-JP/opds-Fedora_Core.xml</id>
<title>Fedora Core</title>
<subtitle>Fedora Core</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/ja-JP/opds-Fedora_Draft_Documentation.xml
index 753ad2e,462b3dc..b647afb
--- a/public_html/ja-JP/opds-Fedora_Draft_Documentation.xml
+++ b/public_html/ja-JP/opds-Fedora_Draft_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/ja-JP/opds-Fedora_Draft_Documentation...
<title>Fedora Draft Documentation</title>
<subtitle>Fedora Draft Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/ja-JP/opds.xml
index 1d333f4,e22a71f..f909b86
--- a/public_html/ja-JP/opds.xml
+++ b/public_html/ja-JP/opds.xml
@@@ -6,7 -6,7 +6,11 @@@
<link
rel="http://opds-spec.org/crawlable"
type="application/atom+xml"
href="http://bookserver.archive.org/catalog/crawlable" title="Crawlable
feed"/>
<
id>http://docs.fedoraproject.org/ja-JP/opds.xml</id>
<title>Product List</title>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
@@@ -15,7 -15,7 +19,11 @@@
<entry>
<title>Community Services Infrastructure</title>
<
id>http://docs.fedoraproject.org/ja-JP/Community_Services_Infrastructu...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>ja-JP</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Community_Services_Infrastructure.xml"/>
@@@ -23,7 -23,7 +31,11 @@@
<entry>
<title>Fedora</title>
<
id>http://docs.fedoraproject.org/ja-JP/Fedora/opds-Fedora.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>ja-JP</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora.xml"/>
@@@ -31,7 -31,7 +43,11 @@@
<entry>
<title>Fedora コントリビュータ用ドキュメント</title>
<
id>http://docs.fedoraproject.org/ja-JP/Fedora_Contributor_Documentatio...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>ja-JP</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Contributor_Documentation.xml"/>
@@@ -39,7 -39,7 +55,11 @@@
<entry>
<title>Fedora Core</title>
<
id>http://docs.fedoraproject.org/ja-JP/Fedora_Core/opds-Fedora_Core.xm...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>ja-JP</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Core.xml"/>
@@@ -47,7 -47,7 +67,11 @@@
<entry>
<title>Fedora Draft Documentation</title>
<
id>http://docs.fedoraproject.org/ja-JP/Fedora_Draft_Documentation/opds...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>ja-JP</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Draft_Documentation.xml"/>
diff --cc public_html/kn-IN/opds-Community_Services_Infrastructure.xml
index a4f994c,8d4278f..4e22fc4
--- a/public_html/kn-IN/opds-Community_Services_Infrastructure.xml
+++ b/public_html/kn-IN/opds-Community_Services_Infrastructure.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/kn-IN/opds-Community_Services_Infrast...
<title>Community Services Infrastructure</title>
<subtitle>Community Services Infrastructure</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/kn-IN/opds-Fedora.xml
index 32ae78c,95180be..732eb35
--- a/public_html/kn-IN/opds-Fedora.xml
+++ b/public_html/kn-IN/opds-Fedora.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/kn-IN/opds-Fedora.xml</id>
<title>Fedora</title>
<subtitle>Fedora</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/kn-IN/opds-Fedora_Contributor_Documentation.xml
index e6b1ddc,9bbb3a1..25fe8ac
--- a/public_html/kn-IN/opds-Fedora_Contributor_Documentation.xml
+++ b/public_html/kn-IN/opds-Fedora_Contributor_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/kn-IN/opds-Fedora_Contributor_Documen...
<title>Fedora Contributor Documentation</title>
<subtitle>Fedora Contributor Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/kn-IN/opds-Fedora_Core.xml
index 56456db,78cb75b..8a7d5e8
--- a/public_html/kn-IN/opds-Fedora_Core.xml
+++ b/public_html/kn-IN/opds-Fedora_Core.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/kn-IN/opds-Fedora_Core.xml</id>
<title>Fedora Core</title>
<subtitle>Fedora Core</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/kn-IN/opds-Fedora_Draft_Documentation.xml
index 1f9f1cf,ac4d3d7..9228c60
--- a/public_html/kn-IN/opds-Fedora_Draft_Documentation.xml
+++ b/public_html/kn-IN/opds-Fedora_Draft_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/kn-IN/opds-Fedora_Draft_Documentation...
<title>Fedora Draft Documentation</title>
<subtitle>Fedora Draft Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/kn-IN/opds.xml
index e902e20,d0d0f35..5a3d0b0
--- a/public_html/kn-IN/opds.xml
+++ b/public_html/kn-IN/opds.xml
@@@ -6,7 -6,7 +6,11 @@@
<link
rel="http://opds-spec.org/crawlable"
type="application/atom+xml"
href="http://bookserver.archive.org/catalog/crawlable" title="Crawlable
feed"/>
<
id>http://docs.fedoraproject.org/kn-IN/opds.xml</id>
<title>Product List</title>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
@@@ -15,7 -15,7 +19,11 @@@
<entry>
<title>Community Services Infrastructure</title>
<
id>http://docs.fedoraproject.org/kn-IN/Community_Services_Infrastructu...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>kn-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Community_Services_Infrastructure.xml"/>
@@@ -23,7 -23,7 +31,11 @@@
<entry>
<title>Fedora</title>
<
id>http://docs.fedoraproject.org/kn-IN/Fedora/opds-Fedora.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>kn-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora.xml"/>
@@@ -31,7 -31,7 +43,11 @@@
<entry>
<title>Fedora Contributor Documentation</title>
<
id>http://docs.fedoraproject.org/kn-IN/Fedora_Contributor_Documentatio...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>kn-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Contributor_Documentation.xml"/>
@@@ -39,7 -39,7 +55,11 @@@
<entry>
<title>Fedora Core</title>
<
id>http://docs.fedoraproject.org/kn-IN/Fedora_Core/opds-Fedora_Core.xm...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>kn-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Core.xml"/>
@@@ -47,7 -47,7 +67,11 @@@
<entry>
<title>Fedora Draft Documentation</title>
<
id>http://docs.fedoraproject.org/kn-IN/Fedora_Draft_Documentation/opds...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>kn-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Draft_Documentation.xml"/>
diff --cc public_html/ko-KR/opds-Community_Services_Infrastructure.xml
index 740de83,26dbcfc..8384fa3
--- a/public_html/ko-KR/opds-Community_Services_Infrastructure.xml
+++ b/public_html/ko-KR/opds-Community_Services_Infrastructure.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/ko-KR/opds-Community_Services_Infrast...
<title>Community Services Infrastructure</title>
<subtitle>Community Services Infrastructure</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/ko-KR/opds-Fedora.xml
index d1dbec6,044262f..e7cd185
--- a/public_html/ko-KR/opds-Fedora.xml
+++ b/public_html/ko-KR/opds-Fedora.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/ko-KR/opds-Fedora.xml</id>
<title>Fedora</title>
<subtitle>Fedora</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/ko-KR/opds-Fedora_Contributor_Documentation.xml
index daf45c3,d094166..92a55e9
--- a/public_html/ko-KR/opds-Fedora_Contributor_Documentation.xml
+++ b/public_html/ko-KR/opds-Fedora_Contributor_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/ko-KR/opds-Fedora_Contributor_Documen...
<title>Fedora Contributor Documentation</title>
<subtitle>Fedora Contributor Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/ko-KR/opds-Fedora_Core.xml
index 43237d3,383d15e..b2e89a1
--- a/public_html/ko-KR/opds-Fedora_Core.xml
+++ b/public_html/ko-KR/opds-Fedora_Core.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/ko-KR/opds-Fedora_Core.xml</id>
<title>Fedora Core</title>
<subtitle>Fedora Core</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/ko-KR/opds-Fedora_Draft_Documentation.xml
index d9c05a7,c93e2b1..1d6b14f
--- a/public_html/ko-KR/opds-Fedora_Draft_Documentation.xml
+++ b/public_html/ko-KR/opds-Fedora_Draft_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/ko-KR/opds-Fedora_Draft_Documentation...
<title>Fedora Draft Documentation</title>
<subtitle>Fedora Draft Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/ko-KR/opds.xml
index 6e22188,521296d..a426bbd
--- a/public_html/ko-KR/opds.xml
+++ b/public_html/ko-KR/opds.xml
@@@ -6,7 -6,7 +6,11 @@@
<link
rel="http://opds-spec.org/crawlable"
type="application/atom+xml"
href="http://bookserver.archive.org/catalog/crawlable" title="Crawlable
feed"/>
<
id>http://docs.fedoraproject.org/ko-KR/opds.xml</id>
<title>Product List</title>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
@@@ -15,7 -15,7 +19,11 @@@
<entry>
<title>Community Services Infrastructure</title>
<
id>http://docs.fedoraproject.org/ko-KR/Community_Services_Infrastructu...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>ko-KR</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Community_Services_Infrastructure.xml"/>
@@@ -23,7 -23,7 +31,11 @@@
<entry>
<title>Fedora</title>
<
id>http://docs.fedoraproject.org/ko-KR/Fedora/opds-Fedora.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>ko-KR</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora.xml"/>
@@@ -31,7 -31,7 +43,11 @@@
<entry>
<title>Fedora Contributor Documentation</title>
<
id>http://docs.fedoraproject.org/ko-KR/Fedora_Contributor_Documentatio...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>ko-KR</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Contributor_Documentation.xml"/>
@@@ -39,7 -39,7 +55,11 @@@
<entry>
<title>Fedora Core</title>
<
id>http://docs.fedoraproject.org/ko-KR/Fedora_Core/opds-Fedora_Core.xm...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>ko-KR</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Core.xml"/>
@@@ -47,7 -47,7 +67,11 @@@
<entry>
<title>Fedora Draft Documentation</title>
<
id>http://docs.fedoraproject.org/ko-KR/Fedora_Draft_Documentation/opds...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>ko-KR</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Draft_Documentation.xml"/>
diff --cc public_html/ml-IN/opds-Community_Services_Infrastructure.xml
index 6a22b32,0082610..fd89101
--- a/public_html/ml-IN/opds-Community_Services_Infrastructure.xml
+++ b/public_html/ml-IN/opds-Community_Services_Infrastructure.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/ml-IN/opds-Community_Services_Infrast...
<title>Community Services Infrastructure</title>
<subtitle>Community Services Infrastructure</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/ml-IN/opds-Fedora.xml
index c2fa9b7,cfa1437..2404666
--- a/public_html/ml-IN/opds-Fedora.xml
+++ b/public_html/ml-IN/opds-Fedora.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/ml-IN/opds-Fedora.xml</id>
<title>Fedora</title>
<subtitle>Fedora</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/ml-IN/opds-Fedora_Contributor_Documentation.xml
index 17bd979,dbf1977..e7b1bcc
--- a/public_html/ml-IN/opds-Fedora_Contributor_Documentation.xml
+++ b/public_html/ml-IN/opds-Fedora_Contributor_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/ml-IN/opds-Fedora_Contributor_Documen...
<title>Fedora Contributor Documentation</title>
<subtitle>Fedora Contributor Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/ml-IN/opds-Fedora_Core.xml
index 92de1dc,7792a85..9803919
--- a/public_html/ml-IN/opds-Fedora_Core.xml
+++ b/public_html/ml-IN/opds-Fedora_Core.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/ml-IN/opds-Fedora_Core.xml</id>
<title>Fedora Core</title>
<subtitle>Fedora Core</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/ml-IN/opds-Fedora_Draft_Documentation.xml
index fce58bd,21785a9..d766168
--- a/public_html/ml-IN/opds-Fedora_Draft_Documentation.xml
+++ b/public_html/ml-IN/opds-Fedora_Draft_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/ml-IN/opds-Fedora_Draft_Documentation...
<title>Fedora Draft Documentation</title>
<subtitle>Fedora Draft Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/ml-IN/opds.xml
index 2364d74,83a816c..4361bd5
--- a/public_html/ml-IN/opds.xml
+++ b/public_html/ml-IN/opds.xml
@@@ -6,7 -6,7 +6,11 @@@
<link
rel="http://opds-spec.org/crawlable"
type="application/atom+xml"
href="http://bookserver.archive.org/catalog/crawlable" title="Crawlable
feed"/>
<
id>http://docs.fedoraproject.org/ml-IN/opds.xml</id>
<title>Product List</title>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
@@@ -15,7 -15,7 +19,11 @@@
<entry>
<title>Community Services Infrastructure</title>
<
id>http://docs.fedoraproject.org/ml-IN/Community_Services_Infrastructu...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>ml-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Community_Services_Infrastructure.xml"/>
@@@ -23,7 -23,7 +31,11 @@@
<entry>
<title>Fedora</title>
<
id>http://docs.fedoraproject.org/ml-IN/Fedora/opds-Fedora.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>ml-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora.xml"/>
@@@ -31,7 -31,7 +43,11 @@@
<entry>
<title>Fedora Contributor Documentation</title>
<
id>http://docs.fedoraproject.org/ml-IN/Fedora_Contributor_Documentatio...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>ml-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Contributor_Documentation.xml"/>
@@@ -39,7 -39,7 +55,11 @@@
<entry>
<title>Fedora Core</title>
<
id>http://docs.fedoraproject.org/ml-IN/Fedora_Core/opds-Fedora_Core.xm...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>ml-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Core.xml"/>
@@@ -47,7 -47,7 +67,11 @@@
<entry>
<title>Fedora Draft Documentation</title>
<
id>http://docs.fedoraproject.org/ml-IN/Fedora_Draft_Documentation/opds...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>ml-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Draft_Documentation.xml"/>
diff --cc public_html/mr-IN/opds-Community_Services_Infrastructure.xml
index 7b38c09,72710fd..3a07b5a
--- a/public_html/mr-IN/opds-Community_Services_Infrastructure.xml
+++ b/public_html/mr-IN/opds-Community_Services_Infrastructure.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/mr-IN/opds-Community_Services_Infrast...
<title>Community Services Infrastructure</title>
<subtitle>Community Services Infrastructure</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/mr-IN/opds-Fedora.xml
index bf055e8,f61c5dd..b29b134
--- a/public_html/mr-IN/opds-Fedora.xml
+++ b/public_html/mr-IN/opds-Fedora.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/mr-IN/opds-Fedora.xml</id>
<title>Fedora</title>
<subtitle>Fedora</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/mr-IN/opds-Fedora_Contributor_Documentation.xml
index ce91723,fc2d050..f13c9df
--- a/public_html/mr-IN/opds-Fedora_Contributor_Documentation.xml
+++ b/public_html/mr-IN/opds-Fedora_Contributor_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/mr-IN/opds-Fedora_Contributor_Documen...
<title>Fedora Contributor Documentation</title>
<subtitle>Fedora Contributor Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/mr-IN/opds-Fedora_Core.xml
index 8ca2236,6a19b7a..b0395b6
--- a/public_html/mr-IN/opds-Fedora_Core.xml
+++ b/public_html/mr-IN/opds-Fedora_Core.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/mr-IN/opds-Fedora_Core.xml</id>
<title>Fedora Core</title>
<subtitle>Fedora Core</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/mr-IN/opds-Fedora_Draft_Documentation.xml
index 19b3401,a78d12e..7f9e838
--- a/public_html/mr-IN/opds-Fedora_Draft_Documentation.xml
+++ b/public_html/mr-IN/opds-Fedora_Draft_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/mr-IN/opds-Fedora_Draft_Documentation...
<title>Fedora Draft Documentation</title>
<subtitle>Fedora Draft Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/mr-IN/opds.xml
index 7fbbb72,863f4c3..1091a2f
--- a/public_html/mr-IN/opds.xml
+++ b/public_html/mr-IN/opds.xml
@@@ -6,7 -6,7 +6,11 @@@
<link
rel="http://opds-spec.org/crawlable"
type="application/atom+xml"
href="http://bookserver.archive.org/catalog/crawlable" title="Crawlable
feed"/>
<
id>http://docs.fedoraproject.org/mr-IN/opds.xml</id>
<title>Product List</title>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
@@@ -15,7 -15,7 +19,11 @@@
<entry>
<title>Community Services Infrastructure</title>
<
id>http://docs.fedoraproject.org/mr-IN/Community_Services_Infrastructu...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>mr-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Community_Services_Infrastructure.xml"/>
@@@ -23,7 -23,7 +31,11 @@@
<entry>
<title>Fedora</title>
<
id>http://docs.fedoraproject.org/mr-IN/Fedora/opds-Fedora.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>mr-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora.xml"/>
@@@ -31,7 -31,7 +43,11 @@@
<entry>
<title>Fedora Contributor Documentation</title>
<
id>http://docs.fedoraproject.org/mr-IN/Fedora_Contributor_Documentatio...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>mr-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Contributor_Documentation.xml"/>
@@@ -39,7 -39,7 +55,11 @@@
<entry>
<title>Fedora Core</title>
<
id>http://docs.fedoraproject.org/mr-IN/Fedora_Core/opds-Fedora_Core.xm...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>mr-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Core.xml"/>
@@@ -47,7 -47,7 +67,11 @@@
<entry>
<title>Fedora Draft Documentation</title>
<
id>http://docs.fedoraproject.org/mr-IN/Fedora_Draft_Documentation/opds...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>mr-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Draft_Documentation.xml"/>
diff --cc public_html/nb-NO/opds-Community_Services_Infrastructure.xml
index e792738,a5b553c..9ad1ec2
--- a/public_html/nb-NO/opds-Community_Services_Infrastructure.xml
+++ b/public_html/nb-NO/opds-Community_Services_Infrastructure.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/nb-NO/opds-Community_Services_Infrast...
<title>Community Services Infrastructure</title>
<subtitle>Community Services Infrastructure</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/nb-NO/opds-Fedora.xml
index 6e053b1,e135723..e5fc9e5
--- a/public_html/nb-NO/opds-Fedora.xml
+++ b/public_html/nb-NO/opds-Fedora.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/nb-NO/opds-Fedora.xml</id>
<title>Fedora</title>
<subtitle>Fedora</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/nb-NO/opds-Fedora_Contributor_Documentation.xml
index cdb71d7,599fcf3..bbd7349
--- a/public_html/nb-NO/opds-Fedora_Contributor_Documentation.xml
+++ b/public_html/nb-NO/opds-Fedora_Contributor_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/nb-NO/opds-Fedora_Contributor_Documen...
<title>Fedora Contributor Documentation</title>
<subtitle>Fedora Contributor Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/nb-NO/opds-Fedora_Core.xml
index 296edeb,48c6f32..c9a6cb9
--- a/public_html/nb-NO/opds-Fedora_Core.xml
+++ b/public_html/nb-NO/opds-Fedora_Core.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/nb-NO/opds-Fedora_Core.xml</id>
<title>Fedora Core</title>
<subtitle>Fedora Core</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/nb-NO/opds-Fedora_Draft_Documentation.xml
index 7886ec5,5f124e2..a0b4664
--- a/public_html/nb-NO/opds-Fedora_Draft_Documentation.xml
+++ b/public_html/nb-NO/opds-Fedora_Draft_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/nb-NO/opds-Fedora_Draft_Documentation...
<title>Fedora Draft Documentation</title>
<subtitle>Fedora Draft Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/nb-NO/opds.xml
index 758bc8e,8620382..99cd0bc
--- a/public_html/nb-NO/opds.xml
+++ b/public_html/nb-NO/opds.xml
@@@ -6,7 -6,7 +6,11 @@@
<link
rel="http://opds-spec.org/crawlable"
type="application/atom+xml"
href="http://bookserver.archive.org/catalog/crawlable" title="Crawlable
feed"/>
<
id>http://docs.fedoraproject.org/nb-NO/opds.xml</id>
<title>Product List</title>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
@@@ -15,7 -15,7 +19,11 @@@
<entry>
<title>Community Services Infrastructure</title>
<
id>http://docs.fedoraproject.org/nb-NO/Community_Services_Infrastructu...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>nb-NO</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Community_Services_Infrastructure.xml"/>
@@@ -23,7 -23,7 +31,11 @@@
<entry>
<title>Fedora</title>
<
id>http://docs.fedoraproject.org/nb-NO/Fedora/opds-Fedora.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>nb-NO</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora.xml"/>
@@@ -31,7 -31,7 +43,11 @@@
<entry>
<title>Fedora Contributor Documentation</title>
<
id>http://docs.fedoraproject.org/nb-NO/Fedora_Contributor_Documentatio...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>nb-NO</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Contributor_Documentation.xml"/>
@@@ -39,7 -39,7 +55,11 @@@
<entry>
<title>Fedora Core</title>
<
id>http://docs.fedoraproject.org/nb-NO/Fedora_Core/opds-Fedora_Core.xm...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>nb-NO</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Core.xml"/>
@@@ -47,7 -47,7 +67,11 @@@
<entry>
<title>Fedora Draft Documentation</title>
<
id>http://docs.fedoraproject.org/nb-NO/Fedora_Draft_Documentation/opds...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>nb-NO</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Draft_Documentation.xml"/>
diff --cc public_html/nl-NL/opds-Community_Services_Infrastructure.xml
index 10bd156,8e6444f..9fc134f
--- a/public_html/nl-NL/opds-Community_Services_Infrastructure.xml
+++ b/public_html/nl-NL/opds-Community_Services_Infrastructure.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/nl-NL/opds-Community_Services_Infrast...
<title>Community Services Infrastructure</title>
<subtitle>Community Services Infrastructure</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/nl-NL/opds-Fedora.xml
index dec8030,737efea..fbc6dc6
--- a/public_html/nl-NL/opds-Fedora.xml
+++ b/public_html/nl-NL/opds-Fedora.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/nl-NL/opds-Fedora.xml</id>
<title>Fedora</title>
<subtitle>Fedora</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/nl-NL/opds-Fedora_Contributor_Documentation.xml
index 48d0a89,7f63728..116b66d
--- a/public_html/nl-NL/opds-Fedora_Contributor_Documentation.xml
+++ b/public_html/nl-NL/opds-Fedora_Contributor_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/nl-NL/opds-Fedora_Contributor_Documen...
<title>Fedora Contributor Documentation</title>
<subtitle>Fedora Contributor Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/nl-NL/opds-Fedora_Core.xml
index 2d61b1a,dd27b00..5e47400
--- a/public_html/nl-NL/opds-Fedora_Core.xml
+++ b/public_html/nl-NL/opds-Fedora_Core.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/nl-NL/opds-Fedora_Core.xml</id>
<title>Fedora Core</title>
<subtitle>Fedora Core</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/nl-NL/opds-Fedora_Draft_Documentation.xml
index be3da98,a3cdc04..c9b11e7
--- a/public_html/nl-NL/opds-Fedora_Draft_Documentation.xml
+++ b/public_html/nl-NL/opds-Fedora_Draft_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/nl-NL/opds-Fedora_Draft_Documentation...
<title>Fedora Draft Documentation</title>
<subtitle>Fedora Draft Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/nl-NL/opds.xml
index 3c98819,d139072..f89bdba
--- a/public_html/nl-NL/opds.xml
+++ b/public_html/nl-NL/opds.xml
@@@ -6,7 -6,7 +6,11 @@@
<link
rel="http://opds-spec.org/crawlable"
type="application/atom+xml"
href="http://bookserver.archive.org/catalog/crawlable" title="Crawlable
feed"/>
<
id>http://docs.fedoraproject.org/nl-NL/opds.xml</id>
<title>Product List</title>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
@@@ -15,7 -15,7 +19,11 @@@
<entry>
<title>Community Services Infrastructure</title>
<
id>http://docs.fedoraproject.org/nl-NL/Community_Services_Infrastructu...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>nl-NL</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Community_Services_Infrastructure.xml"/>
@@@ -23,7 -23,7 +31,11 @@@
<entry>
<title>Fedora</title>
<
id>http://docs.fedoraproject.org/nl-NL/Fedora/opds-Fedora.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>nl-NL</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora.xml"/>
@@@ -31,7 -31,7 +43,11 @@@
<entry>
<title>Fedora Contributor Documentation</title>
<
id>http://docs.fedoraproject.org/nl-NL/Fedora_Contributor_Documentatio...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>nl-NL</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Contributor_Documentation.xml"/>
@@@ -39,7 -39,7 +55,11 @@@
<entry>
<title>Fedora Core</title>
<
id>http://docs.fedoraproject.org/nl-NL/Fedora_Core/opds-Fedora_Core.xm...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>nl-NL</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Core.xml"/>
@@@ -47,7 -47,7 +67,11 @@@
<entry>
<title>Fedora Draft Documentation</title>
<
id>http://docs.fedoraproject.org/nl-NL/Fedora_Draft_Documentation/opds...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>nl-NL</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Draft_Documentation.xml"/>
diff --cc public_html/opds.xml
index d8913d2,e41f6b0..a2713ac
--- a/public_html/opds.xml
+++ b/public_html/opds.xml
@@@ -7,7 -7,7 +7,11 @@@
<link rel="start"
href="http://docs.fedoraproject.org/opds.xml"
type="application/atom+xml;type=feed;profile=opds-catalog"/>
<link
rel="http://opds-spec.org/crawlable"
type="application/atom+xml"
href="http://bookserver.archive.org/catalog/crawlable" title="Crawlable
feed"/>
<title>Fedora Documentation</title>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:51</updated>
++=======
+ <updated>2012-06-24T19:46:02</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
@@@ -16,7 -16,7 +20,11 @@@
<entry>
<title>অসমীয়া</title>
<id>as-IN/opds.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:54</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>as-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml" href="as-IN/opds.xml"/>
@@@ -24,7 -24,7 +32,11 @@@
<entry>
<title>български</title>
<id>bg-BG/opds.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>bg-BG</dc:language>
<content type="text"></content>
<link type="application/atom+xml" href="bg-BG/opds.xml"/>
@@@ -32,7 -32,7 +44,11 @@@
<entry>
<title>বাংলা</title>
<id>bn-IN/opds.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>bn-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml" href="bn-IN/opds.xml"/>
@@@ -40,7 -40,7 +56,11 @@@
<entry>
<title>Bosanski</title>
<id>bs-BA/opds.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>bs-BA</dc:language>
<content type="text"></content>
<link type="application/atom+xml" href="bs-BA/opds.xml"/>
@@@ -48,7 -48,7 +68,11 @@@
<entry>
<title>Català</title>
<id>ca-ES/opds.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>ca-ES</dc:language>
<content type="text"></content>
<link type="application/atom+xml" href="ca-ES/opds.xml"/>
@@@ -56,7 -56,7 +80,11 @@@
<entry>
<title>Čeština</title>
<id>cs-CZ/opds.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:45</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>cs-CZ</dc:language>
<content type="text"></content>
<link type="application/atom+xml" href="cs-CZ/opds.xml"/>
@@@ -64,7 -64,7 +92,11 @@@
<entry>
<title>Dansk</title>
<id>da-DK/opds.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:55</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>da-DK</dc:language>
<content type="text"></content>
<link type="application/atom+xml" href="da-DK/opds.xml"/>
@@@ -72,7 -72,7 +104,11 @@@
<entry>
<title>Deutsch</title>
<id>de-DE/opds.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>de-DE</dc:language>
<content type="text"></content>
<link type="application/atom+xml" href="de-DE/opds.xml"/>
@@@ -80,7 -80,7 +116,11 @@@
<entry>
<title>Ελληνικά</title>
<id>el-GR/opds.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>el-GR</dc:language>
<content type="text"></content>
<link type="application/atom+xml" href="el-GR/opds.xml"/>
@@@ -88,7 -88,7 +128,11 @@@
<entry>
<title>English</title>
<id>en-US/opds.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>en-US</dc:language>
<content type="text"></content>
<link type="application/atom+xml" href="en-US/opds.xml"/>
@@@ -96,7 -96,7 +140,11 @@@
<entry>
<title>Español</title>
<id>es-ES/opds.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>es-ES</dc:language>
<content type="text"></content>
<link type="application/atom+xml" href="es-ES/opds.xml"/>
@@@ -104,7 -104,7 +152,11 @@@
<entry>
<title>فارسی</title>
<id>fa-IR/opds.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>fa-IR</dc:language>
<content type="text"></content>
<link type="application/atom+xml" href="fa-IR/opds.xml"/>
@@@ -112,7 -112,7 +164,11 @@@
<entry>
<title>Suomi</title>
<id>fi-FI/opds.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:46</updated>
++=======
+ <updated>2012-06-24T19:45:56</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>fi-FI</dc:language>
<content type="text"></content>
<link type="application/atom+xml" href="fi-FI/opds.xml"/>
@@@ -120,7 -120,7 +176,11 @@@
<entry>
<title>Français</title>
<id>fr-FR/opds.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>fr-FR</dc:language>
<content type="text"></content>
<link type="application/atom+xml" href="fr-FR/opds.xml"/>
@@@ -128,7 -128,7 +188,11 @@@
<entry>
<title>ગુજરાતી</title>
<id>gu-IN/opds.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>gu-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml" href="gu-IN/opds.xml"/>
@@@ -136,7 -136,7 +200,11 @@@
<entry>
<title>עברית</title>
<id>he-IL/opds.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>he-IL</dc:language>
<content type="text"></content>
<link type="application/atom+xml" href="he-IL/opds.xml"/>
@@@ -144,7 -144,7 +212,11 @@@
<entry>
<title>हिन्दी</title>
<id>hi-IN/opds.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>hi-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml" href="hi-IN/opds.xml"/>
@@@ -152,7 -152,7 +224,11 @@@
<entry>
<title>Magyar</title>
<id>hu-HU/opds.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>hu-HU</dc:language>
<content type="text"></content>
<link type="application/atom+xml" href="hu-HU/opds.xml"/>
@@@ -160,7 -160,7 +236,11 @@@
<entry>
<title>Indonesia</title>
<id>id-ID/opds.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:57</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>id-ID</dc:language>
<content type="text"></content>
<link type="application/atom+xml" href="id-ID/opds.xml"/>
@@@ -168,7 -168,7 +248,11 @@@
<entry>
<title>Italiano</title>
<id>it-IT/opds.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:47</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>it-IT</dc:language>
<content type="text"></content>
<link type="application/atom+xml" href="it-IT/opds.xml"/>
@@@ -176,7 -176,7 +260,11 @@@
<entry>
<title>日本語</title>
<id>ja-JP/opds.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>ja-JP</dc:language>
<content type="text"></content>
<link type="application/atom+xml" href="ja-JP/opds.xml"/>
@@@ -184,7 -184,7 +272,11 @@@
<entry>
<title>ಕನ್ನಡ</title>
<id>kn-IN/opds.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>kn-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml" href="kn-IN/opds.xml"/>
@@@ -192,7 -192,7 +284,11 @@@
<entry>
<title>한국어</title>
<id>ko-KR/opds.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>ko-KR</dc:language>
<content type="text"></content>
<link type="application/atom+xml" href="ko-KR/opds.xml"/>
@@@ -200,7 -200,7 +296,11 @@@
<entry>
<title>മലയാളം</title>
<id>ml-IN/opds.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>ml-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml" href="ml-IN/opds.xml"/>
@@@ -208,7 -208,7 +308,11 @@@
<entry>
<title>मराठी</title>
<id>mr-IN/opds.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:58</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>mr-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml" href="mr-IN/opds.xml"/>
@@@ -216,7 -216,7 +320,11 @@@
<entry>
<title>Norsk (bokmål)</title>
<id>nb-NO/opds.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>nb-NO</dc:language>
<content type="text"></content>
<link type="application/atom+xml" href="nb-NO/opds.xml"/>
@@@ -224,7 -224,7 +332,11 @@@
<entry>
<title>Nederlands</title>
<id>nl-NL/opds.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>nl-NL</dc:language>
<content type="text"></content>
<link type="application/atom+xml" href="nl-NL/opds.xml"/>
@@@ -232,7 -232,7 +344,11 @@@
<entry>
<title>ଓଡ଼ିଆ</title>
<id>or-IN/opds.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>or-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml" href="or-IN/opds.xml"/>
@@@ -240,7 -240,7 +356,11 @@@
<entry>
<title>ਪੰਜਾਬੀ</title>
<id>pa-IN/opds.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>pa-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml" href="pa-IN/opds.xml"/>
@@@ -248,7 -248,7 +368,11 @@@
<entry>
<title>Polski</title>
<id>pl-PL/opds.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>pl-PL</dc:language>
<content type="text"></content>
<link type="application/atom+xml" href="pl-PL/opds.xml"/>
@@@ -256,7 -256,7 +380,11 @@@
<entry>
<title>Português Brasileiro</title>
<id>pt-BR/opds.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>pt-BR</dc:language>
<content type="text"></content>
<link type="application/atom+xml" href="pt-BR/opds.xml"/>
@@@ -264,7 -264,7 +392,11 @@@
<entry>
<title>Português</title>
<id>pt-PT/opds.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>pt-PT</dc:language>
<content type="text"></content>
<link type="application/atom+xml" href="pt-PT/opds.xml"/>
@@@ -272,7 -272,7 +404,11 @@@
<entry>
<title>Romanian</title>
<id>ro/opds.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>ro</dc:language>
<content type="text"></content>
<link type="application/atom+xml" href="ro/opds.xml"/>
@@@ -280,7 -280,7 +416,11 @@@
<entry>
<title>Русский</title>
<id>ru-RU/opds.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>ru-RU</dc:language>
<content type="text"></content>
<link type="application/atom+xml" href="ru-RU/opds.xml"/>
@@@ -288,7 -288,7 +428,11 @@@
<entry>
<title>Slovenščina</title>
<id>sk-SK/opds.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>sk-SK</dc:language>
<content type="text"></content>
<link type="application/atom+xml" href="sk-SK/opds.xml"/>
@@@ -296,7 -296,7 +440,11 @@@
<entry>
<title>Srpski (latinica)</title>
<id>sr-Latn-RS/opds.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>sr-Latn-RS</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="sr-Latn-RS/opds.xml"/>
@@@ -304,7 -304,7 +452,11 @@@
<entry>
<title>Српски</title>
<id>sr-RS/opds.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>sr-RS</dc:language>
<content type="text"></content>
<link type="application/atom+xml" href="sr-RS/opds.xml"/>
@@@ -312,7 -312,7 +464,11 @@@
<entry>
<title>Svenska</title>
<id>sv-SE/opds.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>sv-SE</dc:language>
<content type="text"></content>
<link type="application/atom+xml" href="sv-SE/opds.xml"/>
@@@ -320,7 -320,7 +476,11 @@@
<entry>
<title>தமிழ்</title>
<id>ta-IN/opds.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>ta-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml" href="ta-IN/opds.xml"/>
@@@ -328,7 -328,7 +488,11 @@@
<entry>
<title>తెలుగు</title>
<id>te-IN/opds.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>te-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml" href="te-IN/opds.xml"/>
@@@ -336,7 -336,7 +500,11 @@@
<entry>
<title>Українська</title>
<id>uk-UA/opds.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>uk-UA</dc:language>
<content type="text"></content>
<link type="application/atom+xml" href="uk-UA/opds.xml"/>
@@@ -344,7 -344,7 +512,11 @@@
<entry>
<title>简体中文</title>
<id>zh-CN/opds.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:51</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>zh-CN</dc:language>
<content type="text"></content>
<link type="application/atom+xml" href="zh-CN/opds.xml"/>
@@@ -352,7 -352,7 +524,11 @@@
<entry>
<title>繁體中文</title>
<id>zh-TW/opds.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:51</updated>
++=======
+ <updated>2012-06-24T19:46:02</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>zh-TW</dc:language>
<content type="text"></content>
<link type="application/atom+xml" href="zh-TW/opds.xml"/>
diff --cc public_html/or-IN/opds-Community_Services_Infrastructure.xml
index 5c2b106,eb5fa9f..49301ab
--- a/public_html/or-IN/opds-Community_Services_Infrastructure.xml
+++ b/public_html/or-IN/opds-Community_Services_Infrastructure.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/or-IN/opds-Community_Services_Infrast...
<title>Community Services Infrastructure</title>
<subtitle>Community Services Infrastructure</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/or-IN/opds-Fedora.xml
index 56d8926,cd56508..25bdcbf
--- a/public_html/or-IN/opds-Fedora.xml
+++ b/public_html/or-IN/opds-Fedora.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/or-IN/opds-Fedora.xml</id>
<title>Fedora</title>
<subtitle>Fedora</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/or-IN/opds-Fedora_Contributor_Documentation.xml
index c6974c4,49495ff..5deed75
--- a/public_html/or-IN/opds-Fedora_Contributor_Documentation.xml
+++ b/public_html/or-IN/opds-Fedora_Contributor_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/or-IN/opds-Fedora_Contributor_Documen...
<title>Fedora Contributor Documentation</title>
<subtitle>Fedora Contributor Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/or-IN/opds-Fedora_Core.xml
index 2f8f6d3,7c7ec69..ef5aca7
--- a/public_html/or-IN/opds-Fedora_Core.xml
+++ b/public_html/or-IN/opds-Fedora_Core.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/or-IN/opds-Fedora_Core.xml</id>
<title>Fedora Core</title>
<subtitle>Fedora Core</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/or-IN/opds-Fedora_Draft_Documentation.xml
index be2bea6,750d9ab..37d73f0
--- a/public_html/or-IN/opds-Fedora_Draft_Documentation.xml
+++ b/public_html/or-IN/opds-Fedora_Draft_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/or-IN/opds-Fedora_Draft_Documentation...
<title>Fedora Draft Documentation</title>
<subtitle>Fedora Draft Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/or-IN/opds.xml
index 820c0ca,b5aef46..5a50a06
--- a/public_html/or-IN/opds.xml
+++ b/public_html/or-IN/opds.xml
@@@ -6,7 -6,7 +6,11 @@@
<link
rel="http://opds-spec.org/crawlable"
type="application/atom+xml"
href="http://bookserver.archive.org/catalog/crawlable" title="Crawlable
feed"/>
<
id>http://docs.fedoraproject.org/or-IN/opds.xml</id>
<title>Product List</title>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
@@@ -15,7 -15,7 +19,11 @@@
<entry>
<title>Community Services Infrastructure</title>
<
id>http://docs.fedoraproject.org/or-IN/Community_Services_Infrastructu...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:48</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>or-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Community_Services_Infrastructure.xml"/>
@@@ -23,7 -23,7 +31,11 @@@
<entry>
<title>Fedora</title>
<
id>http://docs.fedoraproject.org/or-IN/Fedora/opds-Fedora.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>or-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora.xml"/>
@@@ -31,7 -31,7 +43,11 @@@
<entry>
<title>Fedora Contributor Documentation</title>
<
id>http://docs.fedoraproject.org/or-IN/Fedora_Contributor_Documentatio...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>or-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Contributor_Documentation.xml"/>
@@@ -39,7 -39,7 +55,11 @@@
<entry>
<title>Fedora Core</title>
<
id>http://docs.fedoraproject.org/or-IN/Fedora_Core/opds-Fedora_Core.xm...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>or-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Core.xml"/>
@@@ -47,7 -47,7 +67,11 @@@
<entry>
<title>Fedora Draft Documentation</title>
<
id>http://docs.fedoraproject.org/or-IN/Fedora_Draft_Documentation/opds...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>or-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Draft_Documentation.xml"/>
diff --cc public_html/pa-IN/opds-Community_Services_Infrastructure.xml
index a859c08,86a931d..ef64ac0
--- a/public_html/pa-IN/opds-Community_Services_Infrastructure.xml
+++ b/public_html/pa-IN/opds-Community_Services_Infrastructure.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/pa-IN/opds-Community_Services_Infrast...
<title>Community Services Infrastructure</title>
<subtitle>Community Services Infrastructure</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/pa-IN/opds-Fedora.xml
index 8eea76f,9124c87..9f0edf1
--- a/public_html/pa-IN/opds-Fedora.xml
+++ b/public_html/pa-IN/opds-Fedora.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/pa-IN/opds-Fedora.xml</id>
<title>Fedora</title>
<subtitle>Fedora</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/pa-IN/opds-Fedora_Contributor_Documentation.xml
index 2fd3806,f7eac73..e61a554
--- a/public_html/pa-IN/opds-Fedora_Contributor_Documentation.xml
+++ b/public_html/pa-IN/opds-Fedora_Contributor_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/pa-IN/opds-Fedora_Contributor_Documen...
<title>Fedora Contributor Documentation</title>
<subtitle>Fedora Contributor Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/pa-IN/opds-Fedora_Core.xml
index 3a5ae81,53aff7b..8da71fd
--- a/public_html/pa-IN/opds-Fedora_Core.xml
+++ b/public_html/pa-IN/opds-Fedora_Core.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/pa-IN/opds-Fedora_Core.xml</id>
<title>Fedora Core</title>
<subtitle>Fedora Core</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/pa-IN/opds-Fedora_Draft_Documentation.xml
index 0cd2704,9e66419..4f1d3a6
--- a/public_html/pa-IN/opds-Fedora_Draft_Documentation.xml
+++ b/public_html/pa-IN/opds-Fedora_Draft_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/pa-IN/opds-Fedora_Draft_Documentation...
<title>Fedora Draft Documentation</title>
<subtitle>Fedora Draft Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/pa-IN/opds.xml
index 0c44761,412ce66..ba84c30
--- a/public_html/pa-IN/opds.xml
+++ b/public_html/pa-IN/opds.xml
@@@ -6,7 -6,7 +6,11 @@@
<link
rel="http://opds-spec.org/crawlable"
type="application/atom+xml"
href="http://bookserver.archive.org/catalog/crawlable" title="Crawlable
feed"/>
<
id>http://docs.fedoraproject.org/pa-IN/opds.xml</id>
<title>Product List</title>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
@@@ -15,7 -15,7 +19,11 @@@
<entry>
<title>Community Services Infrastructure</title>
<
id>http://docs.fedoraproject.org/pa-IN/Community_Services_Infrastructu...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>pa-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Community_Services_Infrastructure.xml"/>
@@@ -23,7 -23,7 +31,11 @@@
<entry>
<title>Fedora</title>
<
id>http://docs.fedoraproject.org/pa-IN/Fedora/opds-Fedora.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>pa-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora.xml"/>
@@@ -31,7 -31,7 +43,11 @@@
<entry>
<title>Fedora Contributor Documentation</title>
<
id>http://docs.fedoraproject.org/pa-IN/Fedora_Contributor_Documentatio...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>pa-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Contributor_Documentation.xml"/>
@@@ -39,7 -39,7 +55,11 @@@
<entry>
<title>Fedora Core</title>
<
id>http://docs.fedoraproject.org/pa-IN/Fedora_Core/opds-Fedora_Core.xm...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>pa-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Core.xml"/>
@@@ -47,7 -47,7 +67,11 @@@
<entry>
<title>Fedora Draft Documentation</title>
<
id>http://docs.fedoraproject.org/pa-IN/Fedora_Draft_Documentation/opds...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>pa-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Draft_Documentation.xml"/>
diff --cc public_html/pl-PL/opds-Community_Services_Infrastructure.xml
index aae1424,ed8ce4b..fe4be65
--- a/public_html/pl-PL/opds-Community_Services_Infrastructure.xml
+++ b/public_html/pl-PL/opds-Community_Services_Infrastructure.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/pl-PL/opds-Community_Services_Infrast...
<title>Community Services Infrastructure</title>
<subtitle>Community Services Infrastructure</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/pl-PL/opds-Fedora.xml
index f9daed1,680eab3..03f2c3f
--- a/public_html/pl-PL/opds-Fedora.xml
+++ b/public_html/pl-PL/opds-Fedora.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/pl-PL/opds-Fedora.xml</id>
<title>Fedora</title>
<subtitle>Fedora</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/pl-PL/opds-Fedora_Contributor_Documentation.xml
index 6e40a11,f1f5275..919031c
--- a/public_html/pl-PL/opds-Fedora_Contributor_Documentation.xml
+++ b/public_html/pl-PL/opds-Fedora_Contributor_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/pl-PL/opds-Fedora_Contributor_Documen...
<title>Dokumentacja dla współtwórców Fedory</title>
<subtitle>Dokumentacja dla współtwórców Fedory</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/pl-PL/opds-Fedora_Core.xml
index 55a68ae,7c44309..db7e889
--- a/public_html/pl-PL/opds-Fedora_Core.xml
+++ b/public_html/pl-PL/opds-Fedora_Core.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/pl-PL/opds-Fedora_Core.xml</id>
<title>Fedora Core</title>
<subtitle>Fedora Core</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/pl-PL/opds-Fedora_Draft_Documentation.xml
index 01e0e23,50fa22a..4c8a523
--- a/public_html/pl-PL/opds-Fedora_Draft_Documentation.xml
+++ b/public_html/pl-PL/opds-Fedora_Draft_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/pl-PL/opds-Fedora_Draft_Documentation...
<title>Fedora Draft Documentation</title>
<subtitle>Fedora Draft Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/pl-PL/opds.xml
index 8738b2f,ddfe9f1..5b8bd6f
--- a/public_html/pl-PL/opds.xml
+++ b/public_html/pl-PL/opds.xml
@@@ -6,7 -6,7 +6,11 @@@
<link
rel="http://opds-spec.org/crawlable"
type="application/atom+xml"
href="http://bookserver.archive.org/catalog/crawlable" title="Crawlable
feed"/>
<
id>http://docs.fedoraproject.org/pl-PL/opds.xml</id>
<title>Product List</title>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
@@@ -15,7 -15,7 +19,11 @@@
<entry>
<title>Community Services Infrastructure</title>
<
id>http://docs.fedoraproject.org/pl-PL/Community_Services_Infrastructu...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>pl-PL</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Community_Services_Infrastructure.xml"/>
@@@ -23,7 -23,7 +31,11 @@@
<entry>
<title>Fedora</title>
<
id>http://docs.fedoraproject.org/pl-PL/Fedora/opds-Fedora.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>pl-PL</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora.xml"/>
@@@ -31,7 -31,7 +43,11 @@@
<entry>
<title>Dokumentacja dla współtwórców Fedory</title>
<
id>http://docs.fedoraproject.org/pl-PL/Fedora_Contributor_Documentatio...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>pl-PL</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Contributor_Documentation.xml"/>
@@@ -39,7 -39,7 +55,11 @@@
<entry>
<title>Fedora Core</title>
<
id>http://docs.fedoraproject.org/pl-PL/Fedora_Core/opds-Fedora_Core.xm...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>pl-PL</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Core.xml"/>
@@@ -47,7 -47,7 +67,11 @@@
<entry>
<title>Fedora Draft Documentation</title>
<
id>http://docs.fedoraproject.org/pl-PL/Fedora_Draft_Documentation/opds...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>pl-PL</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Draft_Documentation.xml"/>
diff --cc public_html/pt-BR/opds-Community_Services_Infrastructure.xml
index 814afb9,e3b483c..6cac977
--- a/public_html/pt-BR/opds-Community_Services_Infrastructure.xml
+++ b/public_html/pt-BR/opds-Community_Services_Infrastructure.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/pt-BR/opds-Community_Services_Infrast...
<title>Community Services Infrastructure</title>
<subtitle>Community Services Infrastructure</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/pt-BR/opds-Fedora.xml
index bafea36,18732c3..a797487
--- a/public_html/pt-BR/opds-Fedora.xml
+++ b/public_html/pt-BR/opds-Fedora.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/pt-BR/opds-Fedora.xml</id>
<title>Fedora</title>
<subtitle>Fedora</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/pt-BR/opds-Fedora_Contributor_Documentation.xml
index 810e390,c3220a5..02f9f73
--- a/public_html/pt-BR/opds-Fedora_Contributor_Documentation.xml
+++ b/public_html/pt-BR/opds-Fedora_Contributor_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/pt-BR/opds-Fedora_Contributor_Documen...
<title>Fedora Contributor Documentation</title>
<subtitle>Fedora Contributor Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/pt-BR/opds-Fedora_Core.xml
index db1c91e,aa49298..2cff3cd
--- a/public_html/pt-BR/opds-Fedora_Core.xml
+++ b/public_html/pt-BR/opds-Fedora_Core.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/pt-BR/opds-Fedora_Core.xml</id>
<title>Fedora Core</title>
<subtitle>Fedora Core</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/pt-BR/opds-Fedora_Draft_Documentation.xml
index 60f586e,e880848..c071758
--- a/public_html/pt-BR/opds-Fedora_Draft_Documentation.xml
+++ b/public_html/pt-BR/opds-Fedora_Draft_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/pt-BR/opds-Fedora_Draft_Documentation...
<title>Fedora Draft Documentation</title>
<subtitle>Fedora Draft Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/pt-BR/opds.xml
index 6afd478,b1a3a0b..b6d16d3
--- a/public_html/pt-BR/opds.xml
+++ b/public_html/pt-BR/opds.xml
@@@ -6,7 -6,7 +6,11 @@@
<link
rel="http://opds-spec.org/crawlable"
type="application/atom+xml"
href="http://bookserver.archive.org/catalog/crawlable" title="Crawlable
feed"/>
<
id>http://docs.fedoraproject.org/pt-BR/opds.xml</id>
<title>Product List</title>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
@@@ -15,7 -15,7 +19,11 @@@
<entry>
<title>Community Services Infrastructure</title>
<
id>http://docs.fedoraproject.org/pt-BR/Community_Services_Infrastructu...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>pt-BR</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Community_Services_Infrastructure.xml"/>
@@@ -23,7 -23,7 +31,11 @@@
<entry>
<title>Fedora</title>
<
id>http://docs.fedoraproject.org/pt-BR/Fedora/opds-Fedora.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>pt-BR</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora.xml"/>
@@@ -31,7 -31,7 +43,11 @@@
<entry>
<title>Fedora Contributor Documentation</title>
<
id>http://docs.fedoraproject.org/pt-BR/Fedora_Contributor_Documentatio...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>pt-BR</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Contributor_Documentation.xml"/>
@@@ -39,7 -39,7 +55,11 @@@
<entry>
<title>Fedora Core</title>
<
id>http://docs.fedoraproject.org/pt-BR/Fedora_Core/opds-Fedora_Core.xm...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>pt-BR</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Core.xml"/>
@@@ -47,7 -47,7 +67,11 @@@
<entry>
<title>Fedora Draft Documentation</title>
<
id>http://docs.fedoraproject.org/pt-BR/Fedora_Draft_Documentation/opds...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:45:59</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>pt-BR</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Draft_Documentation.xml"/>
diff --cc public_html/pt-PT/opds-Community_Services_Infrastructure.xml
index 23aa9db,1b4cde2..8c22ba2
--- a/public_html/pt-PT/opds-Community_Services_Infrastructure.xml
+++ b/public_html/pt-PT/opds-Community_Services_Infrastructure.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/pt-PT/opds-Community_Services_Infrast...
<title>Community Services Infrastructure</title>
<subtitle>Community Services Infrastructure</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/pt-PT/opds-Fedora.xml
index c67a8c1,6a96c47..fd32771
--- a/public_html/pt-PT/opds-Fedora.xml
+++ b/public_html/pt-PT/opds-Fedora.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/pt-PT/opds-Fedora.xml</id>
<title>Fedora</title>
<subtitle>Fedora</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/pt-PT/opds-Fedora_Contributor_Documentation.xml
index a3e25ba,6cf4360..89abb81
--- a/public_html/pt-PT/opds-Fedora_Contributor_Documentation.xml
+++ b/public_html/pt-PT/opds-Fedora_Contributor_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/pt-PT/opds-Fedora_Contributor_Documen...
<title>Fedora Contributor Documentation</title>
<subtitle>Fedora Contributor Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/pt-PT/opds-Fedora_Core.xml
index 65806ee,dc2e035..013769c
--- a/public_html/pt-PT/opds-Fedora_Core.xml
+++ b/public_html/pt-PT/opds-Fedora_Core.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/pt-PT/opds-Fedora_Core.xml</id>
<title>Fedora Core</title>
<subtitle>Fedora Core</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/pt-PT/opds-Fedora_Draft_Documentation.xml
index 2c16647,5be1f3e..fa92809
--- a/public_html/pt-PT/opds-Fedora_Draft_Documentation.xml
+++ b/public_html/pt-PT/opds-Fedora_Draft_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/pt-PT/opds-Fedora_Draft_Documentation...
<title>Fedora Draft Documentation</title>
<subtitle>Fedora Draft Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/pt-PT/opds.xml
index 1191a5a,b7d3de5..c828235
--- a/public_html/pt-PT/opds.xml
+++ b/public_html/pt-PT/opds.xml
@@@ -6,7 -6,7 +6,11 @@@
<link
rel="http://opds-spec.org/crawlable"
type="application/atom+xml"
href="http://bookserver.archive.org/catalog/crawlable" title="Crawlable
feed"/>
<
id>http://docs.fedoraproject.org/pt-PT/opds.xml</id>
<title>Product List</title>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
@@@ -15,7 -15,7 +19,11 @@@
<entry>
<title>Community Services Infrastructure</title>
<
id>http://docs.fedoraproject.org/pt-PT/Community_Services_Infrastructu...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>pt-PT</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Community_Services_Infrastructure.xml"/>
@@@ -23,7 -23,7 +31,11 @@@
<entry>
<title>Fedora</title>
<
id>http://docs.fedoraproject.org/pt-PT/Fedora/opds-Fedora.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>pt-PT</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora.xml"/>
@@@ -31,7 -31,7 +43,11 @@@
<entry>
<title>Fedora Contributor Documentation</title>
<
id>http://docs.fedoraproject.org/pt-PT/Fedora_Contributor_Documentatio...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>pt-PT</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Contributor_Documentation.xml"/>
@@@ -39,7 -39,7 +55,11 @@@
<entry>
<title>Fedora Core</title>
<
id>http://docs.fedoraproject.org/pt-PT/Fedora_Core/opds-Fedora_Core.xm...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>pt-PT</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Core.xml"/>
@@@ -47,7 -47,7 +67,11 @@@
<entry>
<title>Fedora Draft Documentation</title>
<
id>http://docs.fedoraproject.org/pt-PT/Fedora_Draft_Documentation/opds...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>pt-PT</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Draft_Documentation.xml"/>
diff --cc public_html/ro/opds-Community_Services_Infrastructure.xml
index f74170a,e31ef1b..9ea5eb7
--- a/public_html/ro/opds-Community_Services_Infrastructure.xml
+++ b/public_html/ro/opds-Community_Services_Infrastructure.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/ro/opds-Community_Services_Infrastruc...
<title>Community Services Infrastructure</title>
<subtitle>Community Services Infrastructure</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/ro/opds-Fedora.xml
index 94f0ee3,c2f92c0..89f87be
--- a/public_html/ro/opds-Fedora.xml
+++ b/public_html/ro/opds-Fedora.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/ro/opds-Fedora.xml</id>
<title>Fedora</title>
<subtitle>Fedora</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/ro/opds-Fedora_Contributor_Documentation.xml
index 71b83cf,b6deba1..e1c9a1b
--- a/public_html/ro/opds-Fedora_Contributor_Documentation.xml
+++ b/public_html/ro/opds-Fedora_Contributor_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/ro/opds-Fedora_Contributor_Documentat...
<title>Fedora Contributor Documentation</title>
<subtitle>Fedora Contributor Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/ro/opds-Fedora_Core.xml
index 7abe61f,402bead..c6de556
--- a/public_html/ro/opds-Fedora_Core.xml
+++ b/public_html/ro/opds-Fedora_Core.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/ro/opds-Fedora_Core.xml</id>
<title>Fedora Core</title>
<subtitle>Fedora Core</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/ro/opds-Fedora_Draft_Documentation.xml
index 431f758,34294ea..0b818e9
--- a/public_html/ro/opds-Fedora_Draft_Documentation.xml
+++ b/public_html/ro/opds-Fedora_Draft_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/ro/opds-Fedora_Draft_Documentation.xm...
<title>Schiță Documentație Fedora</title>
<subtitle>Schiță Documentație Fedora</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/ro/opds.xml
index 4eac3f2,a52771f..d4f1760
--- a/public_html/ro/opds.xml
+++ b/public_html/ro/opds.xml
@@@ -6,7 -6,7 +6,11 @@@
<link
rel="http://opds-spec.org/crawlable"
type="application/atom+xml"
href="http://bookserver.archive.org/catalog/crawlable" title="Crawlable
feed"/>
<
id>http://docs.fedoraproject.org/ro/opds.xml</id>
<title>Product List</title>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
@@@ -15,7 -15,7 +19,11 @@@
<entry>
<title>Community Services Infrastructure</title>
<
id>http://docs.fedoraproject.org/ro/Community_Services_Infrastructure/...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>ro</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Community_Services_Infrastructure.xml"/>
@@@ -23,7 -23,7 +31,11 @@@
<entry>
<title>Fedora</title>
<
id>http://docs.fedoraproject.org/ro/Fedora/opds-Fedora.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>ro</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora.xml"/>
@@@ -31,7 -31,7 +43,11 @@@
<entry>
<title>Fedora Contributor Documentation</title>
<
id>http://docs.fedoraproject.org/ro/Fedora_Contributor_Documentation/o...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>ro</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Contributor_Documentation.xml"/>
@@@ -39,7 -39,7 +55,11 @@@
<entry>
<title>Fedora Core</title>
<
id>http://docs.fedoraproject.org/ro/Fedora_Core/opds-Fedora_Core.xml&l...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>ro</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Core.xml"/>
@@@ -47,7 -47,7 +67,11 @@@
<entry>
<title>Schiță Documentație Fedora</title>
<
id>http://docs.fedoraproject.org/ro/Fedora_Draft_Documentation/opds-Fe...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>ro</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Draft_Documentation.xml"/>
diff --cc public_html/ru-RU/opds-Community_Services_Infrastructure.xml
index 851abf9,abd955a..be37a6c
--- a/public_html/ru-RU/opds-Community_Services_Infrastructure.xml
+++ b/public_html/ru-RU/opds-Community_Services_Infrastructure.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/ru-RU/opds-Community_Services_Infrast...
<title>Community Services Infrastructure</title>
<subtitle>Community Services Infrastructure</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/ru-RU/opds-Fedora.xml
index 28cb0a7,7aaeb7c..2e8bfba
--- a/public_html/ru-RU/opds-Fedora.xml
+++ b/public_html/ru-RU/opds-Fedora.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/ru-RU/opds-Fedora.xml</id>
<title>Fedora</title>
<subtitle>Fedora</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/ru-RU/opds-Fedora_Contributor_Documentation.xml
index 92bc10b,7606051..d7010f4
--- a/public_html/ru-RU/opds-Fedora_Contributor_Documentation.xml
+++ b/public_html/ru-RU/opds-Fedora_Contributor_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/ru-RU/opds-Fedora_Contributor_Documen...
<title>Документация участника Fedora</title>
<subtitle>Документация участника Fedora</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/ru-RU/opds-Fedora_Core.xml
index 0999e52,0a667cd..35eaa6a
--- a/public_html/ru-RU/opds-Fedora_Core.xml
+++ b/public_html/ru-RU/opds-Fedora_Core.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/ru-RU/opds-Fedora_Core.xml</id>
<title>Fedora Core</title>
<subtitle>Fedora Core</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/ru-RU/opds-Fedora_Draft_Documentation.xml
index b9e7021,902f892..d751d0b
--- a/public_html/ru-RU/opds-Fedora_Draft_Documentation.xml
+++ b/public_html/ru-RU/opds-Fedora_Draft_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/ru-RU/opds-Fedora_Draft_Documentation...
<title>Fedora Draft Documentation</title>
<subtitle>Fedora Draft Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/ru-RU/opds.xml
index c714a59,c127b0f..9391e7c
--- a/public_html/ru-RU/opds.xml
+++ b/public_html/ru-RU/opds.xml
@@@ -6,7 -6,7 +6,11 @@@
<link
rel="http://opds-spec.org/crawlable"
type="application/atom+xml"
href="http://bookserver.archive.org/catalog/crawlable" title="Crawlable
feed"/>
<
id>http://docs.fedoraproject.org/ru-RU/opds.xml</id>
<title>Product List</title>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
@@@ -15,7 -15,7 +19,11 @@@
<entry>
<title>Community Services Infrastructure</title>
<
id>http://docs.fedoraproject.org/ru-RU/Community_Services_Infrastructu...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>ru-RU</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Community_Services_Infrastructure.xml"/>
@@@ -23,7 -23,7 +31,11 @@@
<entry>
<title>Fedora</title>
<
id>http://docs.fedoraproject.org/ru-RU/Fedora/opds-Fedora.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>ru-RU</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora.xml"/>
@@@ -31,7 -31,7 +43,11 @@@
<entry>
<title>Документация участника Fedora</title>
<
id>http://docs.fedoraproject.org/ru-RU/Fedora_Contributor_Documentatio...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>ru-RU</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Contributor_Documentation.xml"/>
@@@ -39,7 -39,7 +55,11 @@@
<entry>
<title>Fedora Core</title>
<
id>http://docs.fedoraproject.org/ru-RU/Fedora_Core/opds-Fedora_Core.xm...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>ru-RU</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Core.xml"/>
@@@ -47,7 -47,7 +67,11 @@@
<entry>
<title>Fedora Draft Documentation</title>
<
id>http://docs.fedoraproject.org/ru-RU/Fedora_Draft_Documentation/opds...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>ru-RU</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Draft_Documentation.xml"/>
diff --cc public_html/sk-SK/opds-Community_Services_Infrastructure.xml
index 1b89104,5c19660..3e5be73
--- a/public_html/sk-SK/opds-Community_Services_Infrastructure.xml
+++ b/public_html/sk-SK/opds-Community_Services_Infrastructure.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/sk-SK/opds-Community_Services_Infrast...
<title>Community Services Infrastructure</title>
<subtitle>Community Services Infrastructure</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/sk-SK/opds-Fedora.xml
index 95e0f89,e4476d2..c56bb07
--- a/public_html/sk-SK/opds-Fedora.xml
+++ b/public_html/sk-SK/opds-Fedora.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/sk-SK/opds-Fedora.xml</id>
<title>Fedora</title>
<subtitle>Fedora</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/sk-SK/opds-Fedora_Contributor_Documentation.xml
index 5ec0ec3,46d1b09..5d5c889
--- a/public_html/sk-SK/opds-Fedora_Contributor_Documentation.xml
+++ b/public_html/sk-SK/opds-Fedora_Contributor_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/sk-SK/opds-Fedora_Contributor_Documen...
<title>Fedora Contributor Documentation</title>
<subtitle>Fedora Contributor Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/sk-SK/opds-Fedora_Core.xml
index 94c1f71,ee05a81..e274986
--- a/public_html/sk-SK/opds-Fedora_Core.xml
+++ b/public_html/sk-SK/opds-Fedora_Core.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/sk-SK/opds-Fedora_Core.xml</id>
<title>Fedora Core</title>
<subtitle>Fedora Core</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/sk-SK/opds-Fedora_Draft_Documentation.xml
index 23a7f8e,4102c69..ceac6d9
--- a/public_html/sk-SK/opds-Fedora_Draft_Documentation.xml
+++ b/public_html/sk-SK/opds-Fedora_Draft_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/sk-SK/opds-Fedora_Draft_Documentation...
<title>Fedora Draft Documentation</title>
<subtitle>Fedora Draft Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/sk-SK/opds.xml
index 4b1f90a,e087963..14dffe0
--- a/public_html/sk-SK/opds.xml
+++ b/public_html/sk-SK/opds.xml
@@@ -6,7 -6,7 +6,11 @@@
<link
rel="http://opds-spec.org/crawlable"
type="application/atom+xml"
href="http://bookserver.archive.org/catalog/crawlable" title="Crawlable
feed"/>
<
id>http://docs.fedoraproject.org/sk-SK/opds.xml</id>
<title>Product List</title>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
@@@ -15,7 -15,7 +19,11 @@@
<entry>
<title>Community Services Infrastructure</title>
<
id>http://docs.fedoraproject.org/sk-SK/Community_Services_Infrastructu...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:49</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>sk-SK</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Community_Services_Infrastructure.xml"/>
@@@ -23,7 -23,7 +31,11 @@@
<entry>
<title>Fedora</title>
<
id>http://docs.fedoraproject.org/sk-SK/Fedora/opds-Fedora.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>sk-SK</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora.xml"/>
@@@ -31,7 -31,7 +43,11 @@@
<entry>
<title>Fedora Contributor Documentation</title>
<
id>http://docs.fedoraproject.org/sk-SK/Fedora_Contributor_Documentatio...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>sk-SK</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Contributor_Documentation.xml"/>
@@@ -39,7 -39,7 +55,11 @@@
<entry>
<title>Fedora Core</title>
<
id>http://docs.fedoraproject.org/sk-SK/Fedora_Core/opds-Fedora_Core.xm...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>sk-SK</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Core.xml"/>
@@@ -47,7 -47,7 +67,11 @@@
<entry>
<title>Fedora Draft Documentation</title>
<
id>http://docs.fedoraproject.org/sk-SK/Fedora_Draft_Documentation/opds...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>sk-SK</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Draft_Documentation.xml"/>
diff --cc public_html/sr-Latn-RS/opds-Community_Services_Infrastructure.xml
index 0382a8c,27ebd26..732bf1e
--- a/public_html/sr-Latn-RS/opds-Community_Services_Infrastructure.xml
+++ b/public_html/sr-Latn-RS/opds-Community_Services_Infrastructure.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/sr-Latn-RS/opds-Community_Services_In...
<title>Community Services Infrastructure</title>
<subtitle>Community Services Infrastructure</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/sr-Latn-RS/opds-Fedora.xml
index dff44f5,26ec4e2..f0e1d51
--- a/public_html/sr-Latn-RS/opds-Fedora.xml
+++ b/public_html/sr-Latn-RS/opds-Fedora.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/sr-Latn-RS/opds-Fedora.xml</id>
<title>Fedora</title>
<subtitle>Fedora</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/sr-Latn-RS/opds-Fedora_Contributor_Documentation.xml
index 20de9d6,4dd11c2..dde924c
--- a/public_html/sr-Latn-RS/opds-Fedora_Contributor_Documentation.xml
+++ b/public_html/sr-Latn-RS/opds-Fedora_Contributor_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/sr-Latn-RS/opds-Fedora_Contributor_Do...
<title>Fedora Contributor Documentation</title>
<subtitle>Fedora Contributor Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/sr-Latn-RS/opds-Fedora_Core.xml
index 074e42d,6e130b4..49b5b37
--- a/public_html/sr-Latn-RS/opds-Fedora_Core.xml
+++ b/public_html/sr-Latn-RS/opds-Fedora_Core.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/sr-Latn-RS/opds-Fedora_Core.xml</i...
<title>Fedora Core</title>
<subtitle>Fedora Core</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/sr-Latn-RS/opds-Fedora_Draft_Documentation.xml
index 975fa19,39678a6..7774b56
--- a/public_html/sr-Latn-RS/opds-Fedora_Draft_Documentation.xml
+++ b/public_html/sr-Latn-RS/opds-Fedora_Draft_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/sr-Latn-RS/opds-Fedora_Draft_Document...
<title>Fedora Draft Documentation</title>
<subtitle>Fedora Draft Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/sr-Latn-RS/opds.xml
index 8f6f814,5846499..9ea0247
--- a/public_html/sr-Latn-RS/opds.xml
+++ b/public_html/sr-Latn-RS/opds.xml
@@@ -6,7 -6,7 +6,11 @@@
<link
rel="http://opds-spec.org/crawlable"
type="application/atom+xml"
href="http://bookserver.archive.org/catalog/crawlable" title="Crawlable
feed"/>
<
id>http://docs.fedoraproject.org/sr-Latn-RS/opds.xml</id>
<title>Product List</title>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
@@@ -15,7 -15,7 +19,11 @@@
<entry>
<title>Community Services Infrastructure</title>
<
id>http://docs.fedoraproject.org/sr-Latn-RS/Community_Services_Infrast...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>sr-Latn-RS</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Community_Services_Infrastructure.xml"/>
@@@ -23,7 -23,7 +31,11 @@@
<entry>
<title>Fedora</title>
<
id>http://docs.fedoraproject.org/sr-Latn-RS/Fedora/opds-Fedora.xml<...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>sr-Latn-RS</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora.xml"/>
@@@ -31,7 -31,7 +43,11 @@@
<entry>
<title>Fedora Contributor Documentation</title>
<
id>http://docs.fedoraproject.org/sr-Latn-RS/Fedora_Contributor_Documen...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>sr-Latn-RS</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Contributor_Documentation.xml"/>
@@@ -39,7 -39,7 +55,11 @@@
<entry>
<title>Fedora Core</title>
<
id>http://docs.fedoraproject.org/sr-Latn-RS/Fedora_Core/opds-Fedora_Co...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>sr-Latn-RS</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Core.xml"/>
@@@ -47,7 -47,7 +67,11 @@@
<entry>
<title>Fedora Draft Documentation</title>
<
id>http://docs.fedoraproject.org/sr-Latn-RS/Fedora_Draft_Documentation...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>sr-Latn-RS</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Draft_Documentation.xml"/>
diff --cc public_html/sr-RS/opds-Community_Services_Infrastructure.xml
index 311eb96,e9bd772..48c1255
--- a/public_html/sr-RS/opds-Community_Services_Infrastructure.xml
+++ b/public_html/sr-RS/opds-Community_Services_Infrastructure.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/sr-RS/opds-Community_Services_Infrast...
<title>Community Services Infrastructure</title>
<subtitle>Community Services Infrastructure</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/sr-RS/opds-Fedora.xml
index 6a5b7ef,92405c9..63382ed
--- a/public_html/sr-RS/opds-Fedora.xml
+++ b/public_html/sr-RS/opds-Fedora.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/sr-RS/opds-Fedora.xml</id>
<title>Fedora</title>
<subtitle>Fedora</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/sr-RS/opds-Fedora_Contributor_Documentation.xml
index 1fc34c0,739fab7..4355500
--- a/public_html/sr-RS/opds-Fedora_Contributor_Documentation.xml
+++ b/public_html/sr-RS/opds-Fedora_Contributor_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/sr-RS/opds-Fedora_Contributor_Documen...
<title>Fedora Contributor Documentation</title>
<subtitle>Fedora Contributor Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/sr-RS/opds-Fedora_Core.xml
index 5e06032,95c70ec..6b1622b
--- a/public_html/sr-RS/opds-Fedora_Core.xml
+++ b/public_html/sr-RS/opds-Fedora_Core.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/sr-RS/opds-Fedora_Core.xml</id>
<title>Fedora Core</title>
<subtitle>Fedora Core</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/sr-RS/opds-Fedora_Draft_Documentation.xml
index d8312f3,8d4f1d9..d495392
--- a/public_html/sr-RS/opds-Fedora_Draft_Documentation.xml
+++ b/public_html/sr-RS/opds-Fedora_Draft_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/sr-RS/opds-Fedora_Draft_Documentation...
<title>Fedora Draft Documentation</title>
<subtitle>Fedora Draft Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/sr-RS/opds.xml
index 39788fc,f9842c6..39a8d83
--- a/public_html/sr-RS/opds.xml
+++ b/public_html/sr-RS/opds.xml
@@@ -6,7 -6,7 +6,11 @@@
<link
rel="http://opds-spec.org/crawlable"
type="application/atom+xml"
href="http://bookserver.archive.org/catalog/crawlable" title="Crawlable
feed"/>
<
id>http://docs.fedoraproject.org/sr-RS/opds.xml</id>
<title>Product List</title>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
@@@ -15,7 -15,7 +19,11 @@@
<entry>
<title>Community Services Infrastructure</title>
<
id>http://docs.fedoraproject.org/sr-RS/Community_Services_Infrastructu...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>sr-RS</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Community_Services_Infrastructure.xml"/>
@@@ -23,7 -23,7 +31,11 @@@
<entry>
<title>Fedora</title>
<
id>http://docs.fedoraproject.org/sr-RS/Fedora/opds-Fedora.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>sr-RS</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora.xml"/>
@@@ -31,7 -31,7 +43,11 @@@
<entry>
<title>Fedora Contributor Documentation</title>
<
id>http://docs.fedoraproject.org/sr-RS/Fedora_Contributor_Documentatio...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>sr-RS</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Contributor_Documentation.xml"/>
@@@ -39,7 -39,7 +55,11 @@@
<entry>
<title>Fedora Core</title>
<
id>http://docs.fedoraproject.org/sr-RS/Fedora_Core/opds-Fedora_Core.xm...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>sr-RS</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Core.xml"/>
@@@ -47,7 -47,7 +67,11 @@@
<entry>
<title>Fedora Draft Documentation</title>
<
id>http://docs.fedoraproject.org/sr-RS/Fedora_Draft_Documentation/opds...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:00</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>sr-RS</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Draft_Documentation.xml"/>
diff --cc public_html/sv-SE/opds-Community_Services_Infrastructure.xml
index 72da6d8,f88b84e..8be4c86
--- a/public_html/sv-SE/opds-Community_Services_Infrastructure.xml
+++ b/public_html/sv-SE/opds-Community_Services_Infrastructure.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/sv-SE/opds-Community_Services_Infrast...
<title>Community Services Infrastructure</title>
<subtitle>Community Services Infrastructure</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/sv-SE/opds-Fedora.xml
index 82a1a85,2661825..643cb83
--- a/public_html/sv-SE/opds-Fedora.xml
+++ b/public_html/sv-SE/opds-Fedora.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/sv-SE/opds-Fedora.xml</id>
<title>Fedora</title>
<subtitle>Fedora</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/sv-SE/opds-Fedora_Contributor_Documentation.xml
index b11cb06,bad2187..420c9ec
--- a/public_html/sv-SE/opds-Fedora_Contributor_Documentation.xml
+++ b/public_html/sv-SE/opds-Fedora_Contributor_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/sv-SE/opds-Fedora_Contributor_Documen...
<title>Fedora Contributor Documentation</title>
<subtitle>Fedora Contributor Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/sv-SE/opds-Fedora_Core.xml
index 05d4829,00774e2..c122c40
--- a/public_html/sv-SE/opds-Fedora_Core.xml
+++ b/public_html/sv-SE/opds-Fedora_Core.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/sv-SE/opds-Fedora_Core.xml</id>
<title>Fedora Core</title>
<subtitle>Fedora Core</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/sv-SE/opds-Fedora_Draft_Documentation.xml
index 200777c,34f318f..6b6a7d8
--- a/public_html/sv-SE/opds-Fedora_Draft_Documentation.xml
+++ b/public_html/sv-SE/opds-Fedora_Draft_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/sv-SE/opds-Fedora_Draft_Documentation...
<title>Fedora Draft Documentation</title>
<subtitle>Fedora Draft Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/sv-SE/opds.xml
index f9f6081,c79dbe6..a658ba2
--- a/public_html/sv-SE/opds.xml
+++ b/public_html/sv-SE/opds.xml
@@@ -6,7 -6,7 +6,11 @@@
<link
rel="http://opds-spec.org/crawlable"
type="application/atom+xml"
href="http://bookserver.archive.org/catalog/crawlable" title="Crawlable
feed"/>
<
id>http://docs.fedoraproject.org/sv-SE/opds.xml</id>
<title>Product List</title>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
@@@ -15,7 -15,7 +19,11 @@@
<entry>
<title>Community Services Infrastructure</title>
<
id>http://docs.fedoraproject.org/sv-SE/Community_Services_Infrastructu...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>sv-SE</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Community_Services_Infrastructure.xml"/>
@@@ -23,7 -23,7 +31,11 @@@
<entry>
<title>Fedora</title>
<
id>http://docs.fedoraproject.org/sv-SE/Fedora/opds-Fedora.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>sv-SE</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora.xml"/>
@@@ -31,7 -31,7 +43,11 @@@
<entry>
<title>Fedora Contributor Documentation</title>
<
id>http://docs.fedoraproject.org/sv-SE/Fedora_Contributor_Documentatio...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>sv-SE</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Contributor_Documentation.xml"/>
@@@ -39,7 -39,7 +55,11 @@@
<entry>
<title>Fedora Core</title>
<
id>http://docs.fedoraproject.org/sv-SE/Fedora_Core/opds-Fedora_Core.xm...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>sv-SE</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Core.xml"/>
@@@ -47,7 -47,7 +67,11 @@@
<entry>
<title>Fedora Draft Documentation</title>
<
id>http://docs.fedoraproject.org/sv-SE/Fedora_Draft_Documentation/opds...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>sv-SE</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Draft_Documentation.xml"/>
diff --cc public_html/ta-IN/opds-Community_Services_Infrastructure.xml
index 767ee6b,6969adc..3e397e6
--- a/public_html/ta-IN/opds-Community_Services_Infrastructure.xml
+++ b/public_html/ta-IN/opds-Community_Services_Infrastructure.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/ta-IN/opds-Community_Services_Infrast...
<title>Community Services Infrastructure</title>
<subtitle>Community Services Infrastructure</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/ta-IN/opds-Fedora.xml
index 476effc,3290979..eeebe8f
--- a/public_html/ta-IN/opds-Fedora.xml
+++ b/public_html/ta-IN/opds-Fedora.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/ta-IN/opds-Fedora.xml</id>
<title>Fedora</title>
<subtitle>Fedora</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/ta-IN/opds-Fedora_Contributor_Documentation.xml
index c68ca1b,71c6ff4..1f88881
--- a/public_html/ta-IN/opds-Fedora_Contributor_Documentation.xml
+++ b/public_html/ta-IN/opds-Fedora_Contributor_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/ta-IN/opds-Fedora_Contributor_Documen...
<title>Fedora Contributor Documentation</title>
<subtitle>Fedora Contributor Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/ta-IN/opds-Fedora_Core.xml
index 82ad062,ed537da..8a29b47
--- a/public_html/ta-IN/opds-Fedora_Core.xml
+++ b/public_html/ta-IN/opds-Fedora_Core.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/ta-IN/opds-Fedora_Core.xml</id>
<title>Fedora Core</title>
<subtitle>Fedora Core</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/ta-IN/opds-Fedora_Draft_Documentation.xml
index ba0d28a,093ec10..7ac9234
--- a/public_html/ta-IN/opds-Fedora_Draft_Documentation.xml
+++ b/public_html/ta-IN/opds-Fedora_Draft_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/ta-IN/opds-Fedora_Draft_Documentation...
<title>Fedora Draft Documentation</title>
<subtitle>Fedora Draft Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/ta-IN/opds.xml
index 67f573f,6642313..c900342
--- a/public_html/ta-IN/opds.xml
+++ b/public_html/ta-IN/opds.xml
@@@ -6,7 -6,7 +6,11 @@@
<link
rel="http://opds-spec.org/crawlable"
type="application/atom+xml"
href="http://bookserver.archive.org/catalog/crawlable" title="Crawlable
feed"/>
<
id>http://docs.fedoraproject.org/ta-IN/opds.xml</id>
<title>Product List</title>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
@@@ -15,7 -15,7 +19,11 @@@
<entry>
<title>Community Services Infrastructure</title>
<
id>http://docs.fedoraproject.org/ta-IN/Community_Services_Infrastructu...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>ta-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Community_Services_Infrastructure.xml"/>
@@@ -23,7 -23,7 +31,11 @@@
<entry>
<title>Fedora</title>
<
id>http://docs.fedoraproject.org/ta-IN/Fedora/opds-Fedora.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>ta-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora.xml"/>
@@@ -31,7 -31,7 +43,11 @@@
<entry>
<title>Fedora Contributor Documentation</title>
<
id>http://docs.fedoraproject.org/ta-IN/Fedora_Contributor_Documentatio...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>ta-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Contributor_Documentation.xml"/>
@@@ -39,7 -39,7 +55,11 @@@
<entry>
<title>Fedora Core</title>
<
id>http://docs.fedoraproject.org/ta-IN/Fedora_Core/opds-Fedora_Core.xm...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>ta-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Core.xml"/>
@@@ -47,7 -47,7 +67,11 @@@
<entry>
<title>Fedora Draft Documentation</title>
<
id>http://docs.fedoraproject.org/ta-IN/Fedora_Draft_Documentation/opds...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>ta-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Draft_Documentation.xml"/>
diff --cc public_html/te-IN/opds-Community_Services_Infrastructure.xml
index f8b382b,78b714e..58f3c71
--- a/public_html/te-IN/opds-Community_Services_Infrastructure.xml
+++ b/public_html/te-IN/opds-Community_Services_Infrastructure.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/te-IN/opds-Community_Services_Infrast...
<title>Community Services Infrastructure</title>
<subtitle>Community Services Infrastructure</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/te-IN/opds-Fedora.xml
index 3d57535,056cf9f..d974cd4
--- a/public_html/te-IN/opds-Fedora.xml
+++ b/public_html/te-IN/opds-Fedora.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/te-IN/opds-Fedora.xml</id>
<title>Fedora</title>
<subtitle>Fedora</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/te-IN/opds-Fedora_Contributor_Documentation.xml
index 8561a31,77159b5..237ffcf
--- a/public_html/te-IN/opds-Fedora_Contributor_Documentation.xml
+++ b/public_html/te-IN/opds-Fedora_Contributor_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/te-IN/opds-Fedora_Contributor_Documen...
<title>Fedora Contributor Documentation</title>
<subtitle>Fedora Contributor Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/te-IN/opds-Fedora_Core.xml
index 9520513,8a36797..1210176
--- a/public_html/te-IN/opds-Fedora_Core.xml
+++ b/public_html/te-IN/opds-Fedora_Core.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/te-IN/opds-Fedora_Core.xml</id>
<title>Fedora Core</title>
<subtitle>Fedora Core</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/te-IN/opds-Fedora_Draft_Documentation.xml
index a09ec0c,334a756..4b356ec
--- a/public_html/te-IN/opds-Fedora_Draft_Documentation.xml
+++ b/public_html/te-IN/opds-Fedora_Draft_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/te-IN/opds-Fedora_Draft_Documentation...
<title>Fedora Draft Documentation</title>
<subtitle>Fedora Draft Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/te-IN/opds.xml
index 0c41386,1e6d37e..5061a21
--- a/public_html/te-IN/opds.xml
+++ b/public_html/te-IN/opds.xml
@@@ -6,7 -6,7 +6,11 @@@
<link
rel="http://opds-spec.org/crawlable"
type="application/atom+xml"
href="http://bookserver.archive.org/catalog/crawlable" title="Crawlable
feed"/>
<
id>http://docs.fedoraproject.org/te-IN/opds.xml</id>
<title>Product List</title>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
@@@ -15,7 -15,7 +19,11 @@@
<entry>
<title>Community Services Infrastructure</title>
<
id>http://docs.fedoraproject.org/te-IN/Community_Services_Infrastructu...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>te-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Community_Services_Infrastructure.xml"/>
@@@ -23,7 -23,7 +31,11 @@@
<entry>
<title>Fedora</title>
<
id>http://docs.fedoraproject.org/te-IN/Fedora/opds-Fedora.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>te-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora.xml"/>
@@@ -31,7 -31,7 +43,11 @@@
<entry>
<title>Fedora Contributor Documentation</title>
<
id>http://docs.fedoraproject.org/te-IN/Fedora_Contributor_Documentatio...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>te-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Contributor_Documentation.xml"/>
@@@ -39,7 -39,7 +55,11 @@@
<entry>
<title>Fedora Core</title>
<
id>http://docs.fedoraproject.org/te-IN/Fedora_Core/opds-Fedora_Core.xm...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>te-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Core.xml"/>
@@@ -47,7 -47,7 +67,11 @@@
<entry>
<title>Fedora Draft Documentation</title>
<
id>http://docs.fedoraproject.org/te-IN/Fedora_Draft_Documentation/opds...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>te-IN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Draft_Documentation.xml"/>
diff --cc public_html/uk-UA/opds-Community_Services_Infrastructure.xml
index 1acd19b,26435bf..258612d
--- a/public_html/uk-UA/opds-Community_Services_Infrastructure.xml
+++ b/public_html/uk-UA/opds-Community_Services_Infrastructure.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/uk-UA/opds-Community_Services_Infrast...
<title>Community Services Infrastructure</title>
<subtitle>Community Services Infrastructure</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/uk-UA/opds-Fedora.xml
index 2911ec7,5ceaf4a..adfd4d5
--- a/public_html/uk-UA/opds-Fedora.xml
+++ b/public_html/uk-UA/opds-Fedora.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/uk-UA/opds-Fedora.xml</id>
<title>Fedora</title>
<subtitle>Fedora</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/uk-UA/opds-Fedora_Contributor_Documentation.xml
index 62d5625,8924996..46d5388
--- a/public_html/uk-UA/opds-Fedora_Contributor_Documentation.xml
+++ b/public_html/uk-UA/opds-Fedora_Contributor_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/uk-UA/opds-Fedora_Contributor_Documen...
<title>Документація для учасника розробки Fedora</title>
<subtitle>Документація для учасника розробки Fedora</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/uk-UA/opds-Fedora_Core.xml
index d835d54,9a58333..0ab64c9
--- a/public_html/uk-UA/opds-Fedora_Core.xml
+++ b/public_html/uk-UA/opds-Fedora_Core.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/uk-UA/opds-Fedora_Core.xml</id>
<title>Fedora Core</title>
<subtitle>Fedora Core</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/uk-UA/opds-Fedora_Draft_Documentation.xml
index dfe6ecd,e217646..d68e6ac
--- a/public_html/uk-UA/opds-Fedora_Draft_Documentation.xml
+++ b/public_html/uk-UA/opds-Fedora_Draft_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/uk-UA/opds-Fedora_Draft_Documentation...
<title>Чернетки документації з Fedora</title>
<subtitle>Чернетки документації з Fedora</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/uk-UA/opds.xml
index 0481704,b95b800..a3818df
--- a/public_html/uk-UA/opds.xml
+++ b/public_html/uk-UA/opds.xml
@@@ -6,7 -6,7 +6,11 @@@
<link
rel="http://opds-spec.org/crawlable"
type="application/atom+xml"
href="http://bookserver.archive.org/catalog/crawlable" title="Crawlable
feed"/>
<
id>http://docs.fedoraproject.org/uk-UA/opds.xml</id>
<title>Product List</title>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
@@@ -15,7 -15,7 +19,11 @@@
<entry>
<title>Community Services Infrastructure</title>
<
id>http://docs.fedoraproject.org/uk-UA/Community_Services_Infrastructu...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>uk-UA</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Community_Services_Infrastructure.xml"/>
@@@ -23,7 -23,7 +31,11 @@@
<entry>
<title>Fedora</title>
<
id>http://docs.fedoraproject.org/uk-UA/Fedora/opds-Fedora.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>uk-UA</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora.xml"/>
@@@ -31,7 -31,7 +43,11 @@@
<entry>
<title>Документація для учасника розробки Fedora</title>
<
id>http://docs.fedoraproject.org/uk-UA/Fedora_Contributor_Documentatio...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>uk-UA</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Contributor_Documentation.xml"/>
@@@ -39,7 -39,7 +55,11 @@@
<entry>
<title>Fedora Core</title>
<
id>http://docs.fedoraproject.org/uk-UA/Fedora_Core/opds-Fedora_Core.xm...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>uk-UA</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Core.xml"/>
@@@ -47,7 -47,7 +67,11 @@@
<entry>
<title>Чернетки документації з Fedora</title>
<
id>http://docs.fedoraproject.org/uk-UA/Fedora_Draft_Documentation/opds...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:50</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>uk-UA</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Draft_Documentation.xml"/>
diff --cc public_html/zh-CN/opds-Community_Services_Infrastructure.xml
index 4926879,1121cd8..b9f6222
--- a/public_html/zh-CN/opds-Community_Services_Infrastructure.xml
+++ b/public_html/zh-CN/opds-Community_Services_Infrastructure.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/zh-CN/opds-Community_Services_Infrast...
<title>Community Services Infrastructure</title>
<subtitle>Community Services Infrastructure</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:51</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/zh-CN/opds-Fedora.xml
index 29c21f2,48a863a..4d8dcc7
--- a/public_html/zh-CN/opds-Fedora.xml
+++ b/public_html/zh-CN/opds-Fedora.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/zh-CN/opds-Fedora.xml</id>
<title>Fedora</title>
<subtitle>Fedora</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:51</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/zh-CN/opds-Fedora_Contributor_Documentation.xml
index 08e622d,541a8fd..80980f7
--- a/public_html/zh-CN/opds-Fedora_Contributor_Documentation.xml
+++ b/public_html/zh-CN/opds-Fedora_Contributor_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/zh-CN/opds-Fedora_Contributor_Documen...
<title>Fedora Contributor Documentation</title>
<subtitle>Fedora Contributor Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:51</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/zh-CN/opds-Fedora_Core.xml
index 282641f,6c7c202..11b2449
--- a/public_html/zh-CN/opds-Fedora_Core.xml
+++ b/public_html/zh-CN/opds-Fedora_Core.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/zh-CN/opds-Fedora_Core.xml</id>
<title>Fedora Core</title>
<subtitle>Fedora Core</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:51</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/zh-CN/opds-Fedora_Draft_Documentation.xml
index 69d5c1e,6a77f08..7b8274b
--- a/public_html/zh-CN/opds-Fedora_Draft_Documentation.xml
+++ b/public_html/zh-CN/opds-Fedora_Draft_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/zh-CN/opds-Fedora_Draft_Documentation...
<title>Fedora Draft Documentation</title>
<subtitle>Fedora Draft Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:51</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/zh-CN/opds.xml
index 8792a54,cfb5c46..cc03d46
--- a/public_html/zh-CN/opds.xml
+++ b/public_html/zh-CN/opds.xml
@@@ -6,7 -6,7 +6,11 @@@
<link
rel="http://opds-spec.org/crawlable"
type="application/atom+xml"
href="http://bookserver.archive.org/catalog/crawlable" title="Crawlable
feed"/>
<
id>http://docs.fedoraproject.org/zh-CN/opds.xml</id>
<title>Product List</title>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:51</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
@@@ -15,7 -15,7 +19,11 @@@
<entry>
<title>Community Services Infrastructure</title>
<
id>http://docs.fedoraproject.org/zh-CN/Community_Services_Infrastructu...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:51</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>zh-CN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Community_Services_Infrastructure.xml"/>
@@@ -23,7 -23,7 +31,11 @@@
<entry>
<title>Fedora</title>
<
id>http://docs.fedoraproject.org/zh-CN/Fedora/opds-Fedora.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:51</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>zh-CN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora.xml"/>
@@@ -31,7 -31,7 +43,11 @@@
<entry>
<title>Fedora Contributor Documentation</title>
<
id>http://docs.fedoraproject.org/zh-CN/Fedora_Contributor_Documentatio...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:51</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>zh-CN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Contributor_Documentation.xml"/>
@@@ -39,7 -39,7 +55,11 @@@
<entry>
<title>Fedora Core</title>
<
id>http://docs.fedoraproject.org/zh-CN/Fedora_Core/opds-Fedora_Core.xm...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:51</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>zh-CN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Core.xml"/>
@@@ -47,7 -47,7 +67,11 @@@
<entry>
<title>Fedora Draft Documentation</title>
<
id>http://docs.fedoraproject.org/zh-CN/Fedora_Draft_Documentation/opds...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:51</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>zh-CN</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Draft_Documentation.xml"/>
diff --cc public_html/zh-TW/opds-Community_Services_Infrastructure.xml
index 3ba24ba,7b847c5..894d432
--- a/public_html/zh-TW/opds-Community_Services_Infrastructure.xml
+++ b/public_html/zh-TW/opds-Community_Services_Infrastructure.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/zh-TW/opds-Community_Services_Infrast...
<title>Community Services Infrastructure</title>
<subtitle>Community Services Infrastructure</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:51</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/zh-TW/opds-Fedora.xml
index a354fec,a55d07c..fe67f0d
--- a/public_html/zh-TW/opds-Fedora.xml
+++ b/public_html/zh-TW/opds-Fedora.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/zh-TW/opds-Fedora.xml</id>
<title>Fedora</title>
<subtitle>Fedora</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:51</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/zh-TW/opds-Fedora_Contributor_Documentation.xml
index 762f73f,fe0d4ca..6507f13
--- a/public_html/zh-TW/opds-Fedora_Contributor_Documentation.xml
+++ b/public_html/zh-TW/opds-Fedora_Contributor_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/zh-TW/opds-Fedora_Contributor_Documen...
<title>Fedora Contributor Documentation</title>
<subtitle>Fedora Contributor Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:51</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/zh-TW/opds-Fedora_Core.xml
index 51dd46e,03c452d..41a5b4a
--- a/public_html/zh-TW/opds-Fedora_Core.xml
+++ b/public_html/zh-TW/opds-Fedora_Core.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/zh-TW/opds-Fedora_Core.xml</id>
<title>Fedora Core</title>
<subtitle>Fedora Core</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:51</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/zh-TW/opds-Fedora_Draft_Documentation.xml
index 29a5623,baff155..897f0f4
--- a/public_html/zh-TW/opds-Fedora_Draft_Documentation.xml
+++ b/public_html/zh-TW/opds-Fedora_Draft_Documentation.xml
@@@ -6,7 -6,7 +6,11 @@@
<
id>http://docs.fedoraproject.org/zh-TW/opds-Fedora_Draft_Documentation...
<title>Fedora Draft Documentation</title>
<subtitle>Fedora Draft Documentation</subtitle>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:51</updated>
++=======
+ <updated>2012-06-24T19:46:02</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
diff --cc public_html/zh-TW/opds.xml
index 2bde1bb,7a9d89d..0e90dd0
--- a/public_html/zh-TW/opds.xml
+++ b/public_html/zh-TW/opds.xml
@@@ -6,7 -6,7 +6,11 @@@
<link
rel="http://opds-spec.org/crawlable"
type="application/atom+xml"
href="http://bookserver.archive.org/catalog/crawlable" title="Crawlable
feed"/>
<
id>http://docs.fedoraproject.org/zh-TW/opds.xml</id>
<title>Product List</title>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:51</updated>
++=======
+ <updated>2012-06-24T19:46:02</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<!--author>
<name></name>
<uri></uri>
@@@ -15,7 -15,7 +19,11 @@@
<entry>
<title>Community Services Infrastructure</title>
<
id>http://docs.fedoraproject.org/zh-TW/Community_Services_Infrastructu...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:51</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>zh-TW</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Community_Services_Infrastructure.xml"/>
@@@ -23,7 -23,7 +31,11 @@@
<entry>
<title>Fedora</title>
<
id>http://docs.fedoraproject.org/zh-TW/Fedora/opds-Fedora.xml</id>
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:51</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>zh-TW</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora.xml"/>
@@@ -31,7 -31,7 +43,11 @@@
<entry>
<title>Fedora Contributor Documentation</title>
<
id>http://docs.fedoraproject.org/zh-TW/Fedora_Contributor_Documentatio...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:51</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>zh-TW</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Contributor_Documentation.xml"/>
@@@ -39,7 -39,7 +55,11 @@@
<entry>
<title>Fedora Core</title>
<
id>http://docs.fedoraproject.org/zh-TW/Fedora_Core/opds-Fedora_Core.xm...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:51</updated>
++=======
+ <updated>2012-06-24T19:46:01</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>zh-TW</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Core.xml"/>
@@@ -47,7 -47,7 +67,11 @@@
<entry>
<title>Fedora Draft Documentation</title>
<
id>http://docs.fedoraproject.org/zh-TW/Fedora_Draft_Documentation/opds...
++<<<<<<< HEAD
+ <updated>2012-06-26T15:10:51</updated>
++=======
+ <updated>2012-06-24T19:46:02</updated>
++>>>>>>> c5a4b900e8a79466db6745a14af06d43f76d4ad8
<dc:language>zh-TW</dc:language>
<content type="text"></content>
<link type="application/atom+xml"
href="opds-Fedora_Draft_Documentation.xml"/>