From c442b9c35742715e6849efe25ad505460d3ee146 Mon Sep 17 00:00:00 2001 From: xarkes Date: Tue, 26 Feb 2019 18:50:03 +0100 Subject: [PATCH] Merged docs-ref temporary folder to docs --- docs-ref/.gitignore | 3 - docs/.gitignore | 7 +-- docs/404.html | 24 -------- {docs-ref => docs}/Doxyfile | 0 docs/Gemfile | 30 ---------- {docs-ref => docs}/Makefile | 0 docs/_config.yml | 54 ------------------ {docs-ref => docs}/apidoc.py | 0 {docs-ref => docs}/source/api.rst | 0 {docs-ref => docs}/source/building.rst | 0 {docs-ref => docs}/source/code.rst | 0 {docs-ref => docs}/source/common-errors.rst | 0 {docs-ref => docs}/source/conf.py | 0 .../source/images/cutter_path_settings.png | Bin .../source/images/screenshot.png | Bin {docs-ref => docs}/source/index.rst | 0 {docs-ref => docs}/source/shortcuts.rst | 0 17 files changed, 3 insertions(+), 115 deletions(-) delete mode 100644 docs-ref/.gitignore delete mode 100644 docs/404.html rename {docs-ref => docs}/Doxyfile (100%) delete mode 100644 docs/Gemfile rename {docs-ref => docs}/Makefile (100%) delete mode 100644 docs/_config.yml rename {docs-ref => docs}/apidoc.py (100%) rename {docs-ref => docs}/source/api.rst (100%) rename {docs-ref => docs}/source/building.rst (100%) rename {docs-ref => docs}/source/code.rst (100%) rename {docs-ref => docs}/source/common-errors.rst (100%) rename {docs-ref => docs}/source/conf.py (100%) rename {docs-ref => docs}/source/images/cutter_path_settings.png (100%) rename {docs-ref => docs}/source/images/screenshot.png (100%) rename {docs-ref => docs}/source/index.rst (100%) rename {docs-ref => docs}/source/shortcuts.rst (100%) diff --git a/docs-ref/.gitignore b/docs-ref/.gitignore deleted file mode 100644 index 5a982a1a..00000000 --- a/docs-ref/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/doxygen-out -/build -/source/api diff --git a/docs/.gitignore b/docs/.gitignore index a8cfca09..5a982a1a 100644 --- a/docs/.gitignore +++ b/docs/.gitignore @@ -1,4 +1,3 @@ -_site/ -.sass-cache -.jekyll-metadata -Gemfile.lock +/doxygen-out +/build +/source/api diff --git a/docs/404.html b/docs/404.html deleted file mode 100644 index c472b4ea..00000000 --- a/docs/404.html +++ /dev/null @@ -1,24 +0,0 @@ ---- -layout: default ---- - - - -
-

404

- -

Page not found :(

-

The requested page could not be found.

-
diff --git a/docs-ref/Doxyfile b/docs/Doxyfile similarity index 100% rename from docs-ref/Doxyfile rename to docs/Doxyfile diff --git a/docs/Gemfile b/docs/Gemfile deleted file mode 100644 index f87b23fd..00000000 --- a/docs/Gemfile +++ /dev/null @@ -1,30 +0,0 @@ -source "https://rubygems.org" - -# Hello! This is where you manage which Jekyll version is used to run. -# When you want to use a different version, change it below, save the -# file and run `bundle install`. Run Jekyll with `bundle exec`, like so: -# -# bundle exec jekyll serve -# -# This will help ensure the proper Jekyll version is running. -# Happy Jekylling! -#gem "jekyll", "~> 3.7.4" - -# This is the default theme for new Jekyll sites. You may change this to anything you like. -gem "minima", "~> 2.0" - -# If you want to use GitHub Pages, remove the "gem "jekyll"" above and -# uncomment the line below. To upgrade, run `bundle update github-pages`. -gem "github-pages", group: :jekyll_plugins - -# If you have any plugins, put them here! -group :jekyll_plugins do - #gem "jekyll-feed", "~> 0.6" -end - -# Windows does not include zoneinfo files, so bundle the tzinfo-data gem -gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby] - -# Performance-booster for watching directories on Windows -gem "wdm", "~> 0.1.0" if Gem.win_platform? - diff --git a/docs-ref/Makefile b/docs/Makefile similarity index 100% rename from docs-ref/Makefile rename to docs/Makefile diff --git a/docs/_config.yml b/docs/_config.yml deleted file mode 100644 index ac9941a0..00000000 --- a/docs/_config.yml +++ /dev/null @@ -1,54 +0,0 @@ -name: Cutter -title: Cutter - -project: - version: 1.7.4 - download_url: https://github.com/radareorg/cutter/releases - -license: - software: GPLv3 - software_url: https://opensource.org/licenses/GPL-3.0 - - docs: CC BY 3.0 - docs_url: http://creativecommons.org/licenses/by/3.0/ - -git_edit_address: https://github.com/radareorg/cutter/tree/master/docs - -links: - header: - - title: GitHub - url: https://github.com/radareorg/cutter - footer: - - title: GitHub - url: https://github.com/radareorg/cutter - - title: Issues - url: https://github.com/radareorg/cutter/issues - -ui: - header: - color1: "#080331" - color2: "#673051" - trianglify: true - -social: - github: - user: radareorg - repo: cutter - twitter: - enabled: false - via: r2gui - hash: - account: r2gui - -disqus: false - -description: >- - Cutter is a Qt and C++ graphical user interface for the reverse - engineering framework radare2. - -# Build settings -markdown: kramdown -remote_theme: radareorg/cutter-jekyll-docs-theme - -plugins: - - jekyll-remote-theme diff --git a/docs-ref/apidoc.py b/docs/apidoc.py similarity index 100% rename from docs-ref/apidoc.py rename to docs/apidoc.py diff --git a/docs-ref/source/api.rst b/docs/source/api.rst similarity index 100% rename from docs-ref/source/api.rst rename to docs/source/api.rst diff --git a/docs-ref/source/building.rst b/docs/source/building.rst similarity index 100% rename from docs-ref/source/building.rst rename to docs/source/building.rst diff --git a/docs-ref/source/code.rst b/docs/source/code.rst similarity index 100% rename from docs-ref/source/code.rst rename to docs/source/code.rst diff --git a/docs-ref/source/common-errors.rst b/docs/source/common-errors.rst similarity index 100% rename from docs-ref/source/common-errors.rst rename to docs/source/common-errors.rst diff --git a/docs-ref/source/conf.py b/docs/source/conf.py similarity index 100% rename from docs-ref/source/conf.py rename to docs/source/conf.py diff --git a/docs-ref/source/images/cutter_path_settings.png b/docs/source/images/cutter_path_settings.png similarity index 100% rename from docs-ref/source/images/cutter_path_settings.png rename to docs/source/images/cutter_path_settings.png diff --git a/docs-ref/source/images/screenshot.png b/docs/source/images/screenshot.png similarity index 100% rename from docs-ref/source/images/screenshot.png rename to docs/source/images/screenshot.png diff --git a/docs-ref/source/index.rst b/docs/source/index.rst similarity index 100% rename from docs-ref/source/index.rst rename to docs/source/index.rst diff --git a/docs-ref/source/shortcuts.rst b/docs/source/shortcuts.rst similarity index 100% rename from docs-ref/source/shortcuts.rst rename to docs/source/shortcuts.rst