Changeset 69588

Timestamp:

Sep 27, 2016, 12:59:11 PM (8 years ago)

Author:

wenzeslaus

Message:

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.

Location:

grass/trunk

Files:

• doc/gi_miscellaneous.jpg (moved) (moved from grass/trunk/doc/gi_misc.jpg )
• man/Makefile (modified) (1 diff)
• man/build_class.py (modified) (1 diff)
• man/build_class_graphical.py (modified) (2 diffs)
• man/build_class_rest.py (modified) (1 diff)
• man/build_graphical_index.py (modified) (1 diff)
• man/build_html.py (modified) (1 diff)
• man/build_rest.py (modified) (1 diff)
• tools/mkhtml.py (modified) (2 diffs)
• tools/mkrest.py (modified) (1 diff)

grass/trunk/man/Makefile

@@ -18 +18 @@
         g:general \
         i:imagery \
-        m:misc \
+        m:miscellaneous \
         ps:postscript \
         r:raster \

grass/trunk/man/build_class.py

@@ -11 +11 @@
 
 
-no_intro_page_classes = ['display', 'general', 'misc', 'postscript']
+no_intro_page_classes = ['display', 'general', 'miscellaneous', 'postscript']
 
 os.chdir(html_dir)

grass/trunk/man/build_class_graphical.py

@@ -139 +139 @@
     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
@@ -211 +211 @@
         ('g', 'general'),
         ('i', 'imagery'),
-        ('m', 'misc'),
+        ('m', 'miscellaneous'),
         ('ps', 'postscript'),
         ('r', 'raster'),

grass/trunk/man/build_class_rest.py

@@ -23 +23 @@
 
 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))

grass/trunk/man/build_graphical_index.py

@@ -99 +99 @@
     ('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'),

grass/trunk/man/build_html.py

@@ -174 +174 @@
       <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>

grass/trunk/man/build_rest.py

@@ -140 +140 @@
     :maxdepth: 1
     
-        Miscellaneous commands manual <misc>
+        Miscellaneous commands manual <miscellaneous>
         GRASS variables and environment variables <variables>
 

grass/trunk/tools/mkhtml.py

@@ -259 +259 @@
     'g' : 'general',
     'i' : 'imagery',
-    'm' : 'misc',
+    'm' : 'miscellaneous',
     'ps': 'postscript',
     'p' : 'paint',
@@ -270 +270 @@
 
 
-# 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"""

grass/trunk/tools/mkrest.py

@@ -100 +100 @@
     'g': 'general',
     'i': 'imagery',
-    'm': 'misc',
+    'm': 'miscellaneous',
     'ps': 'postscript',
     'p': 'paint',