diff --git a/_config.py b/_config.py index 907621a1f..11e26bd7f 100644 --- a/_config.py +++ b/_config.py @@ -48,10 +48,10 @@ ## blog_timezone -- the timezone that you normally write your blog posts from blog.timezone = "US/Eastern" -controllers.docs.enabled = True +controllers.documentation.enabled = True controllers.community.enabled = True -docs = controllers.docs -docs.path = 'docs' +documentation = controllers.documentation +documentation.path = 'documentation' diff --git a/_controllers/docs.py b/_controllers/documentation.py similarity index 83% rename from _controllers/docs.py rename to _controllers/documentation.py index 4c0ce3aca..8a1fd3928 100644 --- a/_controllers/docs.py +++ b/_controllers/documentation.py @@ -11,7 +11,7 @@ import shutil import glob -sys.path.append(os.path.join(os.path.realpath(__file__)[0:-(len(os.path.join('_controllers','docs.py'))+1)],'_tools')) +sys.path.append(os.path.join(os.path.realpath(__file__)[0:-(len(os.path.join('_controllers','documentation.py'))+1)],'_tools')) #sys.path.append( os.path.realpath('')+"/../_tools" ) import markdown_file @@ -69,8 +69,8 @@ def __parse_element(self, element): def run(): classes = [] - directory = "_docs" - docs = bf.config.controllers.docs + directory = "_documentation" + documentation = bf.config.controllers.documentation classes = markdown_file.getclass_list() for clazz_name in classes: @@ -83,7 +83,7 @@ def run(): "clazz": clazz, "functions": functions_file } - bf.writer.materialize_template("docs_class.mako", ('docs',clazz.module+"/"+clazz.name+".html"), env ) + bf.writer.materialize_template("documentation_class.mako", ('documentation',clazz.module+"/"+clazz.name+".html"), env ) function_files = markdown_file.getfunctionsfiles_list() for functionfile_name in function_files: @@ -95,11 +95,11 @@ def run(): "clazz": None, "functions": functions_file } - bf.writer.materialize_template("docs_class.mako", ('docs',functions_file.module+"/"+functions_file.name+".html"), env ) + bf.writer.materialize_template("documentation_class.mako", ('documentation',functions_file.module+"/"+functions_file.name+".html"), env ) # process index file - indexhtml_file = open("_docs/" + "index.markdown",'r') + indexhtml_file = open("_documentation/" + "index.markdown",'r') indexhtml = indexhtml_file.read() columns = [] columns_src = indexhtml.split('___column___') @@ -112,7 +112,7 @@ def run(): blocks.append(b) columns.append(blocks) - indexhtml_file = open("_docs/" + "indexAddons.markdown",'r') + indexhtml_file = open("_documentation/" + "indexAddons.markdown",'r') indexhtml = indexhtml_file.read() addons_columns = [] columns_src = indexhtml.split('___column___') @@ -125,19 +125,19 @@ def run(): blocks.append(b) addons_columns.append(blocks) - bf.writer.materialize_template("docs.mako", ('docs',"index.html"), {'columns':columns,'addons_columns':addons_columns} ) + bf.writer.materialize_template("documentation.mako", ('documentation',"index.html"), {'columns':columns,'addons_columns':addons_columns} ) for root, dirs, files in os.walk(directory): for name in files: file_split = os.path.splitext(name) if file_split[1]==".jpeg" or file_split[1]==".jpg" or file_split[1]==".gif" or file_split[1]==".png": try: - os.mkdir(os.path.join('_site','docs',os.path.basename(root))) + os.mkdir(os.path.join('_site','documentation',os.path.basename(root))) except: pass - shutil.copyfile(os.path.join(root,name), os.path.join('_site','docs',os.path.basename(root),name)) + shutil.copyfile(os.path.join(root,name), os.path.join('_site','documentation',os.path.basename(root),name)) - #html = open(docs.dir + "/" + class_fn + ".html",'w') + #html = open(documentation.dir + "/" + class_fn + ".html",'w') #html.write(p.content) #html.close() diff --git a/_dbtools/db2markdown.py b/_dbtools/db2markdown.py index c6ce256b5..4c95fa1a6 100755 --- a/_dbtools/db2markdown.py +++ b/_dbtools/db2markdown.py @@ -2,21 +2,21 @@ import os import sys -import docs_group -import docs_files -import docs_function -import docs_members +import documentation_group +import documentation_files +import documentation_function +import documentation_members import MySQLdb -docs_root = "/home/arturo/Documentos/new_of_site/_docs" +documentation_root = "/home/arturo/Documentos/new_of_site/_documentation" -index = open(docs_root + "/index.markdown",'w') +index = open(documentation_root + "/index.markdown",'w') db = MySQLdb.connect(host='localhost',user='root',passwd='asdqwe34',db='of_site09') -adv_groups = docs_group.list_all(db,'core',True) +adv_groups = documentation_group.list_all(db,'core',True) def export_vars(db,clazz_file,clazz): - variables = docs_members.list_all_vars(db,clazz.id) + variables = documentation_members.list_all_vars(db,clazz.id) for var in variables: #if var.visible and not var.advanced index.write(var.name+'\n\n') @@ -39,7 +39,7 @@ def export_vars(db,clazz_file,clazz): def export_methods(db,clazz_file,clazz): - methods = docs_members.list_all_methods(db,clazz.id) + methods = documentation_members.list_all_methods(db,clazz.id) for method in methods: #if method.visible and not method.advanced if len(method.parameters.replace(' ',''))>0: @@ -66,7 +66,7 @@ def export_methods(db,clazz_file,clazz): clazz_file.write("\n\n\n\n\n\n\n\n\n\n\n\n") def export_classes(db,group_dir,group): - classes = docs_files.list_all_classes(db,group.id) + classes = documentation_files.list_all_classes(db,group.id) for clazz in classes: print str(clazz.id) + " " + clazz.name + " " + str(clazz.new) clazz_file = open(group_dir+"/"+clazz.name+".markdown",'w') @@ -76,7 +76,7 @@ def export_classes(db,group_dir,group): index.write('__advanced: ' + ('true' if clazz.advanced else 'false' ) + '__\n\n') index.write('__methods__\n\n') - #clazz_file.write( '<%inherit file="_templates/docs.mako" />\n' ) + #clazz_file.write( '<%inherit file="_templates/documentation.mako" />\n' ) clazz_file.write( '#class ' + clazz.name + "\n\n" ) @@ -99,10 +99,10 @@ def export_classes(db,group_dir,group): clazz_file.close() def export_groups(db,advanced): - groups = docs_group.list_all(db,'core',advanced) + groups = documentation_group.list_all(db,'core',advanced) for group in groups: print str(group.id) + " " + group.name - group_dir = docs_root + "/" + group.name.replace(' ','_') + group_dir = documentation_root + "/" + group.name.replace(' ','_') #index.write("//----------------------\n\n") index.write("##" + group.name + "##\n\n") try: @@ -113,7 +113,7 @@ def export_groups(db,advanced): -#index.write( '<%inherit file="_templates/docs.mako" />\n' ) +#index.write( '<%inherit file="_templates/documentation.mako" />\n' ) index.write( '\n' ) export_groups(db,False) export_groups(db,True) diff --git a/_dbtools/dbfunctions2markdown.py b/_dbtools/dbfunctions2markdown.py index 79a8dba6a..3c293a251 100755 --- a/_dbtools/dbfunctions2markdown.py +++ b/_dbtools/dbfunctions2markdown.py @@ -5,19 +5,19 @@ sys.path.append('_tools') -import docs_group +import documentation_group import dbtools_group import dbtools_files import dbtools_functions -import docs_members -from docs_function import DocsFunctionsFile, DocsFunction +import documentation_members +from documentation_function import DocsFunctionsFile, DocsFunction import MySQLdb import markdown_file -docs_root = "/home/arturo/Documentos/new_of_site/_docs" +documentation_root = "/home/arturo/Documentos/new_of_site/_documentation" -#index = open(docs_root + "/index.markdown",'w') +#index = open(documentation_root + "/index.markdown",'w') db = MySQLdb.connect(host='localhost',user='root',passwd='asdqwe34',db='of_site09') adv_groups = dbtools_group.list_all(db,'core',True) @@ -45,7 +45,7 @@ def export_groups(db,advanced): groups = dbtools_group.list_all(db,'core',advanced) for group in groups: print str(group.id) + " " + group.name - group_dir = docs_root + "/" + group.name.replace(' ','_') + group_dir = documentation_root + "/" + group.name.replace(' ','_') try: os.mkdir(group_dir) except: diff --git a/_dbtools/dbtools_class.py b/_dbtools/dbtools_class.py index 83baec9dc..690a1641c 100644 --- a/_dbtools/dbtools_class.py +++ b/_dbtools/dbtools_class.py @@ -3,7 +3,7 @@ def list_all(db,fileid): cursor=db.cursor() - sql='SELECT id,name,visible,advanced FROM docs_class WHERE fileid=%s ' + sql='SELECT id,name,visible,advanced FROM documentation_class WHERE fileid=%s ' cursor.execute(sql,(fileid,)) classes=cursor.fetchall() class_list = [] @@ -16,13 +16,13 @@ def list_all(db,fileid): def getClass(db,classid): cursor=db.cursor() - sql='SELECT name,description FROM docs_class WHERE id=%s' + sql='SELECT name,description FROM documentation_class WHERE id=%s' cursor.execute(sql,(classid,)) clazz=cursor.fetchall() - docs_class = DocsClass(classid) - docs_class.name = clazz[0][0] - docs_class.reference = clazz[0][1] - return docs_class + documentation_class = DocsClass(classid) + documentation_class.name = clazz[0][0] + documentation_class.reference = clazz[0][1] + return documentation_class def renderFunctionsDetail(htmlFunction, function): htmlFunction.name.content = function.name @@ -30,9 +30,9 @@ def renderFunctionsDetail(htmlFunction, function): htmlFunction.syntax.content = function.syntax def renderClassDetail(tem,clazz): - tem.docs_class.name.content = clazz.name - tem.docs_class.description.content = clazz.description - tem.docs_class.function.repeat(renderFunctionsDetail,clazz.functions()) + tem.documentation_class.name.content = clazz.name + tem.documentation_class.description.content = clazz.description + tem.documentation_class.function.repeat(renderFunctionsDetail,clazz.functions()) def class_detail(): try: diff --git a/_dbtools/dbtools_files.py b/_dbtools/dbtools_files.py index 674934b15..f5d12ab9c 100644 --- a/_dbtools/dbtools_files.py +++ b/_dbtools/dbtools_files.py @@ -1,18 +1,18 @@ -import docs_class -from docs_class import DocsClass -import docs_function -from docs_function import DocsFunction +import documentation_class +from documentation_class import DocsClass +import documentation_function +from documentation_function import DocsFunction def names(db,advanced): cursor=db.cursor() - sql='SELECT id,name FROM docs_files WHERE advanced=%s' + sql='SELECT id,name FROM documentation_files WHERE advanced=%s' cursor.execute(sql,(advanced,)) files=cursor.fetchall() return files def list_all(db,groupid): cursor=db.cursor() - sql='SELECT id,name,description FROM docs_files WHERE groupid=%s' + sql='SELECT id,name,description FROM documentation_files WHERE groupid=%s' cursor.execute(sql,(groupid,)) files=cursor.fetchall() return files @@ -20,7 +20,7 @@ def list_all(db,groupid): def list_all_classes(db,groupid): cursor=db.cursor() - sql='SELECT c.id,c.name,c.description,c.advanced,c.visible FROM docs_class c JOIN docs_files f WHERE c.fileid=f.id and f.groupid=%s ORDER BY f.sortid, c.sortid' + sql='SELECT c.id,c.name,c.description,c.advanced,c.visible FROM documentation_class c JOIN documentation_files f WHERE c.fileid=f.id and f.groupid=%s ORDER BY f.sortid, c.sortid' cursor.execute(sql,(groupid)) classes=cursor.fetchall() class_list = [] @@ -30,13 +30,13 @@ def list_all_classes(db,groupid): clazz.reference = dbclass[2] clazz.advanced = dbclass[3] clazz.visible = dbclass[4] - #clazz.function_list = docs_function.list_all(db,dbclass[0]) + #clazz.function_list = documentation_function.list_all(db,dbclass[0]) class_list.append(clazz) return class_list def list_all_functions(db,groupid,advanced): cursor=db.cursor() - sql='SELECT c.id,c.name FROM docs_functions c JOIN docs_files f WHERE c.linkid=f.id and f.groupid=%s and f.advanced=%s and c.advanced=%s and f.visible=1 and c.visible=1 and c.linktable="files" ORDER BY f.sortid, c.sortid' + sql='SELECT c.id,c.name FROM documentation_functions c JOIN documentation_files f WHERE c.linkid=f.id and f.groupid=%s and f.advanced=%s and c.advanced=%s and f.visible=1 and c.visible=1 and c.linktable="files" ORDER BY f.sortid, c.sortid' cursor.execute(sql,(groupid,advanced,advanced,)) functions=cursor.fetchall() function_list = [] diff --git a/_dbtools/dbtools_function.py b/_dbtools/dbtools_function.py index 4d6045c28..4b94d609b 100644 --- a/_dbtools/dbtools_function.py +++ b/_dbtools/dbtools_function.py @@ -1,14 +1,14 @@ def names(db,classid,advanced): cursor=db.cursor() - sql='SELECT id,name FROM docs_functions WHERE linktable="class" and linkid= %s and advanced=%s' + sql='SELECT id,name FROM documentation_functions WHERE linktable="class" and linkid= %s and advanced=%s' cursor.execute(sql,(classid,advanced)) functions=cursor.fetchall() return functions def list_all(db,classid,advanced): cursor=db.cursor() - sql='SELECT id,name FROM docs_functions WHERE linkid=%s and linktable="class" and advanced=%s and visible=1 ORDER BY sortid' + sql='SELECT id,name FROM documentation_functions WHERE linkid=%s and linktable="class" and advanced=%s and visible=1 ORDER BY sortid' cursor.execute(sql,(classid,advanced,)) functions=cursor.fetchall() function_list = [] diff --git a/_dbtools/dbtools_functions.py b/_dbtools/dbtools_functions.py index 7b9081f63..4ea80b609 100644 --- a/_dbtools/dbtools_functions.py +++ b/_dbtools/dbtools_functions.py @@ -1,5 +1,5 @@ import MySQLdb -from docs_function import DocsFunction +from documentation_function import DocsFunction def tostr(string): @@ -10,7 +10,7 @@ def tostr(string): def names(db,classid,linktable="class"): cursor=db.cursor() - sql='SELECT name FROM docs_functions WHERE linktable=%s and linkid= %s' + sql='SELECT name FROM documentation_functions WHERE linktable=%s and linkid= %s' cursor.execute(sql,(linktable,classid,)) functions=cursor.fetchall() @@ -18,7 +18,7 @@ def names(db,classid,linktable="class"): def list_all(db,linkid,linktable='class'): cursor=db.cursor() - sql='SELECT id,name,description,returns,returns_description,parameters,syntax,version_started,version_deprecated,visible,advanced FROM docs_functions WHERE linktable=%s and linkid= %s' + sql='SELECT id,name,description,returns,returns_description,parameters,syntax,version_started,version_deprecated,visible,advanced FROM documentation_functions WHERE linktable=%s and linkid= %s' cursor.execute(sql,(linktable,linkid,)) dbfunctions = cursor.fetchall() functions = [] diff --git a/_dbtools/dbtools_group.py b/_dbtools/dbtools_group.py index 8e0f04b55..003d6645e 100644 --- a/_dbtools/dbtools_group.py +++ b/_dbtools/dbtools_group.py @@ -1,9 +1,9 @@ -from docs_group import DocsGroup +from documentation_group import DocsGroup import dbtools_files def list_all(db,type,advanced): cursor=db.cursor() - sql='SELECT id,name FROM docs_group WHERE type=%s and advanced=%s and visible=1 ORDER BY sortid' + sql='SELECT id,name FROM documentation_group WHERE type=%s and advanced=%s and visible=1 ORDER BY sortid' cursor.execute(sql,(type,advanced,)) groups=cursor.fetchall() groups_list = [] diff --git a/_dbtools/dbtools_members.py b/_dbtools/dbtools_members.py index 6fdc2b236..e7e157393 100644 --- a/_dbtools/dbtools_members.py +++ b/_dbtools/dbtools_members.py @@ -7,14 +7,14 @@ def tostr(string): def names(db,classid,advanced): cursor=db.cursor() - sql='SELECT id,name FROM docs_functions WHERE linktable="class" and linkid= %s and advanced=%s' + sql='SELECT id,name FROM documentation_functions WHERE linktable="class" and linkid= %s and advanced=%s' cursor.execute(sql,(classid,advanced)) functions=cursor.fetchall() return functions def list_all_methods(db,classid): cursor=db.cursor() - sql='SELECT id,name,returns,parameters,description,syntax,returns_description,access,version_started,version_deprecated,extra_description,visible,advanced FROM docs_functions WHERE linktable="class" and linkid=%s ORDER BY sortid' + sql='SELECT id,name,returns,parameters,description,syntax,returns_description,access,version_started,version_deprecated,extra_description,visible,advanced FROM documentation_functions WHERE linktable="class" and linkid=%s ORDER BY sortid' cursor.execute(sql,(classid,)) functions=cursor.fetchall() function_list = [] @@ -45,7 +45,7 @@ def list_all_methods(db,classid): def list_all_vars(db,classid): cursor=db.cursor() - sql='SELECT id,name,type,description,access,version_started,version_deprecated,constant,visible,advanced FROM docs_vars WHERE linktable="class" and linkid=%s ORDER BY sortid' + sql='SELECT id,name,type,description,access,version_started,version_deprecated,constant,visible,advanced FROM documentation_vars WHERE linktable="class" and linkid=%s ORDER BY sortid' cursor.execute(sql,(classid,)) variables=cursor.fetchall() variables_list = [] diff --git a/_dbtools/dbtools_method.py b/_dbtools/dbtools_method.py index 78d6fed0c..f3ad2e593 100644 --- a/_dbtools/dbtools_method.py +++ b/_dbtools/dbtools_method.py @@ -7,14 +7,14 @@ def tostr(string): def names(db,classid,advanced): cursor=db.cursor() - sql='SELECT id,name FROM docs_functions WHERE linktable="class" and linkid= %s and advanced=%s' + sql='SELECT id,name FROM documentation_functions WHERE linktable="class" and linkid= %s and advanced=%s' cursor.execute(sql,(classid,advanced)) functions=cursor.fetchall() return functions def list_all(db,classid,advanced): cursor=db.cursor() - sql='SELECT id,name,returns,parameters,description,syntax,returns_description,extra_description FROM docs_functions WHERE linktable="class" and linkid=%s and advanced=%s ORDER BY sortid' + sql='SELECT id,name,returns,parameters,description,syntax,returns_description,extra_description FROM documentation_functions WHERE linktable="class" and linkid=%s and advanced=%s ORDER BY sortid' cursor.execute(sql,(classid,advanced,)) functions=cursor.fetchall() function_list = [] diff --git a/_docs/3d/fov.png b/_documentation/3d/fov.png similarity index 100% rename from _docs/3d/fov.png rename to _documentation/3d/fov.png diff --git a/_docs/3d/ofCamera.markdown b/_documentation/3d/ofCamera.markdown similarity index 100% rename from _docs/3d/ofCamera.markdown rename to _documentation/3d/ofCamera.markdown diff --git a/_docs/3d/ofEasyCam.markdown b/_documentation/3d/ofEasyCam.markdown similarity index 100% rename from _docs/3d/ofEasyCam.markdown rename to _documentation/3d/ofEasyCam.markdown diff --git a/_docs/3d/ofMesh.markdown b/_documentation/3d/ofMesh.markdown similarity index 100% rename from _docs/3d/ofMesh.markdown rename to _documentation/3d/ofMesh.markdown diff --git a/_docs/3d/ofMesh_functions.markdown b/_documentation/3d/ofMesh_functions.markdown similarity index 100% rename from _docs/3d/ofMesh_functions.markdown rename to _documentation/3d/ofMesh_functions.markdown diff --git a/_docs/3d/ofNode.markdown b/_documentation/3d/ofNode.markdown similarity index 100% rename from _docs/3d/ofNode.markdown rename to _documentation/3d/ofNode.markdown diff --git a/_docs/addons/ofx3DModelLoader/ofx3DBaseLoader.markdown b/_documentation/addons/ofx3DModelLoader/ofx3DBaseLoader.markdown similarity index 100% rename from _docs/addons/ofx3DModelLoader/ofx3DBaseLoader.markdown rename to _documentation/addons/ofx3DModelLoader/ofx3DBaseLoader.markdown diff --git a/_docs/addons/ofx3DModelLoader/ofx3DModelLoader.markdown b/_documentation/addons/ofx3DModelLoader/ofx3DModelLoader.markdown similarity index 100% rename from _docs/addons/ofx3DModelLoader/ofx3DModelLoader.markdown rename to _documentation/addons/ofx3DModelLoader/ofx3DModelLoader.markdown diff --git a/_docs/addons/ofxAccelerometer/ofxAccelerometerHandler.markdown b/_documentation/addons/ofxAccelerometer/ofxAccelerometerHandler.markdown similarity index 100% rename from _docs/addons/ofxAccelerometer/ofxAccelerometerHandler.markdown rename to _documentation/addons/ofxAccelerometer/ofxAccelerometerHandler.markdown diff --git a/_docs/addons/ofxAndroid/ofAppAndroidWindow.markdown b/_documentation/addons/ofxAndroid/ofAppAndroidWindow.markdown similarity index 100% rename from _docs/addons/ofxAndroid/ofAppAndroidWindow.markdown rename to _documentation/addons/ofxAndroid/ofAppAndroidWindow.markdown diff --git a/_docs/addons/ofxAndroid/ofxAndroidApp.markdown b/_documentation/addons/ofxAndroid/ofxAndroidApp.markdown similarity index 100% rename from _docs/addons/ofxAndroid/ofxAndroidApp.markdown rename to _documentation/addons/ofxAndroid/ofxAndroidApp.markdown diff --git a/_docs/addons/ofxAndroid/ofxAndroidCircBuffer.markdown b/_documentation/addons/ofxAndroid/ofxAndroidCircBuffer.markdown similarity index 100% rename from _docs/addons/ofxAndroid/ofxAndroidCircBuffer.markdown rename to _documentation/addons/ofxAndroid/ofxAndroidCircBuffer.markdown diff --git a/_docs/addons/ofxAndroid/ofxAndroidGPS.markdown b/_documentation/addons/ofxAndroid/ofxAndroidGPS.markdown similarity index 100% rename from _docs/addons/ofxAndroid/ofxAndroidGPS.markdown rename to _documentation/addons/ofxAndroid/ofxAndroidGPS.markdown diff --git a/_docs/addons/ofxAndroid/ofxAndroidLogChannel.markdown b/_documentation/addons/ofxAndroid/ofxAndroidLogChannel.markdown similarity index 100% rename from _docs/addons/ofxAndroid/ofxAndroidLogChannel.markdown rename to _documentation/addons/ofxAndroid/ofxAndroidLogChannel.markdown diff --git a/_docs/addons/ofxAndroid/ofxAndroidSoundPlayer.markdown b/_documentation/addons/ofxAndroid/ofxAndroidSoundPlayer.markdown similarity index 100% rename from _docs/addons/ofxAndroid/ofxAndroidSoundPlayer.markdown rename to _documentation/addons/ofxAndroid/ofxAndroidSoundPlayer.markdown diff --git a/_docs/addons/ofxAndroid/ofxAndroidSoundStream.markdown b/_documentation/addons/ofxAndroid/ofxAndroidSoundStream.markdown similarity index 100% rename from _docs/addons/ofxAndroid/ofxAndroidSoundStream.markdown rename to _documentation/addons/ofxAndroid/ofxAndroidSoundStream.markdown diff --git a/_docs/addons/ofxAndroid/ofxAndroidVideoGrabber.markdown b/_documentation/addons/ofxAndroid/ofxAndroidVideoGrabber.markdown similarity index 100% rename from _docs/addons/ofxAndroid/ofxAndroidVideoGrabber.markdown rename to _documentation/addons/ofxAndroid/ofxAndroidVideoGrabber.markdown diff --git a/_docs/addons/ofxAssimpModelLoader/ofxAssimpMeshHelper.markdown b/_documentation/addons/ofxAssimpModelLoader/ofxAssimpMeshHelper.markdown similarity index 100% rename from _docs/addons/ofxAssimpModelLoader/ofxAssimpMeshHelper.markdown rename to _documentation/addons/ofxAssimpModelLoader/ofxAssimpMeshHelper.markdown diff --git a/_docs/addons/ofxAssimpModelLoader/ofxAssimpModelLoader.markdown b/_documentation/addons/ofxAssimpModelLoader/ofxAssimpModelLoader.markdown similarity index 100% rename from _docs/addons/ofxAssimpModelLoader/ofxAssimpModelLoader.markdown rename to _documentation/addons/ofxAssimpModelLoader/ofxAssimpModelLoader.markdown diff --git a/_docs/addons/ofxMultitouch/ofxMultiTouchHandler.markdown b/_documentation/addons/ofxMultitouch/ofxMultiTouchHandler.markdown similarity index 100% rename from _docs/addons/ofxMultitouch/ofxMultiTouchHandler.markdown rename to _documentation/addons/ofxMultitouch/ofxMultiTouchHandler.markdown diff --git a/_docs/addons/ofxMultitouch/ofxMultiTouchListener.markdown b/_documentation/addons/ofxMultitouch/ofxMultiTouchListener.markdown similarity index 100% rename from _docs/addons/ofxMultitouch/ofxMultiTouchListener.markdown rename to _documentation/addons/ofxMultitouch/ofxMultiTouchListener.markdown diff --git a/_docs/addons/ofxNetwork/InetAddr.markdown b/_documentation/addons/ofxNetwork/InetAddr.markdown similarity index 100% rename from _docs/addons/ofxNetwork/InetAddr.markdown rename to _documentation/addons/ofxNetwork/InetAddr.markdown diff --git a/_docs/addons/ofxNetwork/ofxTCPClient.markdown b/_documentation/addons/ofxNetwork/ofxTCPClient.markdown similarity index 100% rename from _docs/addons/ofxNetwork/ofxTCPClient.markdown rename to _documentation/addons/ofxNetwork/ofxTCPClient.markdown diff --git a/_docs/addons/ofxNetwork/ofxTCPManager.markdown b/_documentation/addons/ofxNetwork/ofxTCPManager.markdown similarity index 100% rename from _docs/addons/ofxNetwork/ofxTCPManager.markdown rename to _documentation/addons/ofxNetwork/ofxTCPManager.markdown diff --git a/_docs/addons/ofxNetwork/ofxTCPServer.markdown b/_documentation/addons/ofxNetwork/ofxTCPServer.markdown similarity index 100% rename from _docs/addons/ofxNetwork/ofxTCPServer.markdown rename to _documentation/addons/ofxNetwork/ofxTCPServer.markdown diff --git a/_docs/addons/ofxNetwork/ofxUDPManager.markdown b/_documentation/addons/ofxNetwork/ofxUDPManager.markdown similarity index 100% rename from _docs/addons/ofxNetwork/ofxUDPManager.markdown rename to _documentation/addons/ofxNetwork/ofxUDPManager.markdown diff --git a/_docs/addons/ofxOpenCv/ofxCvBlob.markdown b/_documentation/addons/ofxOpenCv/ofxCvBlob.markdown similarity index 100% rename from _docs/addons/ofxOpenCv/ofxCvBlob.markdown rename to _documentation/addons/ofxOpenCv/ofxCvBlob.markdown diff --git a/_docs/addons/ofxOpenCv/ofxCvColorImage.markdown b/_documentation/addons/ofxOpenCv/ofxCvColorImage.markdown similarity index 100% rename from _docs/addons/ofxOpenCv/ofxCvColorImage.markdown rename to _documentation/addons/ofxOpenCv/ofxCvColorImage.markdown diff --git a/_docs/addons/ofxOpenCv/ofxCvContourFinder.markdown b/_documentation/addons/ofxOpenCv/ofxCvContourFinder.markdown similarity index 100% rename from _docs/addons/ofxOpenCv/ofxCvContourFinder.markdown rename to _documentation/addons/ofxOpenCv/ofxCvContourFinder.markdown diff --git a/_docs/addons/ofxOpenCv/ofxCvFloatImage.markdown b/_documentation/addons/ofxOpenCv/ofxCvFloatImage.markdown similarity index 100% rename from _docs/addons/ofxOpenCv/ofxCvFloatImage.markdown rename to _documentation/addons/ofxOpenCv/ofxCvFloatImage.markdown diff --git a/_docs/addons/ofxOpenCv/ofxCvGrayscaleImage.markdown b/_documentation/addons/ofxOpenCv/ofxCvGrayscaleImage.markdown similarity index 100% rename from _docs/addons/ofxOpenCv/ofxCvGrayscaleImage.markdown rename to _documentation/addons/ofxOpenCv/ofxCvGrayscaleImage.markdown diff --git a/_docs/addons/ofxOpenCv/ofxCvHaarFinder.markdown b/_documentation/addons/ofxOpenCv/ofxCvHaarFinder.markdown similarity index 100% rename from _docs/addons/ofxOpenCv/ofxCvHaarFinder.markdown rename to _documentation/addons/ofxOpenCv/ofxCvHaarFinder.markdown diff --git a/_docs/addons/ofxOpenCv/ofxCvImage.markdown b/_documentation/addons/ofxOpenCv/ofxCvImage.markdown similarity index 100% rename from _docs/addons/ofxOpenCv/ofxCvImage.markdown rename to _documentation/addons/ofxOpenCv/ofxCvImage.markdown diff --git a/_docs/addons/ofxOpenCv/ofxCvShortImage.markdown b/_documentation/addons/ofxOpenCv/ofxCvShortImage.markdown similarity index 100% rename from _docs/addons/ofxOpenCv/ofxCvShortImage.markdown rename to _documentation/addons/ofxOpenCv/ofxCvShortImage.markdown diff --git a/_docs/addons/ofxOsc/ofxOscArg.markdown b/_documentation/addons/ofxOsc/ofxOscArg.markdown similarity index 100% rename from _docs/addons/ofxOsc/ofxOscArg.markdown rename to _documentation/addons/ofxOsc/ofxOscArg.markdown diff --git a/_docs/addons/ofxOsc/ofxOscArgFloat.markdown b/_documentation/addons/ofxOsc/ofxOscArgFloat.markdown similarity index 100% rename from _docs/addons/ofxOsc/ofxOscArgFloat.markdown rename to _documentation/addons/ofxOsc/ofxOscArgFloat.markdown diff --git a/_docs/addons/ofxOsc/ofxOscArgInt32.markdown b/_documentation/addons/ofxOsc/ofxOscArgInt32.markdown similarity index 100% rename from _docs/addons/ofxOsc/ofxOscArgInt32.markdown rename to _documentation/addons/ofxOsc/ofxOscArgInt32.markdown diff --git a/_docs/addons/ofxOsc/ofxOscArgString.markdown b/_documentation/addons/ofxOsc/ofxOscArgString.markdown similarity index 100% rename from _docs/addons/ofxOsc/ofxOscArgString.markdown rename to _documentation/addons/ofxOsc/ofxOscArgString.markdown diff --git a/_docs/addons/ofxOsc/ofxOscBundle.markdown b/_documentation/addons/ofxOsc/ofxOscBundle.markdown similarity index 100% rename from _docs/addons/ofxOsc/ofxOscBundle.markdown rename to _documentation/addons/ofxOsc/ofxOscBundle.markdown diff --git a/_docs/addons/ofxOsc/ofxOscMessage.markdown b/_documentation/addons/ofxOsc/ofxOscMessage.markdown similarity index 100% rename from _docs/addons/ofxOsc/ofxOscMessage.markdown rename to _documentation/addons/ofxOsc/ofxOscMessage.markdown diff --git a/_docs/addons/ofxOsc/ofxOscReceiver.markdown b/_documentation/addons/ofxOsc/ofxOscReceiver.markdown similarity index 100% rename from _docs/addons/ofxOsc/ofxOscReceiver.markdown rename to _documentation/addons/ofxOsc/ofxOscReceiver.markdown diff --git a/_docs/addons/ofxOsc/ofxOscSender.markdown b/_documentation/addons/ofxOsc/ofxOscSender.markdown similarity index 100% rename from _docs/addons/ofxOsc/ofxOscSender.markdown rename to _documentation/addons/ofxOsc/ofxOscSender.markdown diff --git a/_docs/addons/ofxThreadedImageLoader/ofxThreadedImageLoader.markdown b/_documentation/addons/ofxThreadedImageLoader/ofxThreadedImageLoader.markdown similarity index 100% rename from _docs/addons/ofxThreadedImageLoader/ofxThreadedImageLoader.markdown rename to _documentation/addons/ofxThreadedImageLoader/ofxThreadedImageLoader.markdown diff --git a/_docs/addons/ofxVectorGraphics/ofxVectorGraphics.markdown b/_documentation/addons/ofxVectorGraphics/ofxVectorGraphics.markdown similarity index 100% rename from _docs/addons/ofxVectorGraphics/ofxVectorGraphics.markdown rename to _documentation/addons/ofxVectorGraphics/ofxVectorGraphics.markdown diff --git a/_docs/addons/ofxVectorMath/ofPoint3.markdown b/_documentation/addons/ofxVectorMath/ofPoint3.markdown similarity index 100% rename from _docs/addons/ofxVectorMath/ofPoint3.markdown rename to _documentation/addons/ofxVectorMath/ofPoint3.markdown diff --git a/_docs/addons/ofxXmlSettings/ofxXmlSettings.markdown b/_documentation/addons/ofxXmlSettings/ofxXmlSettings.markdown similarity index 100% rename from _docs/addons/ofxXmlSettings/ofxXmlSettings.markdown rename to _documentation/addons/ofxXmlSettings/ofxXmlSettings.markdown diff --git a/_docs/addons/ofxiPhone/BackgroundTrackMgr.markdown b/_documentation/addons/ofxiPhone/BackgroundTrackMgr.markdown similarity index 100% rename from _docs/addons/ofxiPhone/BackgroundTrackMgr.markdown rename to _documentation/addons/ofxiPhone/BackgroundTrackMgr.markdown diff --git a/_docs/addons/ofxiPhone/OpenALObject.markdown b/_documentation/addons/ofxiPhone/OpenALObject.markdown similarity index 100% rename from _docs/addons/ofxiPhone/OpenALObject.markdown rename to _documentation/addons/ofxiPhone/OpenALObject.markdown diff --git a/_docs/addons/ofxiPhone/SoundEngineEffect.markdown b/_documentation/addons/ofxiPhone/SoundEngineEffect.markdown similarity index 100% rename from _docs/addons/ofxiPhone/SoundEngineEffect.markdown rename to _documentation/addons/ofxiPhone/SoundEngineEffect.markdown diff --git a/_docs/addons/ofxiPhone/SoundEngineEffectMap.markdown b/_documentation/addons/ofxiPhone/SoundEngineEffectMap.markdown similarity index 100% rename from _docs/addons/ofxiPhone/SoundEngineEffectMap.markdown rename to _documentation/addons/ofxiPhone/SoundEngineEffectMap.markdown diff --git a/_docs/addons/ofxiPhone/canLoadPixels.markdown b/_documentation/addons/ofxiPhone/canLoadPixels.markdown similarity index 100% rename from _docs/addons/ofxiPhone/canLoadPixels.markdown rename to _documentation/addons/ofxiPhone/canLoadPixels.markdown diff --git a/_docs/addons/ofxiPhone/ofAppiPhoneWindow.markdown b/_documentation/addons/ofxiPhone/ofAppiPhoneWindow.markdown similarity index 100% rename from _docs/addons/ofxiPhone/ofAppiPhoneWindow.markdown rename to _documentation/addons/ofxiPhone/ofAppiPhoneWindow.markdown diff --git a/_docs/addons/ofxiPhone/ofxOpenALSoundPlayer.markdown b/_documentation/addons/ofxiPhone/ofxOpenALSoundPlayer.markdown similarity index 100% rename from _docs/addons/ofxiPhone/ofxOpenALSoundPlayer.markdown rename to _documentation/addons/ofxiPhone/ofxOpenALSoundPlayer.markdown diff --git a/_docs/addons/ofxiPhone/ofxiPhoneAlertsHandler.markdown b/_documentation/addons/ofxiPhone/ofxiPhoneAlertsHandler.markdown similarity index 100% rename from _docs/addons/ofxiPhone/ofxiPhoneAlertsHandler.markdown rename to _documentation/addons/ofxiPhone/ofxiPhoneAlertsHandler.markdown diff --git a/_docs/addons/ofxiPhone/ofxiPhoneAlertsListener.markdown b/_documentation/addons/ofxiPhone/ofxiPhoneAlertsListener.markdown similarity index 100% rename from _docs/addons/ofxiPhone/ofxiPhoneAlertsListener.markdown rename to _documentation/addons/ofxiPhone/ofxiPhoneAlertsListener.markdown diff --git a/_docs/addons/ofxiPhone/ofxiPhoneApp.markdown b/_documentation/addons/ofxiPhone/ofxiPhoneApp.markdown similarity index 100% rename from _docs/addons/ofxiPhone/ofxiPhoneApp.markdown rename to _documentation/addons/ofxiPhone/ofxiPhoneApp.markdown diff --git a/_docs/addons/ofxiPhone/ofxiPhoneCoreLocation.markdown b/_documentation/addons/ofxiPhone/ofxiPhoneCoreLocation.markdown similarity index 100% rename from _docs/addons/ofxiPhone/ofxiPhoneCoreLocation.markdown rename to _documentation/addons/ofxiPhone/ofxiPhoneCoreLocation.markdown diff --git a/_docs/addons/ofxiPhone/ofxiPhoneImagePicker.markdown b/_documentation/addons/ofxiPhone/ofxiPhoneImagePicker.markdown similarity index 100% rename from _docs/addons/ofxiPhone/ofxiPhoneImagePicker.markdown rename to _documentation/addons/ofxiPhone/ofxiPhoneImagePicker.markdown diff --git a/_docs/addons/ofxiPhone/ofxiPhoneKeyboard.markdown b/_documentation/addons/ofxiPhone/ofxiPhoneKeyboard.markdown similarity index 100% rename from _docs/addons/ofxiPhone/ofxiPhoneKeyboard.markdown rename to _documentation/addons/ofxiPhone/ofxiPhoneKeyboard.markdown diff --git a/_docs/addons/ofxiPhone/ofxiPhoneMapKitListener.markdown b/_documentation/addons/ofxiPhone/ofxiPhoneMapKitListener.markdown similarity index 100% rename from _docs/addons/ofxiPhone/ofxiPhoneMapKitListener.markdown rename to _documentation/addons/ofxiPhone/ofxiPhoneMapKitListener.markdown diff --git a/_docs/application/ofAppBaseWindow.markdown b/_documentation/application/ofAppBaseWindow.markdown similarity index 100% rename from _docs/application/ofAppBaseWindow.markdown rename to _documentation/application/ofAppBaseWindow.markdown diff --git a/_docs/application/ofAppGlutWindow.markdown b/_documentation/application/ofAppGlutWindow.markdown similarity index 100% rename from _docs/application/ofAppGlutWindow.markdown rename to _documentation/application/ofAppGlutWindow.markdown diff --git a/_docs/application/ofAppRunner_functions.markdown b/_documentation/application/ofAppRunner_functions.markdown similarity index 100% rename from _docs/application/ofAppRunner_functions.markdown rename to _documentation/application/ofAppRunner_functions.markdown diff --git a/_docs/application/ofBaseApp.markdown b/_documentation/application/ofBaseApp.markdown similarity index 100% rename from _docs/application/ofBaseApp.markdown rename to _documentation/application/ofBaseApp.markdown diff --git a/_docs/application/ofDragInfo.markdown b/_documentation/application/ofDragInfo.markdown similarity index 100% rename from _docs/application/ofDragInfo.markdown rename to _documentation/application/ofDragInfo.markdown diff --git a/_docs/arduino/ofArduino.markdown b/_documentation/arduino/ofArduino.markdown similarity index 100% rename from _docs/arduino/ofArduino.markdown rename to _documentation/arduino/ofArduino.markdown diff --git a/_docs/arduino/ofStandardFirmata.markdown b/_documentation/arduino/ofStandardFirmata.markdown similarity index 100% rename from _docs/arduino/ofStandardFirmata.markdown rename to _documentation/arduino/ofStandardFirmata.markdown diff --git a/_docs/events/ofAudioEventArgs.markdown b/_documentation/events/ofAudioEventArgs.markdown similarity index 100% rename from _docs/events/ofAudioEventArgs.markdown rename to _documentation/events/ofAudioEventArgs.markdown diff --git a/_docs/events/ofCoreEvents.markdown b/_documentation/events/ofCoreEvents.markdown similarity index 100% rename from _docs/events/ofCoreEvents.markdown rename to _documentation/events/ofCoreEvents.markdown diff --git a/_docs/events/ofEvent.markdown b/_documentation/events/ofEvent.markdown similarity index 100% rename from _docs/events/ofEvent.markdown rename to _documentation/events/ofEvent.markdown diff --git a/_docs/events/ofEventArgs.markdown b/_documentation/events/ofEventArgs.markdown similarity index 100% rename from _docs/events/ofEventArgs.markdown rename to _documentation/events/ofEventArgs.markdown diff --git a/_docs/events/ofEventUtils.markdown b/_documentation/events/ofEventUtils.markdown similarity index 100% rename from _docs/events/ofEventUtils.markdown rename to _documentation/events/ofEventUtils.markdown diff --git a/_docs/events/ofEventUtils_functions.markdown b/_documentation/events/ofEventUtils_functions.markdown similarity index 100% rename from _docs/events/ofEventUtils_functions.markdown rename to _documentation/events/ofEventUtils_functions.markdown diff --git a/_docs/events/ofEvents.markdown b/_documentation/events/ofEvents.markdown similarity index 100% rename from _docs/events/ofEvents.markdown rename to _documentation/events/ofEvents.markdown diff --git a/_docs/events/ofEvents_functions.markdown b/_documentation/events/ofEvents_functions.markdown similarity index 100% rename from _docs/events/ofEvents_functions.markdown rename to _documentation/events/ofEvents_functions.markdown diff --git a/_docs/events/ofKeyEventArgs.markdown b/_documentation/events/ofKeyEventArgs.markdown similarity index 100% rename from _docs/events/ofKeyEventArgs.markdown rename to _documentation/events/ofKeyEventArgs.markdown diff --git a/_docs/events/ofMouseEventArgs.markdown b/_documentation/events/ofMouseEventArgs.markdown similarity index 100% rename from _docs/events/ofMouseEventArgs.markdown rename to _documentation/events/ofMouseEventArgs.markdown diff --git a/_docs/events/ofResizeEventArgs.markdown b/_documentation/events/ofResizeEventArgs.markdown similarity index 100% rename from _docs/events/ofResizeEventArgs.markdown rename to _documentation/events/ofResizeEventArgs.markdown diff --git a/_docs/gl/gl_vertices_options.jpg b/_documentation/gl/gl_vertices_options.jpg similarity index 100% rename from _docs/gl/gl_vertices_options.jpg rename to _documentation/gl/gl_vertices_options.jpg diff --git a/_docs/gl/ofFbo.markdown b/_documentation/gl/ofFbo.markdown similarity index 100% rename from _docs/gl/ofFbo.markdown rename to _documentation/gl/ofFbo.markdown diff --git a/_docs/gl/ofGLRenderer.markdown b/_documentation/gl/ofGLRenderer.markdown similarity index 100% rename from _docs/gl/ofGLRenderer.markdown rename to _documentation/gl/ofGLRenderer.markdown diff --git a/_docs/gl/ofGLUtils_functions.markdown b/_documentation/gl/ofGLUtils_functions.markdown similarity index 100% rename from _docs/gl/ofGLUtils_functions.markdown rename to _documentation/gl/ofGLUtils_functions.markdown diff --git a/_docs/gl/ofLight.markdown b/_documentation/gl/ofLight.markdown similarity index 100% rename from _docs/gl/ofLight.markdown rename to _documentation/gl/ofLight.markdown diff --git a/_docs/gl/ofLight_functions.markdown b/_documentation/gl/ofLight_functions.markdown similarity index 100% rename from _docs/gl/ofLight_functions.markdown rename to _documentation/gl/ofLight_functions.markdown diff --git a/_docs/gl/ofMaterial.markdown b/_documentation/gl/ofMaterial.markdown similarity index 100% rename from _docs/gl/ofMaterial.markdown rename to _documentation/gl/ofMaterial.markdown diff --git a/_docs/gl/ofShader.markdown b/_documentation/gl/ofShader.markdown similarity index 100% rename from _docs/gl/ofShader.markdown rename to _documentation/gl/ofShader.markdown diff --git a/_docs/gl/ofTexture.markdown b/_documentation/gl/ofTexture.markdown similarity index 100% rename from _docs/gl/ofTexture.markdown rename to _documentation/gl/ofTexture.markdown diff --git a/_docs/gl/ofTextureData.markdown b/_documentation/gl/ofTextureData.markdown similarity index 100% rename from _docs/gl/ofTextureData.markdown rename to _documentation/gl/ofTextureData.markdown diff --git a/_docs/gl/ofTexture_functions.markdown b/_documentation/gl/ofTexture_functions.markdown similarity index 100% rename from _docs/gl/ofTexture_functions.markdown rename to _documentation/gl/ofTexture_functions.markdown diff --git a/_docs/gl/ofVbo.markdown b/_documentation/gl/ofVbo.markdown similarity index 100% rename from _docs/gl/ofVbo.markdown rename to _documentation/gl/ofVbo.markdown diff --git a/_docs/gl/ofVboMesh.markdown b/_documentation/gl/ofVboMesh.markdown similarity index 100% rename from _docs/gl/ofVboMesh.markdown rename to _documentation/gl/ofVboMesh.markdown diff --git a/_docs/gl/vbo.png b/_documentation/gl/vbo.png similarity index 100% rename from _docs/gl/vbo.png rename to _documentation/gl/vbo.png diff --git a/_docs/graphics/bezier.png b/_documentation/graphics/bezier.png similarity index 100% rename from _docs/graphics/bezier.png rename to _documentation/graphics/bezier.png diff --git a/_docs/graphics/curves.png b/_documentation/graphics/curves.png similarity index 100% rename from _docs/graphics/curves.png rename to _documentation/graphics/curves.png diff --git a/_docs/graphics/ofBitmapFont_functions.markdown b/_documentation/graphics/ofBitmapFont_functions.markdown similarity index 100% rename from _docs/graphics/ofBitmapFont_functions.markdown rename to _documentation/graphics/ofBitmapFont_functions.markdown diff --git a/_docs/graphics/ofCairoRenderer.markdown b/_documentation/graphics/ofCairoRenderer.markdown similarity index 100% rename from _docs/graphics/ofCairoRenderer.markdown rename to _documentation/graphics/ofCairoRenderer.markdown diff --git a/_docs/graphics/ofGraphics_functions.markdown b/_documentation/graphics/ofGraphics_functions.markdown similarity index 100% rename from _docs/graphics/ofGraphics_functions.markdown rename to _documentation/graphics/ofGraphics_functions.markdown diff --git a/_docs/graphics/ofImage.markdown b/_documentation/graphics/ofImage.markdown similarity index 100% rename from _docs/graphics/ofImage.markdown rename to _documentation/graphics/ofImage.markdown diff --git a/_docs/graphics/ofImage_.markdown b/_documentation/graphics/ofImage_.markdown similarity index 100% rename from _docs/graphics/ofImage_.markdown rename to _documentation/graphics/ofImage_.markdown diff --git a/_docs/graphics/ofImage_functions.markdown b/_documentation/graphics/ofImage_functions.markdown similarity index 100% rename from _docs/graphics/ofImage_functions.markdown rename to _documentation/graphics/ofImage_functions.markdown diff --git a/_docs/graphics/ofPath.markdown b/_documentation/graphics/ofPath.markdown similarity index 100% rename from _docs/graphics/ofPath.markdown rename to _documentation/graphics/ofPath.markdown diff --git a/_docs/graphics/ofPixelUtils.markdown b/_documentation/graphics/ofPixelUtils.markdown similarity index 100% rename from _docs/graphics/ofPixelUtils.markdown rename to _documentation/graphics/ofPixelUtils.markdown diff --git a/_docs/graphics/ofPixels.markdown b/_documentation/graphics/ofPixels.markdown similarity index 100% rename from _docs/graphics/ofPixels.markdown rename to _documentation/graphics/ofPixels.markdown diff --git a/_docs/graphics/ofPixels_.markdown b/_documentation/graphics/ofPixels_.markdown similarity index 100% rename from _docs/graphics/ofPixels_.markdown rename to _documentation/graphics/ofPixels_.markdown diff --git a/_docs/graphics/ofPixels_crop.png b/_documentation/graphics/ofPixels_crop.png similarity index 100% rename from _docs/graphics/ofPixels_crop.png rename to _documentation/graphics/ofPixels_crop.png diff --git a/_docs/graphics/ofPolyUtils_functions.markdown b/_documentation/graphics/ofPolyUtils_functions.markdown similarity index 100% rename from _docs/graphics/ofPolyUtils_functions.markdown rename to _documentation/graphics/ofPolyUtils_functions.markdown diff --git a/_docs/graphics/ofPolyline.markdown b/_documentation/graphics/ofPolyline.markdown similarity index 100% rename from _docs/graphics/ofPolyline.markdown rename to _documentation/graphics/ofPolyline.markdown diff --git a/_docs/graphics/ofRendererCollection.markdown b/_documentation/graphics/ofRendererCollection.markdown similarity index 100% rename from _docs/graphics/ofRendererCollection.markdown rename to _documentation/graphics/ofRendererCollection.markdown diff --git a/_docs/graphics/ofSubPath.markdown b/_documentation/graphics/ofSubPath.markdown similarity index 100% rename from _docs/graphics/ofSubPath.markdown rename to _documentation/graphics/ofSubPath.markdown diff --git a/_docs/graphics/ofTTFCharacter.markdown b/_documentation/graphics/ofTTFCharacter.markdown similarity index 100% rename from _docs/graphics/ofTTFCharacter.markdown rename to _documentation/graphics/ofTTFCharacter.markdown diff --git a/_docs/graphics/ofTTFContour.markdown b/_documentation/graphics/ofTTFContour.markdown similarity index 100% rename from _docs/graphics/ofTTFContour.markdown rename to _documentation/graphics/ofTTFContour.markdown diff --git a/_docs/graphics/ofTessellator.markdown b/_documentation/graphics/ofTessellator.markdown similarity index 100% rename from _docs/graphics/ofTessellator.markdown rename to _documentation/graphics/ofTessellator.markdown diff --git a/_docs/graphics/ofTrueTypeFont.markdown b/_documentation/graphics/ofTrueTypeFont.markdown similarity index 100% rename from _docs/graphics/ofTrueTypeFont.markdown rename to _documentation/graphics/ofTrueTypeFont.markdown diff --git a/_docs/graphics/resample.png b/_documentation/graphics/resample.png similarity index 100% rename from _docs/graphics/resample.png rename to _documentation/graphics/resample.png diff --git a/_docs/index.markdown b/_documentation/index.markdown similarity index 100% rename from _docs/index.markdown rename to _documentation/index.markdown diff --git a/_docs/indexAddons.markdown b/_documentation/indexAddons.markdown similarity index 100% rename from _docs/indexAddons.markdown rename to _documentation/indexAddons.markdown diff --git a/_docs/math/ofMath.markdown b/_documentation/math/ofMath.markdown similarity index 100% rename from _docs/math/ofMath.markdown rename to _documentation/math/ofMath.markdown diff --git a/_docs/math/ofMath_functions.markdown b/_documentation/math/ofMath_functions.markdown similarity index 100% rename from _docs/math/ofMath_functions.markdown rename to _documentation/math/ofMath_functions.markdown diff --git a/_docs/math/ofMatrix3x3.markdown b/_documentation/math/ofMatrix3x3.markdown similarity index 100% rename from _docs/math/ofMatrix3x3.markdown rename to _documentation/math/ofMatrix3x3.markdown diff --git a/_docs/math/ofMatrix4x4.markdown b/_documentation/math/ofMatrix4x4.markdown similarity index 100% rename from _docs/math/ofMatrix4x4.markdown rename to _documentation/math/ofMatrix4x4.markdown diff --git a/_docs/math/ofMatrix4x4_functions.markdown b/_documentation/math/ofMatrix4x4_functions.markdown similarity index 100% rename from _docs/math/ofMatrix4x4_functions.markdown rename to _documentation/math/ofMatrix4x4_functions.markdown diff --git a/_docs/math/ofNoise_functions.markdown b/_documentation/math/ofNoise_functions.markdown similarity index 100% rename from _docs/math/ofNoise_functions.markdown rename to _documentation/math/ofNoise_functions.markdown diff --git a/_docs/math/ofQuaternion.markdown b/_documentation/math/ofQuaternion.markdown similarity index 100% rename from _docs/math/ofQuaternion.markdown rename to _documentation/math/ofQuaternion.markdown diff --git a/_docs/math/ofVec2f.markdown b/_documentation/math/ofVec2f.markdown similarity index 100% rename from _docs/math/ofVec2f.markdown rename to _documentation/math/ofVec2f.markdown diff --git a/_docs/math/ofVec2f_functions.markdown b/_documentation/math/ofVec2f_functions.markdown similarity index 100% rename from _docs/math/ofVec2f_functions.markdown rename to _documentation/math/ofVec2f_functions.markdown diff --git a/_docs/math/ofVec3f.markdown b/_documentation/math/ofVec3f.markdown similarity index 100% rename from _docs/math/ofVec3f.markdown rename to _documentation/math/ofVec3f.markdown diff --git a/_docs/math/ofVec3f_functions.markdown b/_documentation/math/ofVec3f_functions.markdown similarity index 100% rename from _docs/math/ofVec3f_functions.markdown rename to _documentation/math/ofVec3f_functions.markdown diff --git a/_docs/math/ofVec4f.markdown b/_documentation/math/ofVec4f.markdown similarity index 100% rename from _docs/math/ofVec4f.markdown rename to _documentation/math/ofVec4f.markdown diff --git a/_docs/math/ofVec4f_functions.markdown b/_documentation/math/ofVec4f_functions.markdown similarity index 100% rename from _docs/math/ofVec4f_functions.markdown rename to _documentation/math/ofVec4f_functions.markdown diff --git a/_docs/serial/ofSerial.markdown b/_documentation/serial/ofSerial.markdown similarity index 100% rename from _docs/serial/ofSerial.markdown rename to _documentation/serial/ofSerial.markdown diff --git a/_docs/serial/ofSerialDeviceInfo.markdown b/_documentation/serial/ofSerialDeviceInfo.markdown similarity index 100% rename from _docs/serial/ofSerialDeviceInfo.markdown rename to _documentation/serial/ofSerialDeviceInfo.markdown diff --git a/_docs/sound/ofFmodSoundPlayer.markdown b/_documentation/sound/ofFmodSoundPlayer.markdown similarity index 100% rename from _docs/sound/ofFmodSoundPlayer.markdown rename to _documentation/sound/ofFmodSoundPlayer.markdown diff --git a/_docs/sound/ofFmodSoundPlayer_functions.markdown b/_documentation/sound/ofFmodSoundPlayer_functions.markdown similarity index 100% rename from _docs/sound/ofFmodSoundPlayer_functions.markdown rename to _documentation/sound/ofFmodSoundPlayer_functions.markdown diff --git a/_docs/sound/ofOpenALSoundPlayer.markdown b/_documentation/sound/ofOpenALSoundPlayer.markdown similarity index 100% rename from _docs/sound/ofOpenALSoundPlayer.markdown rename to _documentation/sound/ofOpenALSoundPlayer.markdown diff --git a/_docs/sound/ofPASoundStream.markdown b/_documentation/sound/ofPASoundStream.markdown similarity index 100% rename from _docs/sound/ofPASoundStream.markdown rename to _documentation/sound/ofPASoundStream.markdown diff --git a/_docs/sound/ofRtAudioSoundStream.markdown b/_documentation/sound/ofRtAudioSoundStream.markdown similarity index 100% rename from _docs/sound/ofRtAudioSoundStream.markdown rename to _documentation/sound/ofRtAudioSoundStream.markdown diff --git a/_docs/sound/ofSoundPlayer.markdown b/_documentation/sound/ofSoundPlayer.markdown similarity index 100% rename from _docs/sound/ofSoundPlayer.markdown rename to _documentation/sound/ofSoundPlayer.markdown diff --git a/_docs/sound/ofSoundPlayer_functions.markdown b/_documentation/sound/ofSoundPlayer_functions.markdown similarity index 100% rename from _docs/sound/ofSoundPlayer_functions.markdown rename to _documentation/sound/ofSoundPlayer_functions.markdown diff --git a/_docs/sound/ofSoundStream.markdown b/_documentation/sound/ofSoundStream.markdown similarity index 100% rename from _docs/sound/ofSoundStream.markdown rename to _documentation/sound/ofSoundStream.markdown diff --git a/_docs/sound/ofSoundStream_functions.markdown b/_documentation/sound/ofSoundStream_functions.markdown similarity index 100% rename from _docs/sound/ofSoundStream_functions.markdown rename to _documentation/sound/ofSoundStream_functions.markdown diff --git a/_docs/sound/ofxiPhoneSoundStream.markdown b/_documentation/sound/ofxiPhoneSoundStream.markdown similarity index 100% rename from _docs/sound/ofxiPhoneSoundStream.markdown rename to _documentation/sound/ofxiPhoneSoundStream.markdown diff --git a/_docs/types/hsb-cone.jpg b/_documentation/types/hsb-cone.jpg similarity index 100% rename from _docs/types/hsb-cone.jpg rename to _documentation/types/hsb-cone.jpg diff --git a/_docs/types/hsb.png b/_documentation/types/hsb.png similarity index 100% rename from _docs/types/hsb.png rename to _documentation/types/hsb.png diff --git a/_docs/types/ofAbstractHasPixels.markdown b/_documentation/types/ofAbstractHasPixels.markdown similarity index 100% rename from _docs/types/ofAbstractHasPixels.markdown rename to _documentation/types/ofAbstractHasPixels.markdown diff --git a/_docs/types/ofAbstractImage.markdown b/_documentation/types/ofAbstractImage.markdown similarity index 100% rename from _docs/types/ofAbstractImage.markdown rename to _documentation/types/ofAbstractImage.markdown diff --git a/_docs/types/ofBaseDraws.markdown b/_documentation/types/ofBaseDraws.markdown similarity index 100% rename from _docs/types/ofBaseDraws.markdown rename to _documentation/types/ofBaseDraws.markdown diff --git a/_docs/types/ofBaseHasPixels.markdown b/_documentation/types/ofBaseHasPixels.markdown similarity index 100% rename from _docs/types/ofBaseHasPixels.markdown rename to _documentation/types/ofBaseHasPixels.markdown diff --git a/_docs/types/ofBaseHasPixels_.markdown b/_documentation/types/ofBaseHasPixels_.markdown similarity index 100% rename from _docs/types/ofBaseHasPixels_.markdown rename to _documentation/types/ofBaseHasPixels_.markdown diff --git a/_docs/types/ofBaseHasTexture.markdown b/_documentation/types/ofBaseHasTexture.markdown similarity index 100% rename from _docs/types/ofBaseHasTexture.markdown rename to _documentation/types/ofBaseHasTexture.markdown diff --git a/_docs/types/ofBaseImage.markdown b/_documentation/types/ofBaseImage.markdown similarity index 100% rename from _docs/types/ofBaseImage.markdown rename to _documentation/types/ofBaseImage.markdown diff --git a/_docs/types/ofBaseImage_.markdown b/_documentation/types/ofBaseImage_.markdown similarity index 100% rename from _docs/types/ofBaseImage_.markdown rename to _documentation/types/ofBaseImage_.markdown diff --git a/_docs/types/ofBaseLoggerChannel.markdown b/_documentation/types/ofBaseLoggerChannel.markdown similarity index 100% rename from _docs/types/ofBaseLoggerChannel.markdown rename to _documentation/types/ofBaseLoggerChannel.markdown diff --git a/_docs/types/ofBaseRenderer.markdown b/_documentation/types/ofBaseRenderer.markdown similarity index 100% rename from _docs/types/ofBaseRenderer.markdown rename to _documentation/types/ofBaseRenderer.markdown diff --git a/_docs/types/ofBaseSoundInput.markdown b/_documentation/types/ofBaseSoundInput.markdown similarity index 100% rename from _docs/types/ofBaseSoundInput.markdown rename to _documentation/types/ofBaseSoundInput.markdown diff --git a/_docs/types/ofBaseSoundOutput.markdown b/_documentation/types/ofBaseSoundOutput.markdown similarity index 100% rename from _docs/types/ofBaseSoundOutput.markdown rename to _documentation/types/ofBaseSoundOutput.markdown diff --git a/_docs/types/ofBaseSoundPlayer.markdown b/_documentation/types/ofBaseSoundPlayer.markdown similarity index 100% rename from _docs/types/ofBaseSoundPlayer.markdown rename to _documentation/types/ofBaseSoundPlayer.markdown diff --git a/_docs/types/ofBaseSoundStream.markdown b/_documentation/types/ofBaseSoundStream.markdown similarity index 100% rename from _docs/types/ofBaseSoundStream.markdown rename to _documentation/types/ofBaseSoundStream.markdown diff --git a/_docs/types/ofBaseTypes.markdown b/_documentation/types/ofBaseTypes.markdown similarity index 100% rename from _docs/types/ofBaseTypes.markdown rename to _documentation/types/ofBaseTypes.markdown diff --git a/_docs/types/ofBaseUpdates.markdown b/_documentation/types/ofBaseUpdates.markdown similarity index 100% rename from _docs/types/ofBaseUpdates.markdown rename to _documentation/types/ofBaseUpdates.markdown diff --git a/_docs/types/ofBaseVideo.markdown b/_documentation/types/ofBaseVideo.markdown similarity index 100% rename from _docs/types/ofBaseVideo.markdown rename to _documentation/types/ofBaseVideo.markdown diff --git a/_docs/types/ofBaseVideoDraws.markdown b/_documentation/types/ofBaseVideoDraws.markdown similarity index 100% rename from _docs/types/ofBaseVideoDraws.markdown rename to _documentation/types/ofBaseVideoDraws.markdown diff --git a/_docs/types/ofBaseVideoGrabber.markdown b/_documentation/types/ofBaseVideoGrabber.markdown similarity index 100% rename from _docs/types/ofBaseVideoGrabber.markdown rename to _documentation/types/ofBaseVideoGrabber.markdown diff --git a/_docs/types/ofBaseVideoPlayer.markdown b/_documentation/types/ofBaseVideoPlayer.markdown similarity index 100% rename from _docs/types/ofBaseVideoPlayer.markdown rename to _documentation/types/ofBaseVideoPlayer.markdown diff --git a/_docs/types/ofColor.markdown b/_documentation/types/ofColor.markdown similarity index 100% rename from _docs/types/ofColor.markdown rename to _documentation/types/ofColor.markdown diff --git a/_docs/types/ofColor_.markdown b/_documentation/types/ofColor_.markdown similarity index 100% rename from _docs/types/ofColor_.markdown rename to _documentation/types/ofColor_.markdown diff --git a/_docs/types/ofNormalize.png b/_documentation/types/ofNormalize.png similarity index 100% rename from _docs/types/ofNormalize.png rename to _documentation/types/ofNormalize.png diff --git a/_docs/types/ofPoint.markdown b/_documentation/types/ofPoint.markdown similarity index 100% rename from _docs/types/ofPoint.markdown rename to _documentation/types/ofPoint.markdown diff --git a/_docs/types/ofRectangle.markdown b/_documentation/types/ofRectangle.markdown similarity index 100% rename from _docs/types/ofRectangle.markdown rename to _documentation/types/ofRectangle.markdown diff --git a/_docs/types/ofStyle.markdown b/_documentation/types/ofStyle.markdown similarity index 100% rename from _docs/types/ofStyle.markdown rename to _documentation/types/ofStyle.markdown diff --git a/_docs/types/ofTypes.markdown b/_documentation/types/ofTypes.markdown similarity index 100% rename from _docs/types/ofTypes.markdown rename to _documentation/types/ofTypes.markdown diff --git a/_docs/utils/ExtensionComparator.markdown b/_documentation/utils/ExtensionComparator.markdown similarity index 100% rename from _docs/utils/ExtensionComparator.markdown rename to _documentation/utils/ExtensionComparator.markdown diff --git a/_docs/utils/ofBuffer.markdown b/_documentation/utils/ofBuffer.markdown similarity index 100% rename from _docs/utils/ofBuffer.markdown rename to _documentation/utils/ofBuffer.markdown diff --git a/_docs/utils/ofConsoleLoggerChannel.markdown b/_documentation/utils/ofConsoleLoggerChannel.markdown similarity index 100% rename from _docs/utils/ofConsoleLoggerChannel.markdown rename to _documentation/utils/ofConsoleLoggerChannel.markdown diff --git a/_docs/utils/ofDirectory.markdown b/_documentation/utils/ofDirectory.markdown similarity index 100% rename from _docs/utils/ofDirectory.markdown rename to _documentation/utils/ofDirectory.markdown diff --git a/_docs/utils/ofFile.markdown b/_documentation/utils/ofFile.markdown similarity index 100% rename from _docs/utils/ofFile.markdown rename to _documentation/utils/ofFile.markdown diff --git a/_docs/utils/ofFileDialogResult.markdown b/_documentation/utils/ofFileDialogResult.markdown similarity index 100% rename from _docs/utils/ofFileDialogResult.markdown rename to _documentation/utils/ofFileDialogResult.markdown diff --git a/_docs/utils/ofFileLoggerChannel.markdown b/_documentation/utils/ofFileLoggerChannel.markdown similarity index 100% rename from _docs/utils/ofFileLoggerChannel.markdown rename to _documentation/utils/ofFileLoggerChannel.markdown diff --git a/_docs/utils/ofFilePath.markdown b/_documentation/utils/ofFilePath.markdown similarity index 100% rename from _docs/utils/ofFilePath.markdown rename to _documentation/utils/ofFilePath.markdown diff --git a/_docs/utils/ofFileUtils_functions.markdown b/_documentation/utils/ofFileUtils_functions.markdown similarity index 100% rename from _docs/utils/ofFileUtils_functions.markdown rename to _documentation/utils/ofFileUtils_functions.markdown diff --git a/_docs/utils/ofHttpRequest.markdown b/_documentation/utils/ofHttpRequest.markdown similarity index 100% rename from _docs/utils/ofHttpRequest.markdown rename to _documentation/utils/ofHttpRequest.markdown diff --git a/_docs/utils/ofHttpResponse.markdown b/_documentation/utils/ofHttpResponse.markdown similarity index 100% rename from _docs/utils/ofHttpResponse.markdown rename to _documentation/utils/ofHttpResponse.markdown diff --git a/_docs/utils/ofLog.markdown b/_documentation/utils/ofLog.markdown similarity index 100% rename from _docs/utils/ofLog.markdown rename to _documentation/utils/ofLog.markdown diff --git a/_docs/utils/ofLogError.markdown b/_documentation/utils/ofLogError.markdown similarity index 100% rename from _docs/utils/ofLogError.markdown rename to _documentation/utils/ofLogError.markdown diff --git a/_docs/utils/ofLogFatalError.markdown b/_documentation/utils/ofLogFatalError.markdown similarity index 100% rename from _docs/utils/ofLogFatalError.markdown rename to _documentation/utils/ofLogFatalError.markdown diff --git a/_docs/utils/ofLogNotice.markdown b/_documentation/utils/ofLogNotice.markdown similarity index 100% rename from _docs/utils/ofLogNotice.markdown rename to _documentation/utils/ofLogNotice.markdown diff --git a/_docs/utils/ofLogVerbose.markdown b/_documentation/utils/ofLogVerbose.markdown similarity index 100% rename from _docs/utils/ofLogVerbose.markdown rename to _documentation/utils/ofLogVerbose.markdown diff --git a/_docs/utils/ofLogWarning.markdown b/_documentation/utils/ofLogWarning.markdown similarity index 100% rename from _docs/utils/ofLogWarning.markdown rename to _documentation/utils/ofLogWarning.markdown diff --git a/_docs/utils/ofLog_functions.markdown b/_documentation/utils/ofLog_functions.markdown similarity index 100% rename from _docs/utils/ofLog_functions.markdown rename to _documentation/utils/ofLog_functions.markdown diff --git a/_docs/utils/ofPtr.markdown b/_documentation/utils/ofPtr.markdown similarity index 100% rename from _docs/utils/ofPtr.markdown rename to _documentation/utils/ofPtr.markdown diff --git a/_docs/utils/ofSystemUtils_functions.markdown b/_documentation/utils/ofSystemUtils_functions.markdown similarity index 100% rename from _docs/utils/ofSystemUtils_functions.markdown rename to _documentation/utils/ofSystemUtils_functions.markdown diff --git a/_docs/utils/ofThread.markdown b/_documentation/utils/ofThread.markdown similarity index 100% rename from _docs/utils/ofThread.markdown rename to _documentation/utils/ofThread.markdown diff --git a/_docs/utils/ofURLFileLoader.markdown b/_documentation/utils/ofURLFileLoader.markdown similarity index 100% rename from _docs/utils/ofURLFileLoader.markdown rename to _documentation/utils/ofURLFileLoader.markdown diff --git a/_docs/utils/ofURLFileLoader_functions.markdown b/_documentation/utils/ofURLFileLoader_functions.markdown similarity index 100% rename from _docs/utils/ofURLFileLoader_functions.markdown rename to _documentation/utils/ofURLFileLoader_functions.markdown diff --git a/_docs/utils/ofUtils.markdown b/_documentation/utils/ofUtils.markdown similarity index 100% rename from _docs/utils/ofUtils.markdown rename to _documentation/utils/ofUtils.markdown diff --git a/_docs/utils/ofUtils_functions.markdown b/_documentation/utils/ofUtils_functions.markdown similarity index 100% rename from _docs/utils/ofUtils_functions.markdown rename to _documentation/utils/ofUtils_functions.markdown diff --git a/_docs/utils/std::tr1::shared_ptr.markdown b/_documentation/utils/std::tr1::shared_ptr.markdown similarity index 100% rename from _docs/utils/std::tr1::shared_ptr.markdown rename to _documentation/utils/std::tr1::shared_ptr.markdown diff --git a/_docs/video/ofDirectShowGrabber.markdown b/_documentation/video/ofDirectShowGrabber.markdown similarity index 100% rename from _docs/video/ofDirectShowGrabber.markdown rename to _documentation/video/ofDirectShowGrabber.markdown diff --git a/_docs/video/ofGstAppSink.markdown b/_documentation/video/ofGstAppSink.markdown similarity index 100% rename from _docs/video/ofGstAppSink.markdown rename to _documentation/video/ofGstAppSink.markdown diff --git a/_docs/video/ofGstUtils.markdown b/_documentation/video/ofGstUtils.markdown similarity index 100% rename from _docs/video/ofGstUtils.markdown rename to _documentation/video/ofGstUtils.markdown diff --git a/_docs/video/ofGstVideoGrabber.markdown b/_documentation/video/ofGstVideoGrabber.markdown similarity index 100% rename from _docs/video/ofGstVideoGrabber.markdown rename to _documentation/video/ofGstVideoGrabber.markdown diff --git a/_docs/video/ofGstVideoPlayer.markdown b/_documentation/video/ofGstVideoPlayer.markdown similarity index 100% rename from _docs/video/ofGstVideoPlayer.markdown rename to _documentation/video/ofGstVideoPlayer.markdown diff --git a/_docs/video/ofGstVideoUtils.markdown b/_documentation/video/ofGstVideoUtils.markdown similarity index 100% rename from _docs/video/ofGstVideoUtils.markdown rename to _documentation/video/ofGstVideoUtils.markdown diff --git a/_docs/video/ofQuickTimePlayer.markdown b/_documentation/video/ofQuickTimePlayer.markdown similarity index 100% rename from _docs/video/ofQuickTimePlayer.markdown rename to _documentation/video/ofQuickTimePlayer.markdown diff --git a/_docs/video/ofVideoGrabber.markdown b/_documentation/video/ofVideoGrabber.markdown similarity index 100% rename from _docs/video/ofVideoGrabber.markdown rename to _documentation/video/ofVideoGrabber.markdown diff --git a/_docs/video/ofVideoPlayer.markdown b/_documentation/video/ofVideoPlayer.markdown similarity index 100% rename from _docs/video/ofVideoPlayer.markdown rename to _documentation/video/ofVideoPlayer.markdown diff --git a/_docs/video/ofiPhoneVideoGrabber.markdown b/_documentation/video/ofiPhoneVideoGrabber.markdown similarity index 100% rename from _docs/video/ofiPhoneVideoGrabber.markdown rename to _documentation/video/ofiPhoneVideoGrabber.markdown diff --git a/_docs/video/ofiPhoneVideoPlayer.markdown b/_documentation/video/ofiPhoneVideoPlayer.markdown similarity index 100% rename from _docs/video/ofiPhoneVideoPlayer.markdown rename to _documentation/video/ofiPhoneVideoPlayer.markdown diff --git a/_templates/docs.mako b/_templates/documentation.mako similarity index 87% rename from _templates/docs.mako rename to _templates/documentation.mako index 4a9aef540..845deaa08 100644 --- a/_templates/docs.mako +++ b/_templates/documentation.mako @@ -25,7 +25,7 @@ Show advanced?
yes / no -
+

download

html

-    ${clazz['name']}
+    ${clazz['name']}
% if 'methods' in clazz: % for method in clazz['methods']: -     ${method}
+     ${method}
% endfor % endif @@ -34,7 +34,7 @@ % if 'variables' in clazz: % for variable in clazz['variables']: -     ${variable}
+     ${variable}
% endfor % endif diff --git a/_templates/docs_method.mako b/_templates/documentation_method.mako similarity index 63% rename from _templates/docs_method.mako rename to _templates/documentation_method.mako index 68516fc59..addcffc0a 100644 --- a/_templates/docs_method.mako +++ b/_templates/documentation_method.mako @@ -1,15 +1,15 @@ <%page args="method"/> -
+
<% params = "()" if method.parameters=="" else "(...)" %>

${method.name}${params}

${method.returns} ${method.clazz}::${method.name}(${method.parameters})

-
+
${method.summary} <%self:filter chain="markdown_template"> ${method.description}
- +
<%def name="filter(chain)"> diff --git a/_templates/docs_var.mako b/_templates/documentation_var.mako similarity index 50% rename from _templates/docs_var.mako rename to _templates/documentation_var.mako index 12911d5a0..70bf85e41 100644 --- a/_templates/docs_var.mako +++ b/_templates/documentation_var.mako @@ -1,11 +1,11 @@ <%page args="var"/> -
+

${var.type} ${var.name}

${var.type} ${var.clazz}::${var.name}

-
+
${var.description}
- +
diff --git a/_templates/header.mako b/_templates/header.mako index baf7ebfb9..252685623 100644 --- a/_templates/header.mako +++ b/_templates/header.mako @@ -11,7 +11,7 @@
  • about
  • download
  • -
  • documentation
  • +
  • documentation
  • gallery
  • community
  • diff --git a/_tools/docs_class.py b/_tools/documentation_class.py similarity index 95% rename from _tools/docs_class.py rename to _tools/documentation_class.py index 347b82ec3..2f7f8cbc7 100755 --- a/_tools/docs_class.py +++ b/_tools/documentation_class.py @@ -1,8 +1,8 @@ #!/usr/bin/python -#import docs_functions +#import documentation_functions import sys -from docs_members import DocsMethod,DocsVar -#sys.path.append( "/var/www/test_new_docs/" ) +from documentation_members import DocsMethod,DocsVar +#sys.path.append( "/var/www/test_new_documentation/" ) import os import fileinput diff --git a/_tools/docs_function.py b/_tools/documentation_function.py similarity index 100% rename from _tools/docs_function.py rename to _tools/documentation_function.py diff --git a/_tools/docs_group.py b/_tools/documentation_group.py similarity index 87% rename from _tools/docs_group.py rename to _tools/documentation_group.py index 11135cfd9..26b3e4163 100755 --- a/_tools/docs_group.py +++ b/_tools/documentation_group.py @@ -1,4 +1,4 @@ -import docs_class +import documentation_class class DocsGroup: def __init__(self,groupid): diff --git a/_tools/docs_members.py b/_tools/documentation_members.py similarity index 100% rename from _tools/docs_members.py rename to _tools/documentation_members.py diff --git a/_tools/docs_method.py b/_tools/documentation_method.py similarity index 100% rename from _tools/docs_method.py rename to _tools/documentation_method.py diff --git a/_tools/docs_update.py b/_tools/documentation_update.py similarity index 86% rename from _tools/docs_update.py rename to _tools/documentation_update.py index 281df51e4..5077c8403 100755 --- a/_tools/docs_update.py +++ b/_tools/documentation_update.py @@ -5,15 +5,15 @@ import os import sys -from docs_class import DocsClass +from documentation_class import DocsClass from markdown_file import getclass,setclass,getfunctionsfile,setfunctionsfile -from docs_members import DocsMethod, DocsVar -from docs_function import DocsFunctionsFile, DocsFunction +from documentation_members import DocsMethod, DocsVar +from documentation_function import DocsFunctionsFile, DocsFunction of_src = '/home/arturo/Escritorio/openFrameworks/libs/openFrameworks/' -of_docs = of_src + 'doxygensource/xml/' -docs_root = '/home/arturo/Documentos/new_of_site/docs/' -#index = open(docs_root + "index.html.mako",'w') +of_documentation = of_src + 'doxygensource/xml/' +documentation_root = '/home/arturo/Documentos/new_of_site/documentation/' +#index = open(documentation_root + "index.html.mako",'w') missing_functions = [] @@ -99,13 +99,13 @@ def serialize_class(filename): doxygen = xml.getroot() clazz = doxygen.compounddef - docs_class = getclass(clazz.compoundname.text) + documentation_class = getclass(clazz.compoundname.text) - #f = open('docs/' + classname + ".html.mako",'w') + #f = open('documentation/' + classname + ".html.mako",'w') #index.write("[" + classname + "](" + classname + ".html)\n\n") - #f.write( '<%inherit file="_templates/docs.mako" />\n' ) + #f.write( '<%inherit file="_templates/documentation.mako" />\n' ) #f.write( '___' + classname + "___\n" ) inheritsfrom = [] @@ -122,7 +122,7 @@ def serialize_class(filename): else: #f.write( "$$code(lang=c++)\n" ) if member.get("kind") == 'variable': - var = docs_class.var_by_name(member.name.text) + var = documentation_class.var_by_name(member.name.text) if not var: var = DocsVar(0) var.name = member.name.text @@ -131,18 +131,18 @@ def serialize_class(filename): var.version_deprecated = "" var.constant = member.get("mutable")=="no" var.static = member.get("static") - var.clazz = docs_class.name + var.clazz = documentation_class.name var.type = member.type.ref.text if hasattr(member.type,'ref') else member.type.text - docs_class.var_list.append(var) + documentation_class.var_list.append(var) #f.write( str(member.type.text) + " " + str(member.name.text) + "\n" ) if member.get("kind") == 'function': argstring = str(member.argsstring.text) params = argstring[argstring.find('(')+1:argstring.rfind(')')] returns = member.type.ref.text if hasattr(member.type,'ref') else member.type.text returns = ("" if returns is None else returns) - method = docs_class.function_by_signature(member.name.text, returns, params) + method = documentation_class.function_by_signature(member.name.text, returns, params) method.static = member.get("static") - method.clazz = docs_class.name + method.clazz = documentation_class.name method.access = member.get("prot") method.returns = returns #method.description = method.description.replace("~~~~{.brush: cpp}","~~~~{.cpp}").replace('',"~~~~") @@ -153,11 +153,11 @@ def serialize_class(filename): #f.write( "$$/code\n\n\n\n" ) #f.close() - setclass(docs_class) + setclass(documentation_class) -#index.write( '<%inherit file="_templates/docs.mako" />\n' ) -for root, dirs, files in os.walk(of_docs): +#index.write( '<%inherit file="_templates/documentation.mako" />\n' ) +for root, dirs, files in os.walk(of_documentation): for name in files: filename = os.path.join(root, name) if name.find('class')==0: @@ -165,7 +165,7 @@ def serialize_class(filename): elif name.find('of_')==0 and name.find('8h.xml')!=-1: serialize_functionsfile(filename) -for root, dirs, files in os.walk(of_docs): +for root, dirs, files in os.walk(of_documentation): for name in files: filename = os.path.join(root, name) if name.find('of_')==0 and name.find('8h.xml')!=-1: diff --git a/_tools/docs_update_addons.py b/_tools/documentation_update_addons.py similarity index 75% rename from _tools/docs_update_addons.py rename to _tools/documentation_update_addons.py index 0d5c8123a..acc434f85 100755 --- a/_tools/docs_update_addons.py +++ b/_tools/documentation_update_addons.py @@ -5,12 +5,12 @@ import os import sys -from docs_class import DocsClass +from documentation_class import DocsClass from markdown_file import getclass,setclass -from docs_members import DocsMethod, DocsVar +from documentation_members import DocsMethod, DocsVar of_src = '/home/arturo/Escritorio/openFrameworks/addons' -of_docs = of_src + '/doxygensource/xml/' +of_documentation = of_src + '/doxygensource/xml/' currentversion = "007" @@ -19,7 +19,7 @@ def serialize_class(filename): doxygen = xml.getroot() clazz = doxygen.compounddef - docs_class = getclass(clazz.compoundname.text) + documentation_class = getclass(clazz.compoundname.text) inheritsfrom = [] if clazz.find('derivedcompoundref')!=None: @@ -33,7 +33,7 @@ def serialize_class(filename): pass else: if member.get("kind") == 'variable': - var = docs_class.var_by_name(member.name.text) + var = documentation_class.var_by_name(member.name.text) if not var: var = DocsVar(0) var.name = member.name.text @@ -42,26 +42,26 @@ def serialize_class(filename): var.version_deprecated = "" var.constant = member.get("mutable")=="no" var.static = member.get("static") - var.clazz = docs_class.name + var.clazz = documentation_class.name var.type = member.type.ref.text if hasattr(member.type,'ref') else member.type.text - docs_class.var_list.append(var) + documentation_class.var_list.append(var) if member.get("kind") == 'function': argstring = str(member.argsstring.text) params = argstring[argstring.find('(')+1:argstring.rfind(')')] returns = member.type.ref.text if hasattr(member.type,'ref') else member.type.text returns = ("" if returns is None else returns) - method = docs_class.function_by_signature(member.name.text, returns, params) + method = documentation_class.function_by_signature(member.name.text, returns, params) method.static = member.get("static") - method.clazz = docs_class.name + method.clazz = documentation_class.name method.access = member.get("prot") method.returns = returns if method.new: method.version_started = currentversion - setclass(docs_class) + setclass(documentation_class) -for root, dirs, files in os.walk(of_docs): +for root, dirs, files in os.walk(of_documentation): for name in files: filename = os.path.join(root, name) if name.find('class')==0: diff --git a/_tools/markdown_file.py b/_tools/markdown_file.py index 9728b0760..107d4943a 100644 --- a/_tools/markdown_file.py +++ b/_tools/markdown_file.py @@ -1,22 +1,22 @@ -#import docs_files -from docs_members import DocsMethod -from docs_members import DocsVar -from docs_class import DocsClass -from docs_function import DocsFunctionsFile, DocsFunction +#import documentation_files +from documentation_members import DocsMethod +from documentation_members import DocsVar +from documentation_class import DocsClass +from documentation_function import DocsFunctionsFile, DocsFunction import os -docs_root = '_docs/' +documentation_root = '_documentation/' def list_all_addons(): modules = [] - for root, dirs, files in os.walk(docs_root+"addons"): + for root, dirs, files in os.walk(documentation_root+"addons"): for name in dirs: modules.append(name) return modules def list_all_modules(): modules = [] - for root, dirs, files in os.walk(docs_root): + for root, dirs, files in os.walk(documentation_root): for name in dirs: if name.find("ofx")!=0: modules.append(name) @@ -24,7 +24,7 @@ def list_all_modules(): def list_all_addon_files(addon=''): module_files = [] - for root, dirs, files in os.walk(os.path.join(docs_root, 'addons', addon)): + for root, dirs, files in os.walk(os.path.join(documentation_root, 'addons', addon)): for name in files: file_split = os.path.splitext(name) if file_split[1]=='.markdown': @@ -33,7 +33,7 @@ def list_all_addon_files(addon=''): def list_all_files(module=''): module_files = [] - for root, dirs, files in os.walk(os.path.join(docs_root, module)): + for root, dirs, files in os.walk(os.path.join(documentation_root, module)): for name in files: file_split = os.path.splitext(name) if file_split[1]=='.markdown': @@ -51,7 +51,7 @@ def addfield(method,line): def getfunctionsfiles_list(): functionsfiles_list = [] - for root, dirs, files in os.walk(os.path.join(docs_root)): + for root, dirs, files in os.walk(os.path.join(documentation_root)): for name in files: file_split = os.path.splitext(name) if file_split[1]=='.markdown': @@ -70,7 +70,7 @@ def getfunctionsfile(filename): functionsfile.name = filename functionsfile.new = 1 function = DocsFunction(0) - for root, dirs, files in os.walk(os.path.join(docs_root)): + for root, dirs, files in os.walk(os.path.join(documentation_root)): for name in files: file_split = os.path.splitext(name) if file_split[1]=='.markdown' and file_split[0] == filename+"_functions": @@ -102,7 +102,7 @@ def getfunctionsfile(filename): def getclass_list(): class_list = [] - for root, dirs, files in os.walk(os.path.join(docs_root)): + for root, dirs, files in os.walk(os.path.join(documentation_root)): for name in files: file_split = os.path.splitext(name) if file_split[1]=='.markdown': @@ -119,11 +119,11 @@ def getclass_list(): def getclass(clazz): method = DocsMethod(0) var = DocsVar(0) - docs_clazz = DocsClass(0) + documentation_clazz = DocsClass(0) var.clazz = clazz - docs_clazz.name = clazz - docs_clazz.new = True - for root, dirs, files in os.walk(os.path.join(docs_root)): + documentation_clazz.name = clazz + documentation_clazz.new = True + for root, dirs, files in os.walk(os.path.join(documentation_root)): for name in files: file_split = os.path.splitext(name) if file_split[1]=='.markdown' and file_split[0] == clazz: @@ -133,8 +133,8 @@ def getclass(clazz): for line in f: if state == 'begin' and line.find('#class') == 0 and line.find(clazz)!=-1: state = 'class' - docs_clazz.module = os.path.basename(root) - docs_clazz.new = False + documentation_clazz.module = os.path.basename(root) + documentation_clazz.new = False elif state == 'class' and line.rstrip('\n').rstrip(' ') == '##Methods': state = 'methods' @@ -155,14 +155,14 @@ def getclass(clazz): elif state == 'description' and line.find('###') == 0: state = 'method' - docs_clazz.function_list.append(method) + documentation_clazz.function_list.append(method) method = DocsMethod(0) - method.clazz = docs_clazz.name + method.clazz = documentation_clazz.name method.linenum = linenum method.file = os.path.join(root,name) elif state == 'description' and line.rstrip('\n').rstrip(' ') == '##Variables': - docs_clazz.function_list.append(method) + documentation_clazz.function_list.append(method) state = 'vars' elif state == 'vars' and line.find('###') == 0: @@ -181,22 +181,22 @@ def getclass(clazz): elif state == 'vardescription' and line.find('###') == 0: #print line state = 'var' - docs_clazz.var_list.append(var) + documentation_clazz.var_list.append(var) var = DocsVar(0) - var.clazz = docs_clazz.name + var.clazz = documentation_clazz.name var.linenum = linenum var.file = os.path.join(root,name) elif state == 'class' and line.find('##Description')==-1: - docs_clazz.reference = docs_clazz.reference + line + documentation_clazz.reference = documentation_clazz.reference + line linenum = linenum + 1 if state == 'vardescription': - docs_clazz.var_list.append(var) + documentation_clazz.var_list.append(var) f.close() - return docs_clazz + return documentation_clazz - return docs_clazz + return documentation_clazz def serialize_function(f,function,member): @@ -242,10 +242,10 @@ def serialize_var(f,var): def setclass(clazz): try: - os.mkdir(os.path.join(docs_root,clazz.module)) + os.mkdir(os.path.join(documentation_root,clazz.module)) except: pass - f = open(os.path.join(docs_root,clazz.module,clazz.name)+".markdown",'w') + f = open(os.path.join(documentation_root,clazz.module,clazz.name)+".markdown",'w') f.write('#class ' + clazz.name + '\n\n\n') #f.write('//----------------------\n\n') @@ -271,10 +271,10 @@ def setclass(clazz): def setfunctionsfile(functionfile): try: - os.mkdir(os.path.join(docs_root,functionfile.module)) + os.mkdir(os.path.join(documentation_root,functionfile.module)) except: pass - f = open(os.path.join(docs_root,functionfile.module,functionfile.name)+"_functions.markdown",'w') + f = open(os.path.join(documentation_root,functionfile.module,functionfile.name)+"_functions.markdown",'w') f.write('#functions\n\n') f.write('##Description\n\n' + functionfile.description + '\n\n\n\n') diff --git a/_tools/ofReference2markdown.py b/_tools/ofReference2markdown.py index 40d7938b7..75be4d83e 100644 --- a/_tools/ofReference2markdown.py +++ b/_tools/ofReference2markdown.py @@ -1,12 +1,12 @@ from markdown_file import getclass, setclass import os -from docs_members import DocsMethod, DocsVar +from documentation_members import DocsMethod, DocsVar import re import shutil import codecs ofReference_path = '/home/arturo/Documentos/ofReference' -docs_root = '/home/arturo/Documentos/new_of_site/_docs/' +documentation_root = '/home/arturo/Documentos/new_of_site/_documentation/' def remove_links(string): ret = "" @@ -115,10 +115,10 @@ def ofReferenceConvert(): file_split = os.path.splitext(name) if file_split[1]==".jpeg" or file_split[1]==".jpg" or file_split[1]==".gif" or file_split[1]==".png": try: - os.mkdir(os.path.join(docs_root,os.path.basename(root))) + os.mkdir(os.path.join(documentation_root,os.path.basename(root))) except: pass - shutil.copyfile(os.path.join(root,name), os.path.join(docs_root,os.path.basename(root),name)) + shutil.copyfile(os.path.join(root,name), os.path.join(documentation_root,os.path.basename(root),name)) if file_split[1]=='.markdown': print '###################get_class ' + file_split[0] clazz = getclass(file_split[0]) diff --git a/_tools/testwsgi.py b/_tools/testwsgi.py index 50b5bdc9f..3eead1eba 100755 --- a/_tools/testwsgi.py +++ b/_tools/testwsgi.py @@ -1,11 +1,11 @@ #!/usr/bin/python import sys -sys.path.append( "/var/www/test_new_docs/" ) +sys.path.append( "/var/www/test_new_documentation/" ) import os import fileinput -import docs_group +import documentation_group import MySQLdb import traceback @@ -39,7 +39,7 @@ def index(): db=MySQLdb.connect(host='localhost',user='root',passwd='asdqwe34',db='of_site09') template = Template(renderIndex, str(file.read())) - groups = docs_group.list_all(db,"core", 0) + groups = documentation_group.list_all(db,"core", 0) html = str(template.render(groups)) except Exception as inst: diff --git a/css/print.css b/css/print.css index b530cca2c..2b96dfc0a 100644 --- a/css/print.css +++ b/css/print.css @@ -432,16 +432,16 @@ hr{ } */ -/* ************* docs list ************* */ +/* ************* documentation list ************* */ -.docs_col{ +.documentation_col{ width: 210px; margin: 0px 20px 5px 0px; float: left; position: relative; } -.docs_group{ +.documentation_group{ width: 210px; line-height: 140%; @@ -451,7 +451,7 @@ hr{ position: relative; /*border: 1px solid #D7D7D7;*/ } -.docs_group_head{ +.documentation_group_head{ background: #E1E1E1; width: 210px; float: left; @@ -461,7 +461,7 @@ hr{ font-weight: bold; } -.docs_class{ +.documentation_class{ width: 210px; padding: 10px 0px 15px 0px; margin: 5px 0px 10px 0px; @@ -471,25 +471,25 @@ hr{ background: #F7F7F7; } -.beginners .docs_col{ +.beginners .documentation_col{ width: 230px; margin-right: 80px; } -.beginners .docs_group{ +.beginners .documentation_group{ width: 230px; } -.beginners .docs_group_head{ +.beginners .documentation_group_head{ width: 230px; } -.beginners .docs_class{ +.beginners .documentation_class{ width: 230px; } -/* ************* docs detail ************* */ +/* ************* documentation detail ************* */ -.docs_detail_table{ +.documentation_detail_table{ width: 650px; margin: 0px 0px 30px 0px; padding: 5px 0px 0px 0px; @@ -498,7 +498,7 @@ hr{ line-height:20px; } -.docs_detail_table_offset{ +.documentation_detail_table_offset{ width: 650px; margin: 0px 0px 25px 0px; padding: 5px 0px 0px 40px; @@ -506,7 +506,7 @@ line-height:20px; position: relative; } -.docs_detail_wide_col{ +.documentation_detail_wide_col{ width: 650px; margin: 0px; padding: 0px 0px 5px 0px; @@ -523,7 +523,7 @@ border-top-style:solid; -.docs_detail_wide_col_tiny{ +.documentation_detail_wide_col_tiny{ width: 600px; margin: 0px; padding: 0px 0px 10px 0px; @@ -533,7 +533,7 @@ border-top-style:solid; font-weight: normal; color: #CCCCCC; } -.docs_detail_wide_col_nav{ +.documentation_detail_wide_col_nav{ width: 650px; margin: 0px; padding: 0px 0px 5px 0px; @@ -544,7 +544,7 @@ border-top-style:solid; text-align: right; } -.docs_detail_left_col{ +.documentation_detail_left_col{ width: 170px; margin: 0px; padding: 0px 0px 10px 0px; @@ -554,7 +554,7 @@ border-top-style:solid; font-weight: bold; } -.docs_detail_right_col{ +.documentation_detail_right_col{ width: 480px; margin: 0px; padding: 0px 0px 10px 0px; @@ -564,151 +564,151 @@ font-size:12px; } -/* ************* docs links ************* */ +/* ************* documentation links ************* */ -a.docs_func{ +a.documentation_func{ text-decoration: none; color: #3A3839; background: none; } -a:link.docs_func{ +a:link.documentation_func{ text-decoration: none; color: #3A3839; background: none; } -a:visited.docs_func{ +a:visited.documentation_func{ text-decoration: none; color: #3A3839; background: none; } -a:hover.docs_func{ +a:hover.documentation_func{ text-decoration: none; color: #FFFFFF; background: #3A3839; } -a:active.docs_func{ +a:active.documentation_func{ text-decoration: none; color: #3A3839; background: none; } -a.docs_file_func{ +a.documentation_file_func{ text-decoration: none; color: #00FF00; background: none; } -a:link.docs_file_func{ +a:link.documentation_file_func{ text-decoration: none; color: #3A3839; background: none; } -a:visited.docs_file_func{ +a:visited.documentation_file_func{ text-decoration: none; color: #3A3839; background: none; } -a:hover.docs_file_func{ +a:hover.documentation_file_func{ text-decoration: none; color: #FFFFFF; background: #3A3839; } -a:active.docs_file_func{ +a:active.documentation_file_func{ text-decoration: none; color: #3A3839; background: none; } -a.docs_vars{ +a.documentation_vars{ text-decoration: none; color: #565455; background: none; } -a:link.docs_vars{ +a:link.documentation_vars{ text-decoration: none; color: #565455; background: none; } -a:visited.docs_vars{ +a:visited.documentation_vars{ text-decoration: none; color: #565455; background: none; } -a:hover.docs_vars{ +a:hover.documentation_vars{ text-decoration: none; color: #FFFFFF; background: #565455; } -a:active.docs_vars{ +a:active.documentation_vars{ text-decoration: none; color: #565455; background: none; } -a.docs_file_vars{ +a.documentation_file_vars{ text-decoration: none; color: #565455; background: none; } -a:link.docs_file_vars{ +a:link.documentation_file_vars{ text-decoration: none; color: #565455; background: none; } -a:visited.docs_file_vars{ +a:visited.documentation_file_vars{ text-decoration: none; color: #565455; background: none; } -a:hover.docs_file_vars{ +a:hover.documentation_file_vars{ text-decoration: none; color: #FFFFFF; background: #565455; } -a:active.docs_file_vars{ +a:active.documentation_file_vars{ text-decoration: none; color: #565455; background: none; } -.docs_class_link{line-height:190%;} +.documentation_class_link{line-height:190%;} -a.docs_class_link, a:link.docs_class_link, a:visited.docs_class_link, a:hover.docs_class_link, a:active.docs_class_link{ text-decoration: none; } +a.documentation_class_link, a:link.documentation_class_link, a:visited.documentation_class_link, a:hover.documentation_class_link, a:active.documentation_class_link{ text-decoration: none; } -.docs-syntax-text{ +.documentation-syntax-text{ font-weight:bold; } -.docs-description-text{ +.documentation-description-text{ color:#333333; font-size:12px; line-height:16px; letter-spacing: 0.2px; } -.docs-detail-title{ +.documentation-detail-title{ padding-top:5px; padding-bottom:15px; font-size:14px; } -.docs-returns-type{ +.documentation-returns-type{ font-weight:bold; } diff --git a/css/style.css b/css/style.css index 43b48960d..c8ed0968b 100644 --- a/css/style.css +++ b/css/style.css @@ -451,16 +451,16 @@ hr { margin-bottom: 5em; margin-top: 5em; } -.docs_col { +.documentation_col { float: left; margin: 0px 0 5px 0px; position: relative; width: 31%; } -.docs_col:nth-child(2), .docs_col:nth-child(3) { +.documentation_col:nth-child(2), .documentation_col:nth-child(3) { margin-left: 3%; } -.docs_group { +.documentation_group { float: left; line-height: 140%; margin: 0px 0px 20px 0px; @@ -468,7 +468,7 @@ hr { position: relative; width: 100%; } -.docs_group_head { +.documentation_group_head { background: #E1E1E1; color: black000; float: left; @@ -477,7 +477,7 @@ hr { padding: 3px 0px 3px 0px; width: 100%; } -.docs_class { +.documentation_class { background: #F7F7F7; float: left; margin: 0px; @@ -485,20 +485,20 @@ hr { position: relative; width: 100%; } -.beginners .docs_col { +.beginners .documentation_col { margin-right: 80px; width: 250px; } -.beginners .docs_group { +.beginners .documentation_group { width: 100%; } -.beginners .docs_group_head { +.beginners .documentation_group_head { width: 100%; } -.beginners .docs_class { +.beginners .documentation_class { width: 100%; } -.docs_detail { +.documentation_detail { float: left; line-height: 20px; margin: 0px 0px 30px 0px; @@ -506,14 +506,14 @@ hr { position: relative; width: 650px; } -.docs_detail_table_offset { +.documentation_detail_table_offset { float: left; margin: 0px 0px 25px 0px; padding: 5px 0px 0px 40px; position: relative; width: 650px; } -.docs_detail h1 { +.documentation_detail h1 { border-top-color: #EEEEEE; border-top-style: solid; border-top-width: 1px; @@ -526,7 +526,7 @@ hr { position: relative; width: 650px; } -.docs_detail h2 { +.documentation_detail h2 { color: #666; float: left; font-size: 0.84em; @@ -536,7 +536,7 @@ hr { position: relative; width: 600px; } -.docs_detail_wide_col_nav { +.documentation_detail_wide_col_nav { float: left; font-size: 0.84em; font-weight: normal; @@ -546,7 +546,7 @@ hr { text-align: right; width: 650px; } -.docs_detail_left_col { +.documentation_detail_left_col { color: #A3A3A3; float: left; font-weight: bold; @@ -555,137 +555,137 @@ hr { position: relative; width: 170px; } -.docs_detail_description { +.documentation_detail_description { float: left; font-size: 12px; margin: 0px; padding: 0px 0px 10px 0px; position: relative; } -.docs_detail_right_col img { +.documentation_detail_right_col img { max-width: 480px; } -a.docs_func { +a.documentation_func { background: none; color: #3A3839; text-decoration: none; } -a:link.docs_func { +a:link.documentation_func { background: none; color: #3A3839; text-decoration: none; } -a:visited.docs_func { +a:visited.documentation_func { background: none; color: #3A3839; text-decoration: none; } -a:hover.docs_func { +a:hover.documentation_func { background: #3A3839; color: white; text-decoration: none; } -a:active.docs_func { +a:active.documentation_func { background: none; color: #3A3839; text-decoration: none; } -a.docs_file_func { +a.documentation_file_func { background: none; color: #00FF00; text-decoration: none; } -a:link.docs_file_func { +a:link.documentation_file_func { background: none; color: #3A3839; text-decoration: none; } -a:visited.docs_file_func { +a:visited.documentation_file_func { background: none; color: #3A3839; text-decoration: none; } -a:hover.docs_file_func { +a:hover.documentation_file_func { background: #3A3839; color: white; text-decoration: none; } -a:active.docs_file_func { +a:active.documentation_file_func { background: none; color: #3A3839; text-decoration: none; } -a.docs_vars { +a.documentation_vars { background: none; color: #565455; text-decoration: none; } -a:link.docs_vars { +a:link.documentation_vars { background: none; color: #565455; text-decoration: none; } -a:visited.docs_vars { +a:visited.documentation_vars { background: none; color: #565455; text-decoration: none; } -a:hover.docs_vars { +a:hover.documentation_vars { background: #565455; color: white; text-decoration: none; } -a:active.docs_vars { +a:active.documentation_vars { background: none; color: #565455; text-decoration: none; } -a.docs_file_vars { +a.documentation_file_vars { background: none; color: #565455; text-decoration: none; } -a:link.docs_file_vars { +a:link.documentation_file_vars { background: none; color: #565455; text-decoration: none; } -a:visited.docs_file_vars { +a:visited.documentation_file_vars { background: none; color: #565455; text-decoration: none; } -a:hover.docs_file_vars { +a:hover.documentation_file_vars { background: #565455; color: white; text-decoration: none; } -a:active.docs_file_vars { +a:active.documentation_file_vars { background: none; color: #565455; text-decoration: none; } -.docs_class_link { +.documentation_class_link { line-height: 190%; } -a.docs_class_link, a:link.docs_class_link, a:visited.docs_class_link, a:hover.docs_class_link, a:active.docs_class_link { +a.documentation_class_link, a:link.documentation_class_link, a:visited.documentation_class_link, a:hover.documentation_class_link, a:active.documentation_class_link { text-decoration: none; } -.docs-syntax-text { +.documentation-syntax-text { font-weight: bold; } -.docs-description-text { +.documentation-description-text { color: #333333; font-size: 12px; letter-spacing: 0.2px; line-height: 16px; } -.docs-detail-title { +.documentation-detail-title { font-size: 14px; padding-bottom: 15px; padding-top: 5px; } -.docs-returns-type { +.documentation-returns-type { font-weight: bold; } pre { @@ -782,7 +782,7 @@ div.galleryItem p { #download-latest-header { margin-bottom: 3em; } -#download-latest-platform, #docs-ebook { +#download-latest-platform, #documentation-ebook { background-color: #eee; height: 175px; margin-bottom: 1em; @@ -797,7 +797,7 @@ div.galleryItem p { #download-latest-platform p { margin: 0; } -#docs-ebook { +#documentation-ebook { float: right; margin-top: 20px; } diff --git a/index.html.mako b/index.html.mako index b309999a5..10c84a714 100644 --- a/index.html.mako +++ b/index.html.mako @@ -14,7 +14,7 @@

    download

    Grab the most recent release and follow the setup guide to get openFrameworks running.

    -

    documentation

    +

    documentation

    Reference for openFrameworks classes, functions and addons. For guides and tutorials, see the wiki.

    forum

    diff --git a/js/docs.js b/js/documentation.js similarity index 100% rename from js/docs.js rename to js/documentation.js