new make and index toc

git-svn-id: svn+ssh://svn.debian.org/svn/secure-testing@31376 e39458fd-73e7-0310-bf30-c45bca0a0e42

3 files changed, 13 insertions, 28 deletions

diff --git a/doc/security-team.d.o/Makefile b/doc/security-team.d.o/Makefile
index 5d52bd1ded..a1ecfa864f 100644
--- a/doc/security-team.d.o/Makefile
+++ b/doc/security-team.d.o/Makefile
@@ -1,10 +1,11 @@
 # to be executed on dillon.debian.org
 MD=/usr/bin/markdown_py
 SOURCES=security_tracker glossary index contact
-DEST=/srv/security-team.debian.org/htdocs
 HTMLS=$(patsubst %,$(DEST)/%.html,$(SOURCES))
 EXTENSIONS=tables def_list toc
 
+export DEST=$(CURDIR)
+
 all: $(HTMLS)
 
 $(DEST)/%.html: %
@@ -17,5 +18,6 @@ clean:
 
 rebuild: clean all
 
-publish:
+publish: $(HTMLS)
+	cp $(HTMLS) /srv/security-team.debian.org/htdocs
 	static-update-component security-team.debian.org
diff --git a/doc/security-team.d.o/glossary b/doc/security-team.d.o/glossary
index 0ba71df266..512e283f03 100644
--- a/doc/security-team.d.o/glossary
+++ b/doc/security-team.d.o/glossary
@@ -1,5 +1,7 @@
 # Glossary
 
+DSA, SPU, embargo, etc...
+
 <a id="CVE">CVE id</a>
 :  *Common Vulnerabilities and Exposures* id.
    In order to refer to a vulnerability, an id provided by [Mitre](#mitre) is used.
diff --git a/doc/security-team.d.o/index b/doc/security-team.d.o/index
index d4347ee671..9f374064ea 100644
--- a/doc/security-team.d.o/index
+++ b/doc/security-team.d.o/index
@@ -39,14 +39,8 @@ Security team documentation
 This is more a TODO list than an index. For now.
 Please, feel free to [contribute with this document](http://anonscm.debian.org/viewvc/secure-testing/doc/security-team.d.o/).
 
-* Organization
-    - Contributors: Members of the security-testing alioth project, the "tracker"
-    - Assistants: Members of the private list, no access to private key 
-    - Members: "core" members
-    - How to become a member.
-    - What kind of work you can do with each grant
-* Workflow Overview
-    - some sort of introduction?
+* [Organization](organization.html)
+  - How to contribute with the security team
 * [How to interact with the security team](contact.html)
     - As a vulnerability reporter
         - public issues
@@ -56,22 +50,9 @@ Please, feel free to [contribute with this document](http://anonscm.debian.org/v
         - SPU vulnerability
         - Just unstable
     - As an upstream? (embargo issues? backporting patches?)
-* How to contribute with the security team
+* [Internal tasks tasks](tasks.html)
+    - [DSA release](dsa_release.html)
 * [How to interact with the Security Tracker](security_tracker.html)
-    - How to contribute to the security tracker code (Florian)
-    - Add `<unsupported>` #555164
-* Member's tasks
-    - DSA release: A more structured version of the current wiki pages
-    - embargo issues: Private queue in RT
-    - proposed-updates
-    - Take care of the "Special" packages (e.g. kernel iceweasel)
-    - Front desk
-    - Managing CVE ids pool: how to ask more ids
-    - Access to private key
-    - Access to upstream bug trackers
-* Debugging situations:
-    - what happens after an upload of a package to chopin
-    - where to find logs
-    - reject uploads
-* [Glossary](glossary.html)
-    - DSA, SPU, embargo, etc...
+    - How to contribute to the security tracker code
+* [Troubleshooting tips](tips.html)
+* [Glossary](glossary.html) TODO