commit 36c11ffb66b4d8f107e85a0175825ae70136ed03
Author: Glen Rundblom <grundblom(a)fedoraproject.org>
Date: Sun Nov 1 18:37:45 2015 -0600
Made entities entries for the Fedora Common bugs wiki page and added it into the
feedback.xml file
en-US/Feedback.xml | 9 ++-------
en-US/Release_Notes.ent | 2 +-
2 files changed, 3 insertions(+), 8 deletions(-)
---
diff --git a/en-US/Feedback.xml b/en-US/Feedback.xml
index 2fa5e2a..8b7314e 100644
--- a/en-US/Feedback.xml
+++ b/en-US/Feedback.xml
@@ -24,13 +24,8 @@
Bugs And Feature Requests</ulink>.
A list of commonly reported bugs and known issues for this
release is available from <ulink
-<<<<<<< HEAD
-
url="http://fedoraproject.org/wiki/Common_F23_bugs">
- Common F&PRODVER; bugs</ulink>, on the wiki.
-=======
- url="&FBUGURL;">
- Common bugs</ulink>, on the wiki.
->>>>>>> f23
+ url="&FEDBUGURL;">
+ Common Fedora bugs</ulink> on the wiki.
</para>
<para>
To provide feedback on the Release Notes, use &BZURL;.
diff --git a/en-US/Release_Notes.ent b/en-US/Release_Notes.ent
index ba9788b..51d0722 100644
--- a/en-US/Release_Notes.ent
+++ b/en-US/Release_Notes.ent
@@ -7,7 +7,7 @@
<!ENTITY PREVVER "22">
<!ENTITY EOLVER "21">
<!ENTITY KERNEL "4.2.0">
-<!ENTITY FBUGURL
"http://fedoraproject.org/wiki/Common_F&PRODVER;_bugs">
+<!ENTITY FEDBUGURL
"http://fedoraproject.org/wiki/Common_F&PRODVER;_bugs">
<!ENTITY BZURL "<ulink
url='https://bugzilla.redhat.com/enter_bug.cgi?product=&PRODUCT;&...
<!ENTITY CHANGEURL "<ulink
url='https://fedoraproject.org/wiki/Releases/&PRODVER;/ChangeSet&...