Clean up index up to and including G

45 files changed, 76 insertions, 72 deletions

diff --git a/decisions/decisions.bux b/decisions/decisions.bux
index 153968e..85ad745 100644
--- a/decisions/decisions.bux
+++ b/decisions/decisions.bux
@@ -7,7 +7,7 @@ reply-to header;mailing lists;reply-to-list
 154594
 SPF;dev.gentoo.org
 174405
-SLOT;dependencies!slot depends
+SLOT;dependencies!slot operator
 174407
 dynamic SLOT;SLOT!dynamic
 174410
@@ -29,7 +29,7 @@ arches!slacking
 234708
 arch!arm;arch!sh;arch!s390
 234710
-as-needed
+as-needed;--as-needed
 234711
 GLEP!54;scm version suffix;live suffix
 234713
@@ -37,9 +37,9 @@ GLEP!55;EAPI suffix
 234716
 Code of Conduct!extent;Code of Conduct!enforcement
 237381
-council!appeals process
+council!appeal process
 256453
-council!meeting process;council!agenda
+council!meeting!process;council!meeting!agenda
 273620
 package!sys-apps/portage;EAPI!3;EAPI!4
 273625
@@ -63,7 +63,7 @@ PV;devmanual
 331987
 mailing list!gentoo-council;mailing list!gentoo-project
 341959
-eclasses!removal policy
+eclasses!removal
 362803
 project!qa;GLEP!48
 374931
@@ -73,11 +73,11 @@ council!election;project!elections
 424647
 archives.gentoo.org
 457000
-council meeting!missing summary;council meeting!missing log
+council!meeting!missing summary;council!meeting!missing log
 458866
 NEEDED.ELF.2;/var/db/pkg;GLEP!64;PMS
 477030
-council meeting!missing summary
+council!meeting!missing summary
 480408
 autobuilds;project!releng
 481202
@@ -85,17 +85,17 @@ separate /usr
 485448
 council!web page
 565566
-ChangeLog files!sort order
+ChangeLog!sort order
 565700
 EAPI!6!approval
 566498
-eclass!games.eclass;games!group
+eclass!games;games!group
 568068
 GLEP!42;news item
 574080
-eclass!games.eclass;games!install paths
+eclass!games;games!install paths
 574082
-eclass!games.eclass!deprecation
+eclass!games!deprecation
 574952
 project!games
 579460
diff --git a/decisions/summary-20051115.tex b/decisions/summary-20051115.tex
index 4b10778..b0884ce 100644
--- a/decisions/summary-20051115.tex
+++ b/decisions/summary-20051115.tex
@@ -2,7 +2,7 @@
 \summary{2005}{11}{15}
 
 \agendaitem{GLEP 41}
-\index{arch testers}\index{GLEP!process}
+\index{arch testers}\index{GLEPs!process}
 
 The authors of \glep{41} made the changes to the GLEP's wording as
 requested by the council during October's meeting.  Thus, it was brought
diff --git a/decisions/summary-20060112.tex b/decisions/summary-20060112.tex
index 5943257..cbc070c 100644
--- a/decisions/summary-20060112.tex
+++ b/decisions/summary-20060112.tex
@@ -3,7 +3,7 @@
 
 
 \agendaitem{GLEP 45 - GLEP date format}
-\index{GLEP!45}\index{GLEP!date format}
+\index{GLEP!45}\index{GLEPs!date format}
 
 As stated on the mailing lists minor changes to GLEP's and the GLEP 
 process is best left in the hands of the GLEP editors. Everybody 
diff --git a/decisions/summary-20060914.tex b/decisions/summary-20060914.tex
index a22e575..6dcf6ad 100644
--- a/decisions/summary-20060914.tex
+++ b/decisions/summary-20060914.tex
@@ -3,7 +3,7 @@
 
 
 \agendaitem{"Impromptu" council meetings}
-\index{council meetings}
+\index{council!meeting!impromptu}
 
 First, we voted if we should allow "impromptu" meetings, outside of the
 monthly schedule.  This passed with 6/7 votes, with vapier abstaining
diff --git a/decisions/summary-20070111.tex b/decisions/summary-20070111.tex
index 760a8a2..fdb86a2 100644
--- a/decisions/summary-20070111.tex
+++ b/decisions/summary-20070111.tex
@@ -20,7 +20,7 @@ Kugelfang visited the issue of the contents of /usr/libexec. Diego and
 
 
 \agendaitem{Retirement / stepping down of a council member}
-\index{council member!retiring}
+\index{council!members!retiring}
 
 Kugelfang wanted to know about the process for council members stepping
   down. This was prompted by solely by Flameeye's message to the council
@@ -53,7 +53,7 @@ Robbat2 brought up the status of the SPF documentation. Kloeri said that he
 
 
 \agendaitem{Meeting agendas}
-\index{council meeting!agenda}
+\index{council!meeting!agenda}
 
 Robbat2 requested that for helping to get an agenda together in future, all
   council members should just braindump their potential minor items to the
@@ -85,7 +85,7 @@ Wolf31o2 proposed the concept of council-managed projects. These are to be
 
 
 \agendaitem{Open Floor}
-\index{Sealand}\index{Gentoo Foundation}
+\index{Sealand}\index{foundation}
 
 KingTaco jokingly asked if the Gentoo Foundation could afford to buy
   Sealand, which lead into real queries about the current financial reports.
diff --git a/decisions/summary-20070208.tex b/decisions/summary-20070208.tex
index 86ba267..d8c4ed0 100644
--- a/decisions/summary-20070208.tex
+++ b/decisions/summary-20070208.tex
@@ -3,7 +3,7 @@
 
 
 \agendaitem{Leaving council members}
-\index{council member!retiring}\index{slacker mark}
+\index{council!members!retiring}\index{slacker mark}
 
 Change to council \glep{39} to cover when a Council member is no longer part
   of the Gentoo project (the reason/rhyme is irrelevant).  The idea is to
diff --git a/decisions/summary-20070614.tex b/decisions/summary-20070614.tex
index dab2684..69e8429 100644
--- a/decisions/summary-20070614.tex
+++ b/decisions/summary-20070614.tex
@@ -3,7 +3,7 @@
 
 
 \agendaitem{Council membership}
-\index{council!membership}
+\index{council!members}
 
 Council vote approves jaervosz replacing kloeri.
 
@@ -18,7 +18,7 @@ robbat2 to write a doc on using Git to access the PMS repo (which presently
 \agendaitem{Handling of mailing lists, including proctors and moderation}
 \index{mailing lists}\index{mailing list!gentoo-project}
 \index{mailig list!gentoo-dev}\index{project!proctors}
-\index{Code of Conduct}\index{Freenode Catalyst}
+\index{Code of Conduct}\index{freenode!catalyst}
 
 Large discussion about handling of mailing lists, including proctors and
 moderation. Vote is proposed for:
diff --git a/decisions/summary-20080612.tex b/decisions/summary-20080612.tex
index 9b6b22d..5ea29dc 100644
--- a/decisions/summary-20080612.tex
+++ b/decisions/summary-20080612.tex
@@ -104,7 +104,7 @@ Decision: We approved dberkholz's proposal.
 
 
 \agendaitem{as-needed by default}
-\index{as-needed}\index{LDFLAGS}
+\index{as-needed}\index{--as-needed}\index{LDFLAGS}
 
 antarus requested that we vote on whether to add it to the default 
 LDFLAGS.
diff --git a/decisions/summary-20080911.tex b/decisions/summary-20080911.tex
index da8544f..b697bf2 100644
--- a/decisions/summary-20080911.tex
+++ b/decisions/summary-20080911.tex
@@ -15,7 +15,7 @@ Result: Cardoe is a new council member.
 
 
 \agendaitem{PMS as a draft standard of EAPI 0}
-\index{PMS}\index{EAPI!0}\index{EAPI!0!acceptance}
+\index{PMS}\index{EAPI!0}\index{EAPI!0!approval}
 
 Goal: Vote whether to approve PMS as a draft standard of EAPI 0.
 
diff --git a/decisions/summary-20090212.tex b/decisions/summary-20090212.tex
index d266936..1868c13 100644
--- a/decisions/summary-20090212.tex
+++ b/decisions/summary-20090212.tex
@@ -14,7 +14,7 @@
 	   are raised in 1 day, it is posted to the council page and lists.
 
 \agendaitem{Council Elections}
-\index{council!elections}
+\index{council!election}
 
     	Should there be staggered elections every 6 months where half the
 	    council members stand for reelection?
diff --git a/decisions/summary-20090312.tex b/decisions/summary-20090312.tex
index f1e3da5..589844d 100644
--- a/decisions/summary-20090312.tex
+++ b/decisions/summary-20090312.tex
@@ -95,7 +95,7 @@ dependencies}\index{dependencies!multislot}
         
 \agendaitem{GLEP 54}
 
-        Thomas(tanderson) sent out a comparison of \glep{54 }and the liveebuild 
+        Thomas(tanderson) sent out a comparison of \glep{54} and the liveebuild 
 proposals.
         Among those discussing GLEP 54 there was a general consensus that
         there was nothing wrong with it as a first step to get correct
diff --git a/decisions/summary-20090326.tex b/decisions/summary-20090326.tex
index 907d083..3a48821 100644
--- a/decisions/summary-20090326.tex
+++ b/decisions/summary-20090326.tex
@@ -15,6 +15,7 @@
 \index{unpack}\index{docompress}\index{doexample}\index{dohard}
 \index{disable-dependency-tracking}\index{die}\index{DOCS}
 \index{$\vert\vert$ dependencies}\index{dependencies!$\vert\vert$}
+\index{--disable-dependency-tracking}
 
     A call for objections to/questions about any of the various proposals
     was asked for. What follows is a list of proposals to which objections were
diff --git a/decisions/summary-20090423.tex b/decisions/summary-20090423.tex
index 020f14a..f212849 100644
--- a/decisions/summary-20090423.tex
+++ b/decisions/summary-20090423.tex
@@ -36,8 +36,8 @@
             Conclusion:
                 Voted to not be included in EAPI 3.
  \item
- Ban $\vert\vert$ ( use? ( ... ) ... ) \index{$\vert\vert$ 
- dependencies}\index{dependencies!$\vert\vert$}
+ Ban $\vert\vert$ ( use? ( ... ) ... ) 
+ \index{$\vert\vert$ dependencies}\index{dependencies!$\vert\vert$}
 
             Mart Raudsepp(leio) argued that banning such constructs is
             strictly a QA issue and shouldn't be covered by PMS, while others
@@ -60,6 +60,7 @@
  New econf options,
           '--disable-dependency-tracking' / '--enable-fast-install'
  \index{disable-dependency-tracking}\index{enable-fast-install}
+ \index{--disable-dependency-tracking}\index{--enable-fast-install}
 
             The addition of '--enable-fast-install' was opposed because it is
             already a libtool default and as such is useless. No arguments
diff --git a/decisions/summary-20090528.tex b/decisions/summary-20090528.tex
index c05d80b..0d21bf6 100644
--- a/decisions/summary-20090528.tex
+++ b/decisions/summary-20090528.tex
@@ -72,7 +72,7 @@ Various developers have raised concerns that \glep{55} only describes a
 \item
  For "Use newer bash features", listing useful (including
             in-tree) bash features not available in the bash version mandated
-            by PMS would be useful.\index{bash!features}
+            by PMS would be useful.\index{bash!features in ebuilds}
 \end{enumerate}
 
         Conclusion:
diff --git a/decisions/summary-20090611.tex b/decisions/summary-20090611.tex
index fa57539..c13315b 100644
--- a/decisions/summary-20090611.tex
+++ b/decisions/summary-20090611.tex
@@ -29,7 +29,7 @@ Reference: \bug{273620}
 
 
 \agendaitem{BASH 4 in EAPI 3}
-\index{EAPI!3}\index{bash!version in ebuilds}
+\index{EAPI!3}\index{bash!features in ebuilds}
 
         There were three parts to this topic:
 \begin{enumerate}
diff --git a/decisions/summary-20091109.tex b/decisions/summary-20091109.tex
index a64257d..e5d2683 100644
--- a/decisions/summary-20091109.tex
+++ b/decisions/summary-20091109.tex
@@ -29,7 +29,7 @@ Action: ulm will follow up on the open questions on gentoo-dev.
 
 
 \agendaitem{Usage of bash 3.2 features in Portage tree}
-\index{bash!version in ebuilds}
+\index{bash!features in ebuilds}
 
 \vote{Usage of bash 3.2 features in the Portage tree is
 allowed. PMS will be updated accordingly.}{6 yes, 1 no}
diff --git a/decisions/summary-20091207.tex b/decisions/summary-20091207.tex
index e81ca2b..4438547 100644
--- a/decisions/summary-20091207.tex
+++ b/decisions/summary-20091207.tex
@@ -3,7 +3,7 @@
 
 
 \agendaitem{Actions}
-\index{council!voting!by e-mail}
+\index{council!votes!by mail}
 
 \begin{itemize}
  \item 
diff --git a/decisions/summary-20100726.tex b/decisions/summary-20100726.tex
index d2408a5..155d978 100644
--- a/decisions/summary-20100726.tex
+++ b/decisions/summary-20100726.tex
@@ -3,7 +3,7 @@
 
 
 \agendaitem{add --as-needed to default profile's LDFLAGS}
-\index{--as-needed}\index{LDFLAGS}
+\index{as-needed}\index{--as-needed}\index{LDFLAGS}
 
 passed by unanimous vote;
 			scarabeus will create a news item,
@@ -53,7 +53,7 @@ a patch to devmanual and PMS (ferring will do the devmanual patch)
 \index{mailing list!gentoo-council}
 \index{mailing list!gentoo-dev}
 \index{mailing list!gentoo-project}
-\index{council!meeting agenda}
+\index{council!meeting!agenda}
 
 Should we post council agenda to -council? -dev? -project?
 
diff --git a/decisions/summary-20110111.tex b/decisions/summary-20110111.tex
index 218e28f..1a02493 100644
--- a/decisions/summary-20110111.tex
+++ b/decisions/summary-20110111.tex
@@ -11,6 +11,7 @@ the empty seat, with this being his first meeting.
 
 \agendaitem{Bug 211529}
 \index{EAPI!5}\index{EAPI!4}\index{disable-dependency-tracking}\index{econf}
+\index{--disable-dependency-tracking}
 
 Reference: \bug{211529}
 
diff --git a/decisions/summary-20110408.tex b/decisions/summary-20110408.tex
index 40d4954..e3fb86e 100644
--- a/decisions/summary-20110408.tex
+++ b/decisions/summary-20110408.tex
@@ -10,7 +10,7 @@ them, so we'll leave them for next year.
 
 
 \agendaitem{Council web app}
-\index{council web app}\index{GSOC}
+\index{council!web app}\index{GSoC}
 
 Petteri asked for this topic to be added to the meeting right before it start as 
 a student submitted an application for GSoC for doing a council application 
@@ -27,7 +27,7 @@ over it.
 
 
 \agendaitem{progress on the slacking arches topic}
-\index{arches!slacking}\index{arches!manpower}\index{automated testing}
+\index{arches!slacking}\index{automated testing}
 \index{statistics}\index{arches!resources}
 
 Jorge explained to the other council members that he had planned to start a new 
diff --git a/decisions/summary-20110809.tex b/decisions/summary-20110809.tex
index 326ea67..79a5f4d 100644
--- a/decisions/summary-20110809.tex
+++ b/decisions/summary-20110809.tex
@@ -3,7 +3,7 @@
 
 
 \agendaitem{Required advance notice for council meetings}
-\index{council!meeting process}
+\index{council!meeting!process}
 
 \vote{7 days vs 2 days}{Result: 1-week notice is required}
 
diff --git a/decisions/summary-20111108.tex b/decisions/summary-20111108.tex
index 7de4207..f278cc7 100644
--- a/decisions/summary-20111108.tex
+++ b/decisions/summary-20111108.tex
@@ -13,7 +13,7 @@ and the Council still expects appropriate messages to be used.
 
 
 \agendaitem{Eclasses policy}
-\index{eclasses!API changes}
+\index{eclasses!api changes}
 
 \vote{Are developers allowed to remove functions from
 eclasses, or change the API in general?}{
diff --git a/decisions/summary-20120814.tex b/decisions/summary-20120814.tex
index fd31599..be83771 100644
--- a/decisions/summary-20120814.tex
+++ b/decisions/summary-20120814.tex
@@ -27,7 +27,7 @@ There are currently no open bugs.
 
 
 \agendaitem{Open floor}
-\index{EAPI!when bumping}\index{EAPI!deprecation}\index{EAPI!1}
+\index{EAPI!usage when bumping}\index{EAPI!deprecation}\index{EAPI!1}
 \index{EAPI!0}
 
 scarabeus suggested the change "dev should use latest eapi when bumping"
diff --git a/decisions/summary-20120911.tex b/decisions/summary-20120911.tex
index c3adbc8..57578cb 100644
--- a/decisions/summary-20120911.tex
+++ b/decisions/summary-20120911.tex
@@ -4,7 +4,7 @@
 
 \agendaitem{EAPI 5 features}
 \index{EAPI!5}\index{slot operators}\index{subslots}\index{IUSE}
-\index{REQUIRED_USE}\index{EAPI!assignment in ebuilds}\index{src_test}
+\index{REQUIRED_USE}\index{EAPI!specification in ebuilds}\index{src_test}
 \index{use.stable.mask}\index{has_version}\index{usex}\index{doheader}
 \index{EAPI!4}\index{license groups}\index{EJOBS}\index{eclasses!sourcing}
 \index{dohtml}\index{cross-compiling}\index{HDEPEND}\index{make.defaults}
diff --git a/decisions/summary-20121009.tex b/decisions/summary-20121009.tex
index 1eb8039..5e61dbe 100644
--- a/decisions/summary-20121009.tex
+++ b/decisions/summary-20121009.tex
@@ -51,7 +51,7 @@ LinuxDays Prague, which will take place 20th and 21st of October 2012.
 
 
 \agendaitem{Open Floor}
-\index{package!sys-fs/udev}\index{in_iuse}\index{EAPI!6}\index{git migration}
+\index{package!sys-fs/udev}\index{in_iuse}\index{EAPI!6}\index{git!migration}
 \index{unified dependencies}
 
 chainsaw and williamh informed us about developments on udev at the
diff --git a/decisions/summary-20130212.tex b/decisions/summary-20130212.tex
index ff7df7e..e871ca9 100644
--- a/decisions/summary-20130212.tex
+++ b/decisions/summary-20130212.tex
@@ -11,7 +11,7 @@ files.  The bug will be closed.
 
 
 \agendaitem{Any other business from council members}
-\index{gpg}\index{commit signing}\index{git migration}
+\index{gpg}\index{commit signing}\index{git!migration}
 \index{council!elegibility}
 
 grobian:
diff --git a/decisions/summary-20130409.tex b/decisions/summary-20130409.tex
index 36a3701..f733548 100644
--- a/decisions/summary-20130409.tex
+++ b/decisions/summary-20130409.tex
@@ -2,7 +2,7 @@
 \summary{2013}{4}{9}
 
 \agendaitem{Change to newer Bash version in ebuilds}
-\index{bash}\index{EAPI!6}
+\index{bash!features in ebuilds}\index{EAPI!6}
 
 References:
 \begin{itemize}
@@ -54,7 +54,7 @@ Three votes were taken:
 \end{itemize}
   
 \agendaitem{Open floor}
-\index{GSOC}\index{subslots}\index{slot operators}
+\index{GSoC}\index{subslots}\index{slot operators}
 
 \begin{itemize}
 \item
diff --git a/decisions/summary-20130730.tex b/decisions/summary-20130730.tex
index d305419..4be9e21 100644
--- a/decisions/summary-20130730.tex
+++ b/decisions/summary-20130730.tex
@@ -21,7 +21,7 @@ discussion}
 2 yes, 5 no - not carried}
 
 \agendaitem{Meeting format 2: "shift council votes to mail instead of IRC"}
-\index{council!votes on bugzila}\index{council!votes by mail}
+\index{council!votes!on bugzila}\index{council!votes!by mail}
 
 \vote{Shift council votes to mail instead of IRC}{5 no - not carried}
 
diff --git a/decisions/summary-20140114.tex b/decisions/summary-20140114.tex
index c35c6d9..da050ab 100644
--- a/decisions/summary-20140114.tex
+++ b/decisions/summary-20140114.tex
@@ -41,7 +41,7 @@ to EAPI 5.}{Approved unanimously.}
 
 
 \agendaitem{GLEP 1/2: GLEP workflow updates and shift to wiki}
-\index{GLEP!workflow}\index{Wiki}
+\index{GLEPs!workflow}\index{wiki}
 
 References:
 \begin{itemize}
diff --git a/decisions/summary-20140610.tex b/decisions/summary-20140610.tex
index c6b7140..ad1274e 100644
--- a/decisions/summary-20140610.tex
+++ b/decisions/summary-20140610.tex
@@ -2,9 +2,9 @@
 \summary{2014}{6}{10}
 
 \agendaitem{Approve Preliminary EAPI 6 Features}
-\index{EAPI!6}\index{get\_libdir()}\index{einstalldocs()}\index{IUSE\_EFFECTIVE}
-\index{DOCS}\index{unpack}\index{Bash}\index{failglob}\index{PATCHES}
-\index{src\_prepare}
+\index{EAPI!6}\index{get\_libdir}\index{einstalldocs}\index{IUSE\_EFFECTIVE}
+\index{DOCS}\index{unpack}\index{bash!features in ebuilds}\index{failglob}\index{PATCHES}
+\index{src_prepare}
 
 These were discussed/voted in blocks as suggested by ulm in discussion,
 but I'm going to split them up in the summary for clarity.  See the log
@@ -12,7 +12,7 @@ for the details of how things went:
 
 \begin{itemize}
  \item 
- \vote{get\_libdir(), \bug{463586}: 
+ \vote{get_libdir(), \bug{463586}: 
 Used in econf, but so far not available as separate PM function}{
 Aye: blueness, dberkholz, dilfridge, rich0, ulm}
 \item
diff --git a/decisions/summary-20140812.tex b/decisions/summary-20140812.tex
index bcab1cc..5060e7a 100644
--- a/decisions/summary-20140812.tex
+++ b/decisions/summary-20140812.tex
@@ -2,7 +2,7 @@
 \summary{2014}{8}{12}
 
 \agendaitem{Handling of bash-completion}
-\index{bash completion}
+\index{bash!completion}
 
 Reference: \agoref{gentoo-project}{b69cab4b36b6b3c6e68be82df09c2d36}
 
@@ -25,7 +25,7 @@ functions in eclasses altogether. Council members expressed different
 opinions on this. No vote was taken.
 
 \agendaitem{Games team policies}
-\index{Games team}
+\index{project!games}
 
 Reference: http://thread.gmane.org/gmane.linux.gentoo.project/3919 (broken link)
 
diff --git a/decisions/summary-20140826.tex b/decisions/summary-20140826.tex
index d671d6a..e4c75c0 100644
--- a/decisions/summary-20140826.tex
+++ b/decisions/summary-20140826.tex
@@ -3,6 +3,7 @@
 
 \agendaitem{Dynamic dependencies in Portage}
 \index{dynamic dependencies}\index{package!sys-apps/portage}
+\index{dependencies!dynamic}
 
 Reference: \agoref{gentoo-project}{6db80f9a66d80a3c4ec0480690ce77e4}
 
diff --git a/decisions/summary-20141014.tex b/decisions/summary-20141014.tex
index 500211d..0f8a3d9 100644
--- a/decisions/summary-20141014.tex
+++ b/decisions/summary-20141014.tex
@@ -19,7 +19,7 @@ aye: blueness, dberkholz, dilfridge, radhermit, rich0;
 abstain: creffett (proxy for ulm), williamh}
 
 \agendaitem{Git Migration Issues}
-\index{git migration}\index{ChangeLog!and git}\index{gentoo-news}
+\index{git!migration}\index{ChangeLog!and git}\index{gentoo-news}
 \index{CVS headers}
 
 \vote{do we need to continue to create new ChangeLog entries once we're 
@@ -43,4 +43,4 @@ migration project to proceed at their pace.}{Aye: blueness, creffett (proxy for
 ulm), dberkholz, dilfridge, radhermit, rich0, williamh}
 
 (Meeting was called due to time, with remaining items to be covered following 
-week.) 
\ No newline at end of file
+week.) 
diff --git a/decisions/summary-20141021.tex b/decisions/summary-20141021.tex
index 58b371b..0eafcd0 100644
--- a/decisions/summary-20141021.tex
+++ b/decisions/summary-20141021.tex
@@ -11,7 +11,7 @@ how to implement this will be worked out in the lists before the next
 meeting.}{Aye: blueness, dilfridge, radhermit, rich0, ulm, williamh}
 
 \agendaitem{Status of Games Team}
-\index{games team}\index{project!Games}
+\index{project!games}
 
 \vote{Council deferrs to radhermit to continue working with the games team on
 the organization issues for another month.  Council will reach out to
diff --git a/decisions/summary-20141111.tex b/decisions/summary-20141111.tex
index 73dba6f..45ea9a8 100644
--- a/decisions/summary-20141111.tex
+++ b/decisions/summary-20141111.tex
@@ -20,7 +20,7 @@ rich0, ulm, williamh}
 
 
 \agendaitem{Future.eclass}
-\index{eclass!future.eclass}\index{EAPI!6}\index{EAPI!5}
+\index{eclass!future}\index{EAPI!6}\index{EAPI!5}
 
 Reference: http://thread.gmane.org/gmane.linux.gentoo.devel/93609 (broken link)
 
@@ -42,7 +42,7 @@ Abstain: dberkholz}
 
 
 \agendaitem{Allowing die within subshells in EAPI 6}
-\index{die in subshells}\index{EAPI!6}
+\index{die!in subshells}\index{EAPI!6}
 
 This was suggested late, off-list, and with no list discussion.  I
 recommend deferring any decisions, but if anybody wants to take the
@@ -60,7 +60,7 @@ decision yet.
 
 
 \agendaitem{Status of Games Team}
-\index{games team}\index{project!games}
+\index{project!games}
 
 The council agreed to re-iterate the call for volunteers and for QA to
 take action where necessary.  However, there are no new decisions.
diff --git a/decisions/summary-20141209.tex b/decisions/summary-20141209.tex
index 4838578..54aee7e 100644
--- a/decisions/summary-20141209.tex
+++ b/decisions/summary-20141209.tex
@@ -4,7 +4,7 @@
 
 \agendaitem{Bug 523828: GLEP 42 update: Unify gentoo-news repo and rsync 
 structure}
-\index{GLEP!42}\index{gentoo-news.git}
+\index{GLEP!42}\index{gentoo-news}
 
 Reference: \bug{523828}
 
diff --git a/decisions/summary-20150210.tex b/decisions/summary-20150210.tex
index 808a11f..2979485 100644
--- a/decisions/summary-20150210.tex
+++ b/decisions/summary-20150210.tex
@@ -24,7 +24,7 @@ project.}{Adopted unanimously.}
 
 
 \agendaitem{Open floor}
-\index{project!games}\index{eclass!games.eclass}\index{games!install paths}
+\index{project!games}\index{eclass!games}\index{games!install paths}
 
 The current status of the games team was brought up. As radhermit pointed out, 
 the team seems to be active, and given that noone is required to use games.eclass
diff --git a/decisions/summary-20151011.tex b/decisions/summary-20151011.tex
index e9ea77d..96cd0f7 100644
--- a/decisions/summary-20151011.tex
+++ b/decisions/summary-20151011.tex
@@ -35,7 +35,7 @@ match 1.20).
 
 
 \agendaitem{Runtime dependencies and dynamic dependency deprecation}
-\index{dynamic dependencies}
+\index{dynamic dependencies}\index{dependencies!dynamic}
 
 References: 
 \begin{itemize}
@@ -59,7 +59,7 @@ decisions on policies may also be up to the QA team.
 
 
 \agendaitem{Games policies}
-\index{games!policies}\index{games!group}\index{games!install path}
+\index{games!policies}\index{games!group}\index{games!install paths}
 
 Reference: \agoref{gentoo-project}{16fc54d2bced9ff51b71d387eb0fb36b}
 
diff --git a/decisions/summary-20151213.tex b/decisions/summary-20151213.tex
index da533e3..3386e0d 100644
--- a/decisions/summary-20151213.tex
+++ b/decisions/summary-20151213.tex
@@ -2,7 +2,7 @@
 \summary{2015}{12}{13}
 
 \agendaitem{Games file-path policy}
-\index{EAPI!6}\index{games!file paths}\index{eclass!games.eclass}
+\index{EAPI!6}\index{games!install paths}\index{eclass!games}
 
 References:
 \begin{itemize}
diff --git a/decisions/summary-20160214.tex b/decisions/summary-20160214.tex
index ce63e5e..f6d97f2 100644
--- a/decisions/summary-20160214.tex
+++ b/decisions/summary-20160214.tex
@@ -56,7 +56,7 @@ Some question which arise and should be answered by the project comprise
   maintains the necessary patches?
 \end{itemize}
 
-\agendaitem{Automatic bug assignments}\index{Bug assignment}\index{Bug wrangling}
+\agendaitem{Automatic bug assignments}\index{bugs!assignment}\index{bugs!wrangling}
 
 Reference: \agoref{gentoo-project}{00e02ff494857599633e2bbc30520ca3}
 
@@ -66,7 +66,7 @@ point the Council sees no reason for any decision to be made itself.
 The community or the bug wrangling project should draft an implementation.
 
 
-\agendaitem{The usage of use() in global scope violates PMS}\index{use()}\index{PMS}\index{Dynamic SLOT}
+\agendaitem{The usage of use() in global scope violates PMS}\index{use()}\index{PMS}\index{dynamic SLOT}
 
 Reference: \agoref{gentoo-project}{69ed522b3b53de90e616267a77441012}
 
diff --git a/decisions/summary-20160313.tex b/decisions/summary-20160313.tex
index bf0d82e..f2850a3 100644
--- a/decisions/summary-20160313.tex
+++ b/decisions/summary-20160313.tex
@@ -31,8 +31,8 @@ solution is delegated to QA."
 \item \bug{575534}: 
 The Council considered bug 575534.  It was not clear
 why the council was cc-ed and no action was taken.
-\item \bug{574952} and \bug{574080}: \index{Games 
-team}\index{eclass!games.eclass}
+\item \bug{574952} and \bug{574080}: \index{project!games}
+\index{eclass!games}
 The Council reiterated its position but did not see how we can force the Games 
 Team to take action.  It was suggested that QA act to correct the paths in the
 games.eclass.
diff --git a/decisions/summary-20160410.tex b/decisions/summary-20160410.tex
index bf688b1..669c806 100644
--- a/decisions/summary-20160410.tex
+++ b/decisions/summary-20160410.tex
@@ -2,7 +2,7 @@
 \summary{2016}{4}{10}
 
 \agendaitem{Approval of GLEP 68}
-\index{Language codes}
+\index{Language codes}\index{GLEP!68!approval}
 
 Reference: \agoref{gentoo-project}{a292e9567fac838681899b50dff24cce}
 
@@ -15,7 +15,7 @@ This can be reconsidered when a real need for extension should arise.
 \end{itemize}
 
 \agendaitem{ChangeLog files in rsync tree}
-\index{ChangeLog files}\index{rsync tree}\index{ChangeLog sort order}
+\index{ChangeLog}\index{rsync tree}\index{ChangeLog!sort order}
 
 Reference: \agoref{gentoo-project}{402eb403e0f451e7bc0525b76e9d3da2}
 
@@ -35,7 +35,7 @@ order of ChangeLog entries.
 \end{itemize}
 
 \agendaitem{Bugs with council involvement}
-\index{eclass!games.eclass}
+\index{eclass!games}
 
 \begin{itemize}
 \item \bug{569914}, \bug{571490}:
diff --git a/decisions/summary-20160710.tex b/decisions/summary-20160710.tex
index 43e8286..711f40a 100644
--- a/decisions/summary-20160710.tex
+++ b/decisions/summary-20160710.tex
@@ -32,7 +32,7 @@ ComRel.
   
 \agendaitem{Open floor}
 \index{maintainer-needed!packages}
-\index{ComRel}
+\index{project!comrel}
 
 Items discussed:
 \begin{itemize}
diff --git a/decisions/summary-20161009.tex b/decisions/summary-20161009.tex
index 3829d09..9df3294 100644
--- a/decisions/summary-20161009.tex
+++ b/decisions/summary-20161009.tex
@@ -9,7 +9,7 @@ historical git conversion, but no ETA for the fix yet. council invites Infra to
 give some more insights at the next meeting.
 
 \agendaitem{Open floor}
-\index{graveyard overlay}
+\index{overlay!graveyard}
 
 WilliamH wanted the council discuss the availability of the graveyard overlay
 through layman. The overlay contains packages dropped out from the main
diff --git a/decisions/summary-20161113.tex b/decisions/summary-20161113.tex
index 0cc4073..67a6a55 100644
--- a/decisions/summary-20161113.tex
+++ b/decisions/summary-20161113.tex
@@ -2,7 +2,7 @@
 \summary{2016}{11}{13}
 
 \agendaitem{Stabilisation workflow}
-\index{stabilization}\index{bugzilla workflow}
+\index{stabilization}\index{bugzilla!workflow}
 
 Reference: \agoref{gentoo-project}{1ccf2b07b96f4b164e6f69fb5d2d6cc7}
 
@@ -13,7 +13,7 @@ An update to \glep{40} and a change of the bugzilla workflow are likely
 to be proposed. No council action to be taken, for the time being.
 
 \agendaitem{Status of contributors}
-\index{Foundation!bylaws}\index{umbrella organization}
+\index{foundation!bylaws}\index{umbrella organization}
 
 Reference: \agoref{gentoo-project}{4a88db38253494c6612a29117b2b19c8}