浏览代码

doc: keyword name is miscellaneous, so use it for the page as well

Parser (print_escaped_for_html_keywords()) just writes the keyword names
but the file was called misc and the keyword miscellaneous.

This makes the URL or index name harder to type manually
but it makes (first) keyword links work (for m.* modules)
and it makes the titles and link texts Miscellaneous instead
of Misc.


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@69588 15284696-431f-4ddb-bdfa-cd5b030d7da7
Vaclav Petras 8 年之前
父节点
当前提交
7668839e74

doc/gi_misc.jpg → doc/gi_miscellaneous.jpg


+ 1 - 1
man/Makefile

@@ -17,7 +17,7 @@ categories = \
 	db:database \
 	g:general \
 	i:imagery \
-	m:misc \
+	m:miscellaneous \
 	ps:postscript \
 	r:raster \
 	r3:raster3d \

+ 1 - 1
man/build_class.py

@@ -10,7 +10,7 @@ import string
 from build_html import *
 
 
-no_intro_page_classes = ['display', 'general', 'misc', 'postscript']
+no_intro_page_classes = ['display', 'general', 'miscellaneous', 'postscript']
 
 os.chdir(html_dir)
 

+ 2 - 2
man/build_class_graphical.py

@@ -138,7 +138,7 @@ def generate_page_for_category(short_family, module_family, imgs, year,
               "Manual: Graphical index" % grass_version))
     output.write(header_graphical_index_tmpl)
 
-    if module_family.lower() not in ['general', 'misc', 'postscript']:
+    if module_family.lower() not in ['general', 'miscellaneous', 'postscript']:
         if module_family == 'raster3d':
             # covert keyword to nice form
             module_family = '3D raster'
@@ -210,7 +210,7 @@ def main():
         ('db', 'database'),
         ('g', 'general'),
         ('i', 'imagery'),
-        ('m', 'misc'),
+        ('m', 'miscellaneous'),
         ('ps', 'postscript'),
         ('r', 'raster'),
         ('r3', 'raster3d'),

+ 1 - 1
man/build_class_rest.py

@@ -22,7 +22,7 @@ filename = modclass + ".txt"
 f = open(filename + ".tmp", 'wb')
 
 write_rest_header(f, "GRASS GIS %s Reference Manual: %s" % (grass_version, modclass))
-if modclass.lower() not in ['general', 'misc', 'postscript']:
+if modclass.lower() not in ['general', 'miscellaneous', 'postscript']:
     f.write(modclass_intro_tmpl.substitute(modclass = modclass, modclass_lower = modclass.lower()))
 f.write(modclass_tmpl.substitute(modclass = modclass))
 

+ 1 - 1
man/build_graphical_index.py

@@ -98,7 +98,7 @@ index_items = [
     ('imagery_graphical.html', std_img_name('imagery'), 'Imagery'),
     ('raster3d_graphical.html', std_img_name('raster3d'), '3D raster'),
     ('temporal_graphical.html', std_img_name('temporal'), 'Temporal'),
-    ('misc_graphical.html', std_img_name('misc'), 'Miscellaneous'),
+    ('miscellaneous_graphical.html', std_img_name('miscellaneous'), 'Miscellaneous'),
     ('postscript_graphical.html', std_img_name('cartography'), 'Cartography'),
     ('wxGUI_graphical.html', std_img_name('gui'), 'GUI'),
     ('wxGUI.nviz.html', std_img_name('3dview'), '3D view'),

+ 1 - 1
man/build_html.py

@@ -173,7 +173,7 @@ r"""<!-- the files grass${grass_version_major}.html & helptext.html file live in
       </td>
       <td width="33%" valign="top" class="box"><h3>&nbsp;Miscellaneous&nbsp;&amp;&nbsp;Variables</h3>
        <ul>
-        <li class="box"><a href="misc.html">Miscellaneous commands manual</a></li>
+        <li class="box"><a href="miscellaneous.html">Miscellaneous commands manual</a></li>
         <li class="box"><a href="variables.html">GRASS variables and environment variables</a></li>
        </ul>
       </td>

+ 1 - 1
man/build_rest.py

@@ -139,7 +139,7 @@ Miscellaneous & Variables
 .. toctree::
     :maxdepth: 1
     
-        Miscellaneous commands manual <misc>
+        Miscellaneous commands manual <miscellaneous>
         GRASS variables and environment variables <variables>
 
 Temporal processing

+ 2 - 2
tools/mkhtml.py

@@ -258,7 +258,7 @@ index_names = {
     'db': 'database',
     'g' : 'general',
     'i' : 'imagery',
-    'm' : 'misc',
+    'm' : 'miscellaneous',
     'ps': 'postscript',
     'p' : 'paint',
     'r' : 'raster',
@@ -269,7 +269,7 @@ index_names = {
     }
 
 
-# TODO: special code for ps/postscript/PostScirpt and m/misc/Miscellaneous
+# TODO: special code for ps/postscript/PostScirpt
 def to_title(name):
     """Convert name of command class/family to form suitable for title"""
     if name == 'raster3d':

+ 1 - 1
tools/mkrest.py

@@ -99,7 +99,7 @@ index_names = {
     'db': 'database',
     'g': 'general',
     'i': 'imagery',
-    'm': 'misc',
+    'm': 'miscellaneous',
     'ps': 'postscript',
     'p': 'paint',
     'r': 'raster',