diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2008-02-15 14:54:25 -0500 |
|---|---|---|
| committer | Michael DeHaan <mdehaan@redhat.com> | 2008-02-15 14:54:25 -0500 |
| commit | a47ee22ab684eed992128b60b136fca90ff9f119 (patch) | |
| tree | cd55daf8057049368b4aaa6d23c30408eae411d2 /website/new/documentation.html | |
| parent | 70bfc8f5a3150d09cc064a4c46efcaff80b29904 (diff) | |
| parent | a7d67f35019af0c25f133c979112fc6035d7e04c (diff) | |
| download | third_party-cobbler-a47ee22ab684eed992128b60b136fca90ff9f119.tar.gz third_party-cobbler-a47ee22ab684eed992128b60b136fca90ff9f119.tar.xz third_party-cobbler-a47ee22ab684eed992128b60b136fca90ff9f119.zip | |
Merge branch 'devel'
Merging devel work on 0.7.X/0.8 release with master
Conflicts:
CHANGELOG
cobbler.spec
cobbler/action_import.py
cobbler/utils.py
cobbler/webui/master.py
setup.py
Diffstat (limited to 'website/new/documentation.html')
| -rw-r--r-- | website/new/documentation.html | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/website/new/documentation.html b/website/new/documentation.html index c5c5b09..c1981f9 100644 --- a/website/new/documentation.html +++ b/website/new/documentation.html @@ -21,7 +21,8 @@ <h3>Open Office Presentations</h3> <ul> -<li><a href="docs/cobbler_summit.odp">Red Hat Summit 5/2007</A></li> +<li><a href="http://fedorapeople.org/~mdehaan/files/cobbler/cobbler7.odp">FudCON 2008 (Raleigh) Update & Overview</A></li> +<li><a href="docs/cobbler_summit.odp">Red Hat Summit (San Diego) 5/2007</A></li> <li><a href="docs/cobbler.odp">Older Slides</A> (somewhat out of date)</li> </ul> |