Skip to content

Commit 34cd664

Browse files
authored
Merge pull request #5184 from OpenShot/revert-direct-doc-commits
Reverting direct commits to docs on develop branch
2 parents 83fd39f + ad93923 commit 34cd664

File tree

2 files changed

+21
-27
lines changed

2 files changed

+21
-27
lines changed

doc/index.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ OpenShot User Guide
2121
===================
2222

2323
OpenShot Video Editor is an award-winning, open-source video editor, available on
24-
Linux, Mac, ChromeOS, and Windows. OpenShot can create stunning videos, films, and animations with an
24+
Linux, Mac, Chrome OS, and Windows. OpenShot can create stunning videos, films, and animations with an
2525
easy-to-use interface and rich set of features.
2626

2727
.. image:: images/ui-example.jpg

doc/introduction.rst

+20-26
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,18 @@ Introduction
2121
============
2222

2323
OpenShot Video Editor is an award-winning, open-source video editor, available on
24-
Windows, Linux, macOS and ChromeOS. OpenShot can create stunning videos, films, and
25-
animations with an easy-to-use interface and rich feature-set.
24+
Linux, Mac, and Windows. OpenShot can create stunning videos, films, and animations with an
25+
easy-to-use interface and rich feature-set.
2626

2727
.. image:: images/openshot-banner.jpg
2828

2929
Features
3030
--------
3131
- **Free & open-source** (licensed under GPLv3)
32-
- **Cross-platform** (Linux, macOS, ChromeOS, and Windows)
32+
- **Cross-platform** (Linux, OS X, Chrome OS, and Windows)
3333
- **Easy-to-use user interface** (designed for beginners, built-in tutorial)
3434
- **Supports most video, audio, & image formats** (based on FFmpeg)
35-
- **Includes popular video profiles & presets** (over 500 profiles, including Social Media)
35+
- **Includes popular video profiles & presets** (over 70+ profiles, including YouTube HD)
3636
- **Advanced timeline** (including drag and drop, scrolling, panning, zooming, and snapping)
3737
- **Advanced clips** (including trimming, alpha, scaling, location, rotation, and shearing)
3838
- **Real-time preview** (multi-threaded, and optimized for performance)
@@ -42,7 +42,7 @@ Features
4242
- **Unlimited tracks / layers** (support for complex projects)
4343
- **Video transitions, masks, & wipes** (grayscale images and animated masks)
4444
- **Video & audio effects** (including brightness, gamma, hue, chroma key / blue screen, and more)
45-
- **Image sequences & 2D animations** (`image001.png`, `image002.png`, `image003.png`, etc...)
45+
- **Image sequences & 2D animations** (`001.png`, `002.png`, `003.png`, etc...)
4646
- **Blender 3D integration** (animated 3D title templates)
4747
- **Vector file support & editing** (SVG / scalable vector graphics used for titles and credits)
4848
- **Audio mixing, waveform, & editing**
@@ -51,7 +51,7 @@ Features
5151
- **Time mapping & speed changes** (slow/fast, forward/backward)
5252
- **Advanced AI** (motion tracking, object detection, & stabilization effects)
5353
- **Credits & captions** (scrolling and animated)
54-
- **Hardware accelerated** (EXPERIMENTAL! Encoding & decoding supports NVIDIA, AMD, Intel and more)
54+
- **Hardware accelerated** (encoding & decoding supports NVIDIA, AMD, Intel and more)
5555
- **Import & export** (EDL and Final Cut Pro formats, supports most video editors)
5656
- **Desktop integration** (drag and drop from file managers)
5757
- **JSON project format** (compatible with `OpenShot Cloud API <https://www.openshot.org/cloud-api/>`_ for cloud-based automation)
@@ -68,30 +68,24 @@ Screenshot
6868

6969
System Requirements
7070
-------------------
71-
Video editing benefits from modern, multi-core CPUs with fast clock speeds (GHz), large amounts of memory, and fast internal storage devices. You want the best computer you can afford when video editing. Here are the minimum system requirements.
71+
Video editing benefits from modern, multi-core CPUs with **fast clock speeds** (GHz), large amounts of memory,
72+
and fast hard disk drives. Basically, you want the best computer you can afford when video editing. Here are the
73+
**minimum system requirements**:
7274

73-
Minimum System Requirements
74-
^^^^^^^^^^^^^^^^^^^^^^^^^^^
75-
76-
<TL;DR>
77-
^^^^^^^
78-
79-
Most computers custom-built or manufactured after 2017 with an Intel® processor will run OpenShot.
75+
TL;DR
76+
^^^^^
77+
Most computers manufactured after 2017 will run OpenShot
8078

8179
Minimum Specifications
8280
^^^^^^^^^^^^^^^^^^^^^^
83-
- **Central Processing Unit**:
84-
- *64-bit x86_64 Multi-core processor* (Intel® required for some downloadable binaries)
85-
- *Minimum cores*: 2 (6+ cores recommended)
86-
- *Minimum threads*: 4 (6+ threads recommended)
87-
- *Minimum turbo clock speed*: 2.7 GHz (3.4+ GHz recommended)
88-
- **System Memory**: 4GB of RAM (16+ GB recommended)
89-
- **Operating System**: 64-bit Operating System (Windows 8/8.1/10/11, macOS 10.15+, most Linux distributions, ChromeOS 83 and later)
90-
- **Internal Storage**: 1GB of storage space for installation & usage (50+ GB available storage space for media recommended)
91-
- **Optional**: Solid-state device (SSD). If utilizing disk caching, add 10GB of storage space (PCIe NVMe recommended)
92-
- **Optional**: External storage devices (USB 3.1/4 or Thunderbolt 3/4 ports and devices recommended)
93-
- **Note**: OpenShot's downloadable binaries are only available for Intel® x86_64 processors. AMD x86_64 processors will run OpenShot in Windows and Linux. You can run OpenShot on AMD and ARM processors in Windows, macOS, Linux, and ChromeOS if you download and compile the source code on your computer.
94-
- **Note**: Hardware Acceleration is currently experimental in OpenShot. NVIDIA NVENC acceleration is only available in Linux operating systems. OpenShot v2.6.0 and later includes Intel® Quick Sync Video encoding in Windows operating systems. If you have a CPU that supports Intel® QSV encoding, you can use the encoder by choosing the appropriate Target on OpenShot's Export Video window.
81+
- 64-bit Operating System (*Linux, OS X, Chrome OS, Windows 7/8/10/11*)
82+
- Multi-core processor with 64-bit support
83+
- Minimum cores: 2 (*recommended: 6+ cores*)
84+
- Minimum threads: 4 (*recommended: 6+ threads*)
85+
- Minimum turbo clock speed: 2.7 Ghz (*recommended: 3.4+ Ghz*)
86+
- 4GB of RAM (*16+ GB recommended*)
87+
- 1 GB of hard-disk space for installation & usage (*recommended: 50+ GB available hard-disk space for media, videos, images, and storage*)
88+
- Optional: Solid-state drive (SSD), if utilizing disk-caching add an additional 10GB of hard-disk space
9589

9690
License
9791
-------

0 commit comments

Comments
 (0)