# HG changeset patch
# User Tom Fredrik "BFG" Klaussen <bfg@blenning.no>
# Date 1349909694 -7200
# Node ID 2e6ba72592818882b31a02fb49c6b196e50b0b3d
# Parent  3898353ed1d83d8c35c1d3d262faf9296c2bcb9b# Parent  2cfea6e84694c08294b72209e4163a8d9613bab8
Merge

diff -r 3898353ed1d8 -r 2e6ba7259281 Doxyfile
--- a/Doxyfile	Thu Oct 11 00:48:46 2012 +0200
+++ b/Doxyfile	Thu Oct 11 00:54:54 2012 +0200
@@ -38,7 +38,7 @@
 # for a project that appears at the top of each page and should give viewer
 # a quick idea about the purpose of the project. Keep the description short.
 
-PROJECT_BRIEF          =
+PROJECT_BRIEF          = "An extremely simple CMS"
 
 # With the PROJECT_LOGO tag one can specify an logo or icon that is
 # included in the documentation. The maximum height of the logo should not
diff -r 3898353ed1d8 -r 2e6ba7259281 accept-language.inc
--- a/accept-language.inc	Thu Oct 11 00:48:46 2012 +0200
+++ b/accept-language.inc	Thu Oct 11 00:54:54 2012 +0200
@@ -1,7 +1,23 @@
 <?php
+<<<<<<< local
 class Language {
   function acceptedLanguages() {
     $langs = array();
+=======
+/**
+ * @file
+ * Functionality for determining language use
+ */
+
+/**
+ * Extracts the accepted languages from the GET query, sorted by
+ * preference(q-value).
+ *
+ * @return associative array of language codes with q value
+ */
+function acceptedLanguages() {
+  $langs = array();
+>>>>>>> other
 
     if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
       // break up string into pieces (languages and q factors)
diff -r 3898353ed1d8 -r 2e6ba7259281 common-functions.inc
--- a/common-functions.inc	Thu Oct 11 00:48:46 2012 +0200
+++ b/common-functions.inc	Thu Oct 11 00:54:54 2012 +0200
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @file
+ * Functionality which doesn't belong anywhere else
+ */
 include_once 'CacheTimeCheck.inc';
 
 $baseDir = dirname(__FILE__);
diff -r 3898353ed1d8 -r 2e6ba7259281 constants.inc
--- a/constants.inc	Thu Oct 11 00:48:46 2012 +0200
+++ b/constants.inc	Thu Oct 11 00:54:54 2012 +0200
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @file
+ * Definitions of constants
+ */
 define(VERBOSITY_NONE, 0);
 define(VERBOSITY_ERROR, 1);
 define(VERBOSITY_WARNING, 10);
diff -r 3898353ed1d8 -r 2e6ba7259281 filters.inc
--- a/filters.inc	Thu Oct 11 00:48:46 2012 +0200
+++ b/filters.inc	Thu Oct 11 00:54:54 2012 +0200
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @file
+ * Filters which may be used from xml
+ */
 function activeNav($input, $options)
 {
   $name = $options->getName();
diff -r 3898353ed1d8 -r 2e6ba7259281 flag.php
--- a/flag.php	Thu Oct 11 00:48:46 2012 +0200
+++ b/flag.php	Thu Oct 11 00:54:54 2012 +0200
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @file
+ * Displays a flag, in an active or disabled state, depending on parameters
+ */
 define(DEBUG,0);
 
 include_once 'CacheTimeCheck.inc';
diff -r 3898353ed1d8 -r 2e6ba7259281 index.php
--- a/index.php	Thu Oct 11 00:48:46 2012 +0200
+++ b/index.php	Thu Oct 11 00:54:54 2012 +0200
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @file
+ * Main access point for webpages
+ */
 include_once 'constants.inc';
 
 $cacheable = true;
diff -r 3898353ed1d8 -r 2e6ba7259281 inputParser.inc
--- a/inputParser.inc	Thu Oct 11 00:48:46 2012 +0200
+++ b/inputParser.inc	Thu Oct 11 00:54:54 2012 +0200
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @file
+ * Functionality for translating an XML document into a webpage
+ */
 function getParam($param)
 {
   $param_type=$param->getAttribute("type");
diff -r 3898353ed1d8 -r 2e6ba7259281 logger.inc
--- a/logger.inc	Thu Oct 11 00:48:46 2012 +0200
+++ b/logger.inc	Thu Oct 11 00:54:54 2012 +0200
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @file
+ * Common access point for logging
+ */
 function logMsg($level, $msg)
 {
   if (DEBUG_LEVEL >= $level) {
diff -r 3898353ed1d8 -r 2e6ba7259281 sitemap.php
--- a/sitemap.php	Thu Oct 11 00:48:46 2012 +0200
+++ b/sitemap.php	Thu Oct 11 00:54:54 2012 +0200
@@ -1,4 +1,8 @@
 <?
+/**
+ * @file
+ * Generates a sitemap
+ */
 $out = '<?xml version="1.0" encoding="UTF-8"?>';
 $out .= "\n";
 $out .= '<urlset