Removed # from kickstart templates (unneeded), webpage updates based on new content,

and removed TODO since that will now be available on trac as an RFE list.

6 files changed, 22 insertions, 22 deletions

diff --git a/TODO b/TODO
deleted file mode 100644
index 20a4a1e..0000000
--- a/TODO
+++ /dev/null
@@ -1,17 +0,0 @@
-cobbler TODO list.
-
--  manpage cleanup (ongoing)
--  (ongoing) better documentation and online articles
--  "check" should check if services (esp httpd) are started
--  better kickstart tracking solution
--  GTK (or Web) UI for Cobbler ?
--  have -v or --version
--  (in progress) i18n cobbler -- replace cobbler_msg bits
--  (koan) LVM support to override disk image choice, include graphics?
--  (koan) investigate SELinux issues
--  OMAPI/omshell integration for dhcpd
--  no logrotate or cleanup for /var/log/cobbler (kickstart tracking)
--  build net-install CD images
--  build non-net-install CD from cobbler profile
--  have pre and post triggers, check return codes and validate
--  make is_valid throw exceptions that explains exactly what is wrong.
diff --git a/kickstarts/kickstart_fc5.ks b/kickstarts/kickstart_fc5.ks
index 4de0f30..a7d6cdc 100644
--- a/kickstarts/kickstart_fc5.ks
+++ b/kickstarts/kickstart_fc5.ks
@@ -47,7 +47,7 @@ d2=\$3
 cat << EOF >> /tmp/partinfo
 part / --fstype ext3 --size=1024 --grow --ondisk=\$d1 --asprimary
 part swap --size=1024 --ondisk=\$d1 --asprimary
-#EOF
+EOF
 
 %packages
 
diff --git a/kickstarts/kickstart_fc6.ks b/kickstarts/kickstart_fc6.ks
index f656691..c9ab925 100644
--- a/kickstarts/kickstart_fc6.ks
+++ b/kickstarts/kickstart_fc6.ks
@@ -49,7 +49,7 @@ d2=\$3
 cat << EOF >> /tmp/partinfo
 part / --fstype ext3 --size=1024 --grow --ondisk=\$d1 --asprimary
 part swap --size=1024 --ondisk=\$d1 --asprimary
-#EOF
+EOF
 
 %packages
 
diff --git a/website/new/communicate.html b/website/new/communicate.html
index 16cbf66..6274b16 100644
--- a/website/new/communicate.html
+++ b/website/new/communicate.html
@@ -7,8 +7,21 @@
 <li>Mailling List Archives: <a href="https://www.redhat.com/archives/et-mgmt-tools/">https://www.redhat.com/archives/et-mgmt-tools/</a></li>
 <li>gmane.org RSS feed of et-mgmt-tools: <a href="http://blog.gmane.org/gmane.linux.redhat.et-mgmt-tools"><img src="img/rss_entries.png" alt="rss entries" style="vertical-align: middle;"></a></li>
 </ul>
+
 <h3>Internet Relay Chat (IRC)</h3>
 <p>Cobbler has a chat room on <strong><a href="http://www.freenode.net/">irc.freenode.net</a></strong> ... <strong>#cobbler</strong>:</p>
 
 <p> If no one seems to be responding to your requests in IRC, feel free to ask your questions on the mailing list. (It's quite common for IRC users to 'idle' their nicks in a channel so they can catch up on any conversation they missed later on.)</p>
 <p class="note"><strong>Note:</strong> irc.freenode.net has an IRC 'nick' (nickname, the name you go by in chat) registration system. Some irc.freenode.net channels require that you identify with the server every time you log in. This identification is also required for private messages on the network (no, they're not ignoring you; you probably just haven't identified with the registration system!) For more information, please consult <a href="http://freenode.net/faq.shtml#contents-userregistration">the Freenode Frequently-Asked Questions page on user registration</a>.</p>
+
+<h3>User Submitted Content</h3>
+
+As mentioned in the documentation section, <A HREF="http://cobbler.et.redhat.com/documentation.php">Cobbler has a Wiki</A> for user submitted content.
+
+<h3>Bugs/Features</h3>
+
+Bugs and Features for all distributions can be filed on the <A HREF="https://hosted.fedoraproject.org/projects/cobbler/">Cobbler</A> and <A HREF="https://hosted.fedoraproject.org/projects/koan/">Koan</A> Trac pages.  Cobbler and koan also have <A HREF="http://bugzilla.redhat.com">bugzilla</A> components if you are using Fedora and prefer to post items there.   Regardless, the mailing list and the IRC channel are very active -- so if you need help, you do not need to file a bug report unless you want to do so.
+
+
+
+
diff --git a/website/new/documentation.html b/website/new/documentation.html
index 29e07ed..5bb2bde 100644
--- a/website/new/documentation.html
+++ b/website/new/documentation.html
@@ -24,9 +24,13 @@
 <li><a href="docs/cobbler.odp">Older Slides</A> (somewhat out of date)</li>
 </ul>
 
+<h3>Additional Information</h3>
+
+The <A HREF="http://hosted.fedoraproject.org/projects/cobbler/">Cobbler Wiki</A> is a place for reading and submitting documentation, how-to articles, and other content.  Any one can add content and is encouraged to do so.  For information on creating an account <A HREF="https://admin.fedoraproject.org/accounts/">see the Fedora Account Systems page</A>.  <A HREF="http://hosted.fedoraproject.org/projects/koan/">koan</A> also has some Wiki space, though in general, content should be posted to the Cobbler Wiki</A> with the exception of koan bug reports and features. 
+
 <h3>More Advanced Topics</h3>
 
-Some of these topics are developer-centric and evolve frequently, so they're still hosted on our companion Wiki.  Stop by #cobbler on irc.freenode.net if you would like to ask questions!
+Information on the cobbler API, the Triggers mechanism (for interfacing with other programs), and Cobbler's XMLRPC interface are kept on the <A HREF="http://hosted.fedoraproject.org/projects/cobbler/wiki/DeveloperDocs">Developer Docs</A> section of the <A HREF="http://hosted.fedoraproject.org/projects/cobbler/">Wiki</A>.  For questions on this content, stop by the <A HREF="http://cobbler.et.redhat.com/communicate.php">IRC channel or mailing list</A>.
 
 <ul>
 <li><a HREF="http://et.redhat.com/page/Cobbler_API">Cobbler API</a></li>
diff --git a/website/new/download.html b/website/new/download.html
index 5717035..9ccd899 100644
--- a/website/new/download.html
+++ b/website/new/download.html
@@ -6,8 +6,8 @@
 <p>The latest source code (it's all Python) is available through git:</p>
 
 <blockquote>
-git clone git://et.redhat.com/cobbler<br/>
-git clone git://et.redhat.com/koan
+git clone git://git.fedoraproject.org/git/hosted/cobbler<br/>
+git clone git://git.fedoraproject.org/git/hosted/koan
 </blockquote>
 </p>